commit 4bdc846f7e2f7c5c4e426deaf60cc2832f7e9670
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 23 16:19:50 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 23 16:19:50 2021 +0000
tree b8d51b9faed1960d2b28c1c1793dd2b845d6db1c
parent c379052f4a93a731dc81fddb2cf0ff55413c32fe
parent bffaa87732dadd45b04ea3885a993ce0aaa38137

Merge "MediaCodecSource: Support zero length CSD from encoders"

media/libstagefright/MediaCodecSource.cpp

diff --git a/media/libstagefright/MediaCodecSource.cpp b/media/libstagefright/MediaCodecSource.cpp
index 0107c32..b07f8f7 100644
--- a/media/libstagefright/MediaCodecSource.cpp
+++ b/media/libstagefright/MediaCodecSource.cpp
@@ -943,10 +943,17 @@
 
             sp<MediaCodecBuffer> outbuf;
             status_t err = mEncoder->getOutputBuffer(index, &outbuf);
-            if (err != OK || outbuf == NULL || outbuf->data() == NULL
-                || outbuf->size() == 0) {
+            if (err != OK || outbuf == NULL || outbuf->data() == NULL) {
                 signalEOS();
                 break;
+            } else if (outbuf->size() == 0) {
+                // Zero length CSD buffers are not treated as an error
+                if (flags & MediaCodec::BUFFER_FLAG_CODECCONFIG) {
+                    mEncoder->releaseOutputBuffer(index);
+                } else {
+                    signalEOS();
+                }
+                break;
             }
 
             MediaBufferBase *mbuf = new MediaBuffer(outbuf->size());