commit 96e879f3910775c36e13a6adefd1eaa6fe92f88f
author Wonsik Kim <wonsik@google.com> Mon Jul 26 11:12:36 2021 -0700
committer Wonsik Kim <wonsik@google.com> Mon Jul 26 11:14:32 2021 -0700
tree 9db2ba147cfb99ebb2e3e89b5e35291c540e6129
parent 74dcdac0ad6f92cd7f1a24d307261986cb6d4e03

Revert "CCodec: drop buffer and not notify client if outputformat isn't changed for FLAG_DROP_FRAME."

This reverts commit 04698a346d637e4db1fc400b102f04fdfa9b5835.

Bug: 193482724
Bug: 193867146
Test: cts/media/device-small
Change-Id: Idccd758d2760de446403a41d65f52a879a9caf10

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 9e9bdfc..9ac74c2 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -1887,7 +1887,7 @@
         drop = true;
     }
 
-    if (notifyClient && !buffer && !flags && !(drop && outputFormat)) {
+    if (notifyClient && !buffer && !flags && !drop) {
         ALOGV("[%s] onWorkDone: Not reporting output buffer (%lld)",
               mName, work->input.ordinal.frameIndex.peekull());
         notifyClient = false;
@@ -1914,7 +1914,7 @@
             return false;
         }
         output->buffers->pushToStash(
-                drop ? nullptr : buffer,
+                buffer,
                 notifyClient,
                 timestamp.peek(),
                 flags,