commit ee9e6269a1520b5f2916615c4f91fb6277df7011
author Marco Nelissen <marcone@google.com> Wed Dec 09 20:23:27 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 09 20:23:27 2020 +0000
tree b6d042a051ef4d3f84fb5676e17f8faeecaf44a6
parent 5857634956069a07e7e61c337b205e75079c708e
parent 6d30324cdd4edde44994458d036422cbcd7b0c86

Merge "Fix "max input size" issue in flac extractor" into mainline-prod am: 6d30324cdd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13181314

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33fed27d752a2a4832cbbbba7623f03b2f33db14

media/extractors/flac/FLACExtractor.cpp

diff --git a/media/extractors/flac/FLACExtractor.cpp b/media/extractors/flac/FLACExtractor.cpp
index 0617e88..ec7cb24 100644
--- a/media/extractors/flac/FLACExtractor.cpp
+++ b/media/extractors/flac/FLACExtractor.cpp
@@ -561,6 +561,8 @@
         AMediaFormat_setString(mFileMetadata,
                 AMEDIAFORMAT_KEY_MIME, MEDIA_MIMETYPE_AUDIO_FLAC);
     }
+    mMaxBufferSize = getMaxBlockSize() * getChannels() * getOutputSampleSize();
+    AMediaFormat_setInt32(mTrackMetadata, AMEDIAFORMAT_KEY_MAX_INPUT_SIZE, mMaxBufferSize);
     return OK;
 }
 
@@ -568,8 +570,6 @@
 {
     CHECK(mGroup == NULL);
     mGroup = group;
-    mMaxBufferSize = getMaxBlockSize() * getChannels() * getOutputSampleSize();
-    AMediaFormat_setInt32(mTrackMetadata, AMEDIAFORMAT_KEY_MAX_INPUT_SIZE, mMaxBufferSize);
     mGroup->add_buffer(mMaxBufferSize);
 }