commit 46a74c01c0f1160886cceb2ae60373f609874d9b
author Wonsik Kim <wonsik@google.com> Fri May 01 23:42:12 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 01 23:42:12 2020 +0000
tree e9f3aba36d183fa2c1b8de72a8dc08734f2ded7a
parent 82aa42f4b4ab0f3c37b80e03b9039d0c2c830cd7
parent cc56dd26a44f61fd4989b894ea57653eca4d1894

Merge "CCodec: don't drop work with format change" into rvc-dev am: e226124fd3 am: d6bbe01499 am: cc56dd26a4

Change-Id: Ic9ce21ec3857e5aac5224b1eeae1336286820aff

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index e902b5d..3773528 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -1705,8 +1705,8 @@
         }
     }
 
-    if (!buffer && !flags) {
-        ALOGV("[%s] onWorkDone: Not reporting output buffer (%lld)",
+    if (!buffer && !flags && outputFormat == nullptr) {
+        ALOGV("[%s] onWorkDone: nothing to report from the work (%lld)",
               mName, work->input.ordinal.frameIndex.peekull());
         return true;
     }