From eb11600a248cfe5b95ddd3e5aaae02bd2ab65276 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Wed, 26 Sep 2012 12:54:26 -0700
Subject: Make sure we only release the HDCP module once shutdown has
 completed.

Change-Id: I4b614afe2b55ac53b4aa63311e5bea8fd6c4462e
related-to-bug: 7223555
---
 .../wifi-display/source/PlaybackSession.cpp        | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'media/libstagefright/wifi-display/source/PlaybackSession.cpp')

diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp
index ef39713..72e6313 100644
--- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp
+++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp
@@ -1297,6 +1297,10 @@ bool WifiDisplaySource::PlaybackSession::allTracksHavePacketizerIndex() {
     return true;
 }
 
+static inline size_t MIN(size_t a, size_t b) {
+    return (a < b) ? a : b;
+}
+
 status_t WifiDisplaySource::PlaybackSession::packetizeAccessUnit(
         size_t trackIndex, const sp<ABuffer> &accessUnit) {
     const sp<Track> &track = mTracks.valueFor(trackIndex);
@@ -1309,8 +1313,20 @@ status_t WifiDisplaySource::PlaybackSession::packetizeAccessUnit(
     if (mHDCP != NULL && !track->isAudio()) {
         isHDCPEncrypted = true;
 
+#if 0
+        ALOGI("in:");
+        hexdump(accessUnit->data(), MIN(64, accessUnit->size()));
+#endif
+
+        if (mTempAccessUnit == NULL
+                || mTempAccessUnit->capacity() < accessUnit->size()) {
+            mTempAccessUnit = new ABuffer(accessUnit->size());
+        }
+
+        memcpy(mTempAccessUnit->data(), accessUnit->data(), accessUnit->size());
+
         status_t err = mHDCP->encrypt(
-                accessUnit->data(), accessUnit->size(),
+                mTempAccessUnit->data(), mTempAccessUnit->size(),
                 trackIndex  /* streamCTR */,
                 &inputCTR,
                 accessUnit->data());
@@ -1320,6 +1336,12 @@ status_t WifiDisplaySource::PlaybackSession::packetizeAccessUnit(
                   err);
 
             return err;
+        } else {
+#if 0
+            ALOGI("out:");
+            hexdump(accessUnit->data(), MIN(64, accessUnit->size()));
+            ALOGI("inputCTR: 0x%016llx", inputCTR);
+#endif
         }
 
         HDCP_private_data[0] = 0x00;
-- 
cgit v1.1