commit eb56c34d95754ebbfd9e33fbb7ff66daf3c2a81f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Mar 14 02:05:57 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Mar 14 02:05:57 2020 +0000
tree 8084dc314885c4cd3e57bd34b437eeec9f68fc1e
parent 9d4388fe4d81627c19e952fb4262d7660f368eb0
parent 8a442a2242d688cdaf6c060843ecb55f1818ea5e

Merge "CCodec: bypass crypto / descrambler if input is empty" into rvc-dev am: 1ca9e116a1 am: 8a442a2242

Change-Id: Id3ce1cf0c72d37e549a6d61b3ec470a28c633f01

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index e85e73a..6b389d5 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -604,7 +604,12 @@
 
     ssize_t result = -1;
     ssize_t codecDataOffset = 0;
-    if (mCrypto != nullptr) {
+    if (numSubSamples == 1
+            && subSamples[0].mNumBytesOfClearData == 0
+            && subSamples[0].mNumBytesOfEncryptedData == 0) {
+        // We don't need to go through crypto or descrambler if the input is empty.
+        result = 0;
+    } else if (mCrypto != nullptr) {
         hardware::drm::V1_0::DestinationBuffer destination;
         if (secure) {
             destination.type = DrmBufferType::NATIVE_HANDLE;
@@ -620,6 +625,7 @@
                 key, iv, mode, pattern, source, buffer->offset(),
                 subSamples, numSubSamples, destination, errorDetailMsg);
         if (result < 0) {
+            ALOGI("[%s] decrypt failed: result=%zd", mName, result);
             return result;
         }
         if (destination.type == DrmBufferType::SHARED_MEMORY) {