commit 72a710198f49af6ea16ada58b8f19f7cd654ad8c
author Wonsik Kim <wonsik@google.com> Mon Feb 06 17:35:21 2023 -0800
committer Wonsik Kim <wonsik@google.com> Mon Feb 27 16:59:12 2023 -0800
tree fb47fa8c022d5fbeddf8a1fe226e09106c08cad8
parent 692bb92e4da5f37ea2e0d36b3e44235b0eae76df

CCodecBufferChannel: exit handleWork early if output buffers are cleared

Bug: 260805148
Test: atest android.media.codec.cts.MediaCodecTest#testAbruptStop
Change-Id: I808a3e24d45d1670f3d91d59f59318a01ca6aef6

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 4bf8dce..e064c34 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -1965,7 +1965,10 @@
     // csd cannot be re-ordered and will always arrive first.
     if (initData != nullptr) {
         Mutexed<Output>::Locked output(mOutput);
-        if (output->buffers && outputFormat) {
+        if (!output->buffers) {
+            return false;
+        }
+        if (outputFormat) {
             output->buffers->updateSkipCutBuffer(outputFormat);
             output->buffers->setFormat(outputFormat);
         }
@@ -1974,7 +1977,7 @@
         }
         size_t index;
         sp<MediaCodecBuffer> outBuffer;
-        if (output->buffers && output->buffers->registerCsd(initData, &index, &outBuffer) == OK) {
+        if (output->buffers->registerCsd(initData, &index, &outBuffer) == OK) {
             outBuffer->meta()->setInt64("timeUs", timestamp.peek());
             outBuffer->meta()->setInt32("flags", BUFFER_FLAG_CODEC_CONFIG);
             ALOGV("[%s] onWorkDone: csd index = %zu [%p]", mName, index, outBuffer.get());