commit 7a29a3dfe08ac86bfb2f7c66774394a31debed7a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 11 04:47:06 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 11 04:47:06 2021 +0000
tree df515f0a3430f28e400c53977456b5b66774abf5
parent 0dfad22f14e9d01aef117c7a0f0cd09956aa9e9d
parent 06f1f0de057c925f3c1671c6094256fa5619ce43

Merge changes I00375414,Idccd758d into sc-dev

* changes:
  Revert "CCodec: don't drop metadata for output with flag FLAG_DROP_FRAME."
  Revert "CCodec: drop buffer and not notify client if outputformat isn't changed for FLAG_DROP_FRAME."

media/codec2/sfplugin/CCodecBufferChannel.cpp

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