commit b241bbe175635f779c47b4a9ae78db93a72e745e
author Marco Nelissen <marcone@google.com> Fri Feb 01 18:15:36 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 01 18:15:36 2019 +0000
tree 62252ecb21ec750ce29d9319ab6e692086588eab
parent caac4484db371ceee0ace2a944e0286af051c02b
parent 08dd071c4a5f63ffe8ff0511a0068423d5bac090

Merge "FLAC: resize raw decoder's buffer according to flac max buffer size"

media/extractors/flac/FLACExtractor.cpp

diff --git a/media/extractors/flac/FLACExtractor.cpp b/media/extractors/flac/FLACExtractor.cpp
index 84fbcee..8854631 100644
--- a/media/extractors/flac/FLACExtractor.cpp
+++ b/media/extractors/flac/FLACExtractor.cpp
@@ -581,6 +581,7 @@
     CHECK(mGroup == NULL);
     mGroup = group;
     mMaxBufferSize = getMaxBlockSize() * getChannels() * getOutputSampleSize();
+    AMediaFormat_setInt32(mTrackMetadata, AMEDIAFORMAT_KEY_MAX_INPUT_SIZE, mMaxBufferSize);
     mGroup->add_buffer(mMaxBufferSize);
 }
 
@@ -667,7 +668,7 @@
     : mDataSource(dataSource),
       mTrackMetadata(trackMetadata),
       mOutputFloat(outputFloat),
-      mParser(new FLACParser(mDataSource, outputFloat)),
+      mParser(new FLACParser(mDataSource, outputFloat, 0, mTrackMetadata)),
       mInitCheck(mParser->initCheck()),
       mStarted(false)
 {