diff options
| author | Marco Nelissen <marcone@google.com> | 2014-06-10 17:47:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 17:47:17 +0000 |
| commit | 47a2377ec07ad4ec06ecd25bfd45a37df91e68e6 (patch) | |
| tree | 838eb0257668d0b7bed84df6fb40d8aa2791ad1c /media/libstagefright | |
| parent | 73ac4ff83af079f8d09348dbe8a2733fae23e443 (diff) | |
| parent | ed83915060af3eaaf62feef2eb2eec1e7d431891 (diff) | |
| download | frameworks_av-47a2377ec07ad4ec06ecd25bfd45a37df91e68e6.zip frameworks_av-47a2377ec07ad4ec06ecd25bfd45a37df91e68e6.tar.gz frameworks_av-47a2377ec07ad4ec06ecd25bfd45a37df91e68e6.tar.bz2 | |
Merge "Remove unneeded code"
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index edb7448..64bf2b6 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -842,12 +842,6 @@ void SoftAAC2::onPortFlushCompleted(OMX_U32 portIndex) { // depend on fragments from the last one decoded. // drain all existing data drainDecoder(); - // force decoder loop to drop the first decoded buffer by resetting these state variables, - // but only if initialization has already happened. - if (mInputBufferCount != 0) { - mInputBufferCount = 1; - mOutputBufferCount = -1; - } } else { while (outputDelayRingBufferSamplesAvailable() > 0) { int32_t ns = outputDelayRingBufferGetSamples(0, |