commit 262d2930128011e3450a3ee0628a76110e5a46f5
author Lajos Molnar <lajos@google.com> Thu Jun 07 12:27:12 2018 -0700
committer Lajos Molnar <lajos@google.com> Fri Jun 08 16:57:54 2018 -0700
tree 2e49e12e361510d707a0d930c23a1117e8037c15
parent 10b6074406c8813f9e694745841c25d7b0cfecef

CCodec: consider CSD when setting max-input-size

MediaExtractor does not consider CSD-size when calculating max input
buffer size, so consider it in CCodec (unless neither MediaExtractor
nor the codec provided a max-input-size, in which case we fall back
to the CCodecBufferChannel default. Really, codec should provide this.)

Bug: 79493409
Change-Id: Id73ac98d7e334d8b6b8352d142fa62eb1023a3d4

media/sfplugin/CCodec.cpp

diff --git a/media/sfplugin/CCodec.cpp b/media/sfplugin/CCodec.cpp
index a5f382e..57f334b 100644
--- a/media/sfplugin/CCodec.cpp
+++ b/media/sfplugin/CCodec.cpp
@@ -29,6 +29,7 @@
 
 #include <android/IOMXBufferSource.h>
 #include <android/IGraphicBufferSource.h>
+#include <android-base/stringprintf.h>
 #include <cutils/properties.h>
 #include <gui/bufferqueue/1.0/H2BGraphicBufferProducer.h>
 #include <gui/IGraphicBufferProducer.h>
@@ -48,6 +49,7 @@
 
 using namespace std::chrono_literals;
 using ::android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer;
+using android::base::StringPrintf;
 using BGraphicBufferSource = ::android::IGraphicBufferSource;
 
 namespace {
@@ -764,9 +766,23 @@
         bool clientInputSize = msg->findInt32(KEY_MAX_INPUT_SIZE, (int32_t*)&maxInputSize.value);
 
         // TEMP: enforce minimum buffer size of 1MB for video decoders
-        if (!clientInputSize && maxInputSize.value == 0
-                && !encoder && !(config->mDomain & Config::IS_AUDIO)) {
-            maxInputSize.value = 1048576u;
+        // and 16K / 4K for audio encoders/decoders
+        if (!clientInputSize && maxInputSize.value == 0) {
+            if (config->mDomain & Config::IS_AUDIO) {
+                maxInputSize.value = encoder ? 16384 : 4096;
+            } else if (!encoder) {
+                maxInputSize.value = 1048576u;
+            }
+        }
+
+        // verify that CSD fits into this size (if defined)
+        if ((config->mDomain & Config::IS_DECODER) && maxInputSize.value > 0) {
+            sp<ABuffer> csd;
+            for (size_t ix = 0; msg->findBuffer(StringPrintf("csd-%zu", ix).c_str(), &csd); ++ix) {
+                if (csd && csd->size() > maxInputSize.value) {
+                    maxInputSize.value = csd->size();
+                }
+            }
         }
 
         // TODO: do this based on component requiring linear allocator for input