commit 99acf70ceb2f464777e002ee1acdcbcf1cae0caf
author Wonsik Kim <wonsik@google.com> Fri Aug 10 14:58:48 2018 -0700
committer Wonsik Kim <wonsik@google.com> Fri Aug 10 14:58:48 2018 -0700
tree 70e5f8a4b86ca52b3550f86f3b1636fc250f136a
parent 2dd0ac778b0fb56deb5850371b5f52bd3296cadb

CCodec: queue empty input for encoders to get CSD out

Bug: 111159723
Test: atest CtsMediaTestCases:EncodeDecodeTest \
            CtsMediaTestCases:EncodeVirtualDisplayTest \
            CtsMediaTestCases:EncodeVirtualDisplayWithCompositionTest \
            CtsMediaTestCases:MediaCasTest \
            CtsMediaTestCases:MediaCodecListTest \
            CtsMediaTestCases:MediaCodecTest \
            CtsMediaTestCases:MediaMetadataRetrieverTest \
            CtsMediaTestCases:MediaPlayerDrmTest \
            CtsMediaTestCases:MediaPlayerSurfaceTest \
            CtsMediaTestCases:MediaScannerTest \
            CtsMediaTestCases:ResourceManagerTest \
            CtsMediaTestCases:MediaRecorderTest
Test: Play music on Android Auto

Change-Id: I49b88cf1806c8b11f3961445a64c759d3e599302

media/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/sfplugin/CCodecBufferChannel.cpp b/media/sfplugin/CCodecBufferChannel.cpp
index c6720f2..36bc6a4 100644
--- a/media/sfplugin/CCodecBufferChannel.cpp
+++ b/media/sfplugin/CCodecBufferChannel.cpp
@@ -1929,6 +1929,12 @@
     if (mInputSurface) {
         return OK;
     }
+
+    C2StreamFormatConfig::output oStreamFormat(0u);
+    c2_status_t err = mComponent->query({ &oStreamFormat }, {}, C2_DONT_BLOCK, nullptr);
+    if (err != C2_OK) {
+        return UNKNOWN_ERROR;
+    }
     // TODO: use proper buffer depth instead of this random value
     for (size_t i = 0; i < kMinInputBufferArraySize; ++i) {
         size_t index;
@@ -1975,6 +1981,13 @@
                     ALOGD("[%s] buffer capacity too small for the config (%zu < %zu)",
                             mName, buffer->capacity(), config->size());
                 }
+            } else if (oStreamFormat.value == C2FormatCompressed && i == 0) {
+                // WORKAROUND: Some apps expect CSD available without queueing
+                //             any input. Queue an empty buffer to get the CSD.
+                buffer->setRange(0, 0);
+                buffer->meta()->clear();
+                buffer->meta()->setInt64("timeUs", 0);
+                (void)queueInputBufferInternal(buffer);
             }
             if (post) {
                 mCallback->onInputBufferAvailable(index, buffer);