commit eb58d0d078e13d41d41980aaf87eef4584401fb6
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 11 05:03:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 11 05:03:51 2021 +0000
tree df515f0a3430f28e400c53977456b5b66774abf5
parent 95d574a2ad57dde77847abfaa71780d370c0aa25
parent 7a29a3dfe08ac86bfb2f7c66774394a31debed7a

Merge changes I00375414,Idccd758d into sc-dev am: 7a29a3dfe0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15388876

Change-Id: I236011975631099b51350a542926c611bf78b9d4

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,