commit eb0f8a11365676dab805e9a1718a89cb1442f148
author Wonsik Kim <wonsik@google.com> Tue Aug 18 14:06:03 2020 -0700
committer Wonsik Kim <wonsik@google.com> Mon Nov 09 14:53:50 2020 -0800
tree 6ee0b61eca87d5e7637b943c898d6aadb0b99c57
parent d578bbd330f316ddfe5e48dd3357f1666767082d

MediaCodec: fix output format change event timing

In synchronous mode, process output format change at
dequeue, instead of at drain. Keep processing the change
at drain for asynchronous mode.

Fix redundant output format change logging.

Bug: 149751672
Test: atest CtsMediaTestCases:AdaptivePlaybackTest
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Merged-In: Ib373b71ba65f460edaf82365f8dd9be35348f635
Change-Id: Ib373b71ba65f460edaf82365f8dd9be35348f635

media/codec2/sfplugin/CCodecBuffers.cpp

diff --git a/media/codec2/sfplugin/CCodecBuffers.cpp b/media/codec2/sfplugin/CCodecBuffers.cpp
index 689e3bb..692da58 100644
--- a/media/codec2/sfplugin/CCodecBuffers.cpp
+++ b/media/codec2/sfplugin/CCodecBuffers.cpp
@@ -274,8 +274,6 @@
 
     // The output format can be processed without a registered slot.
     if (outputFormat) {
-        ALOGD("[%s] popFromStashAndRegister: output format changed to %s",
-                mName, outputFormat->debugString().c_str());
         updateSkipCutBuffer(outputFormat, entry.notify);
     }
 
@@ -303,6 +301,10 @@
     }
 
     if (!entry.notify) {
+        if (outputFormat) {
+            ALOGD("[%s] popFromStashAndRegister: output format changed to %s",
+                    mName, outputFormat->debugString().c_str());
+        }
         mPending.pop_front();
         return DISCARD;
     }
@@ -319,6 +321,10 @@
     // Append information from the front stash entry to outBuffer.
     (*outBuffer)->meta()->setInt64("timeUs", entry.timestamp);
     (*outBuffer)->meta()->setInt32("flags", entry.flags);
+    if (outputFormat) {
+        ALOGD("[%s] popFromStashAndRegister: output format changed to %s",
+                mName, outputFormat->debugString().c_str());
+    }
     ALOGV("[%s] popFromStashAndRegister: "
           "out buffer index = %zu [%p] => %p + %zu (%lld)",
           mName, *index, outBuffer->get(),