commit e55c471cbf614c227b3a4ab5bfb78b8a236a8d39
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Jul 26 12:32:13 2019 -0700
committer Wonsik Kim <wonsik@google.com> Mon Sep 23 12:27:41 2019 -0700
tree dc4e11deca036f73af604f0898da1f00558505e7
parent 071c3c8736f7be0800fc3a0293335b15fe6945f3

Increase min input buffer size for video decoders to 2 MB

In some cases, applications send wrong max-width and max-height,
which results in a smaller than required input buffer.

Bug: 140780744
Test: verify max-input-size
Test: atest android.media.cts.DecoderTest

Change-Id: I9a16de4708cc38d32194a1c8b4666f7b1efd2d28

media/codec2/components/aom/C2SoftAomDec.cpp

diff --git a/media/codec2/components/aom/C2SoftAomDec.cpp b/media/codec2/components/aom/C2SoftAomDec.cpp
index 36137e6..c7046cb 100644
--- a/media/codec2/components/aom/C2SoftAomDec.cpp
+++ b/media/codec2/components/aom/C2SoftAomDec.cpp
@@ -29,6 +29,8 @@
 
 namespace android {
 
+constexpr size_t kMinInputBufferSize = 2 * 1024 * 1024;
+
 // codecname set and passed in as a compile flag from Android.bp
 constexpr char COMPONENT_NAME[] = CODECNAME;
 
@@ -112,7 +114,7 @@
         addParameter(
             DefineParam(mMaxInputSize, C2_PARAMKEY_INPUT_MAX_BUFFER_SIZE)
                 .withDefault(
-                    new C2StreamMaxBufferSizeInfo::input(0u, 320 * 240 * 3 / 4))
+                    new C2StreamMaxBufferSizeInfo::input(0u, kMinInputBufferSize))
                 .withFields({
                     C2F(mMaxInputSize, value).any(),
                 })
@@ -192,8 +194,8 @@
         const C2P<C2StreamMaxPictureSizeTuning::output>& maxSize) {
         (void)mayBlock;
         // assume compression ratio of 2
-        me.set().value = (((maxSize.v.width + 63) / 64) *
-                          ((maxSize.v.height + 63) / 64) * 3072);
+        me.set().value = c2_max((((maxSize.v.width + 63) / 64)
+                * ((maxSize.v.height + 63) / 64) * 3072), kMinInputBufferSize);
         return C2R::Ok();
     }
     static C2R DefaultColorAspectsSetter(bool mayBlock, C2P<C2StreamColorAspectsTuning::output> &me) {