diff options
| author | Marco Nelissen <marcone@google.com> | 2013-04-17 22:38:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-17 22:38:20 +0000 |
| commit | 790703a1422b46fada45a1210815a6517d35b792 (patch) | |
| tree | 17500379a35b32ae229b61d4b414d17a60408b07 /media/libstagefright/codecs | |
| parent | 06a614eed67cad894026852059a06790c05ef4d6 (diff) | |
| parent | f2334661f4047beddf0431e7fe5204ca1cf4380b (diff) | |
| download | frameworks_av-790703a1422b46fada45a1210815a6517d35b792.zip frameworks_av-790703a1422b46fada45a1210815a6517d35b792.tar.gz frameworks_av-790703a1422b46fada45a1210815a6517d35b792.tar.bz2 | |
Merge "Make sure the drain buffer is big enough" into jb-mr2-dev
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index cf81c16..cf50dc9 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -586,9 +586,12 @@ void SoftAAC2::onPortFlushCompleted(OMX_U32 portIndex) { } void SoftAAC2::drainDecoder() { - short buf [2048]; - aacDecoder_DecodeFrame(mAACDecoder, buf, 4096, AACDEC_FLUSH | AACDEC_CLRHIST | AACDEC_INTR); - aacDecoder_DecodeFrame(mAACDecoder, buf, 4096, AACDEC_FLUSH | AACDEC_CLRHIST | AACDEC_INTR); + // a buffer big enough for 6 channels of decoded HE-AAC + short buf [2048*6]; + aacDecoder_DecodeFrame(mAACDecoder, + buf, sizeof(buf), AACDEC_FLUSH | AACDEC_CLRHIST | AACDEC_INTR); + aacDecoder_DecodeFrame(mAACDecoder, + buf, sizeof(buf), AACDEC_FLUSH | AACDEC_CLRHIST | AACDEC_INTR); aacDecoder_SetParam(mAACDecoder, AAC_TPDEC_CLEAR_BUFFER, 1); mDecoderHasData = false; } |