commit b8fe01e5992d688987637fd7cbbbbe617293a9da
author ted.sun <ted.sun@mediatek.com> Tue Jun 23 14:03:41 2020 +0800
committer Henry Fang <quxiangfang@google.com> Wed Jul 22 13:50:28 2020 -0700
tree ce4ae6aa8d76d2b4ab30809ceaa1c4d76f783d4d
parent 7d90914ed0a0df56d065c569a4daeaf05140cc9e

CCodec: don't drop metadata for output with flag FLAG_DROP_FRAME.

Bug: 151995371
Test: local test ok.
Change-Id: I882b791f3d16a17ffd47ce0bf9e40c64c8b90357
(cherry picked from commit 55eff1412e942c13b0fc4af1f846843a554d7068)

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 0626c8d..bbd91d0 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -1718,7 +1718,13 @@
         }
     }
 
-    if (notifyClient && !buffer && !flags) {
+    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) {
         ALOGV("[%s] onWorkDone: Not reporting output buffer (%lld)",
               mName, work->input.ordinal.frameIndex.peekull());
         notifyClient = false;