commit e74e506bfb315f4f2aa51182da1103155d4352d6
author Houxiang Dai <houxiang.dai@mediatek.com> Thu May 19 15:32:54 2022 +0800
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed Aug 16 14:21:14 2023 +0000
tree 968abee5ca5a4310645118f1caec7a11d106b86f
parent 5d7b6569577ef9fd6450e6129b8391e306f441f5

Add format change check rule

If no buffer, and no outputFormat changed in tunnel mode, the
onOutputBufferAvailable would not be called.

Test:
DTV playback ok

Bug: 234104755
(cherry picked from https://android-review.googlesource.com/q/commit:c5d993692af7af7c886bc8d3e08ec5d019cc06ec)
Merged-In: I96a4dc5733e2b47a9255ae655da2cb23779daa5b
Change-Id: I96a4dc5733e2b47a9255ae655da2cb23779daa5b

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 385912a..22c4aee 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -2128,8 +2128,15 @@
 
     if (notifyClient && !buffer && !flags) {
         if (mTunneled && drop && outputFormat) {
-            ALOGV("[%s] onWorkDone: Keep tunneled, drop frame with format change (%lld)",
-                  mName, work->input.ordinal.frameIndex.peekull());
+            if (mOutputFormat != outputFormat) {
+                ALOGV("[%s] onWorkDone: Keep tunneled, drop frame with format change (%lld)",
+                      mName, work->input.ordinal.frameIndex.peekull());
+                mOutputFormat = outputFormat;
+            } else {
+                ALOGV("[%s] onWorkDone: Not reporting output buffer without format change (%lld)",
+                      mName, work->input.ordinal.frameIndex.peekull());
+                notifyClient = false;
+            }
         } else {
             ALOGV("[%s] onWorkDone: Not reporting output buffer (%lld)",
                   mName, work->input.ordinal.frameIndex.peekull());

media/codec2/sfplugin/CCodecBufferChannel.h

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.h b/media/codec2/sfplugin/CCodecBufferChannel.h
index 763eae9..a37c383 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.h
+++ b/media/codec2/sfplugin/CCodecBufferChannel.h
@@ -301,6 +301,7 @@
     std::shared_ptr<C2BlockPool> mInputAllocator;
     QueueSync mQueueSync;
     std::vector<std::unique_ptr<C2Param>> mParamsToBeSet;
+    sp<AMessage> mOutputFormat;
 
     struct Input {
         Input();