commit c47c9aa30075e1452fdbbd01204a7fdf49b4ba4f
author Wonsik Kim <wonsik@google.com> Tue Sep 11 05:13:27 2018 +0000
committer Wonsik Kim <wonsik@google.com> Mon Sep 10 22:40:09 2018 -0700
tree 4b46c5fb8a5bb08f7cb344811666d3bf5e6f983f
parent 9bf438ad6113cfc5f6d68c4bc1b8cff6f2520647

Revert "CCodec: queue empty input for encoders to get CSD out"

This reverts commit 99acf70ceb2f464777e002ee1acdcbcf1cae0caf.

Reason for revert: CTS regression

Bug: 111159723
Bug: 113360018
Bug: 114790992
Test: atest CtsMediaTestCases:VideoEncoderTest \
            CtsVideoTestCases:VideoEncoderDecoderTest
Change-Id: Iae89f349915b5fa4650a586da003285148a4df6e

media/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/sfplugin/CCodecBufferChannel.cpp b/media/sfplugin/CCodecBufferChannel.cpp
index f3b0baa..5049914 100644
--- a/media/sfplugin/CCodecBufferChannel.cpp
+++ b/media/sfplugin/CCodecBufferChannel.cpp
@@ -2112,12 +2112,6 @@
     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;
-    }
     std::vector<sp<MediaCodecBuffer>> toBeQueued;
     // TODO: use proper buffer depth instead of this random value
     for (size_t i = 0; i < kMinInputBufferArraySize; ++i) {
@@ -2153,13 +2147,6 @@
                     ALOGD("[%s] buffer capacity too small for the config (%zu < %zu)",
                             mName, buffer->capacity(), config->size());
                 }
-            } else if (oStreamFormat.value == C2BufferData::LINEAR && 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);
-                post = false;
             }
             if (mAvailablePipelineCapacity.allocate("requestInitialInputBuffers")) {
                 if (post) {