commit f74023f0fbd35b4e9382703dd34c14b440f3da43
author Lajos Molnar <lajos@google.com> Wed Sep 24 23:48:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 24 23:48:23 2014 +0000
tree 54a2f1111f1018238f0ffe79147092c71247a3ce
parent 846202f5483c30ff380fc997c7d4461cce090098
parent 0837d0ac1b572923a27f1b0b742960fc64a6b162

Merge "stagefright: return encrypted input buffer for secure codecs" into lmp-dev

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 6c98c52..b56819c 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -589,7 +589,12 @@
     if (index < buffers->size()) {
         const BufferInfo &info = buffers->itemAt(index);
         if (info.mOwnedByClient) {
-            *buffer = info.mData;
+            // by the time buffers array is initialized, crypto is set
+            if (portIndex == kPortIndexInput && mCrypto != NULL) {
+                *buffer = info.mEncryptedData;
+            } else {
+                *buffer = info.mData;
+            }
             *format = info.mFormat;
         }
     }