diff options
author | Marco Nelissen <marcone@google.com> | 2014-06-26 07:49:02 -0700 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2014-06-26 12:02:30 -0700 |
commit | a5a103c579d5ecde233e04c00c90f4d15b216f29 (patch) | |
tree | 7ff55f4da23c48bb8021410514125be5cb995ab2 /media/libstagefright/codecs/aacdec/SoftAAC2.h | |
parent | e8f2c6cfe9afc5b303ab6b0fb51e18ddce512b54 (diff) | |
download | frameworks_av-a5a103c579d5ecde233e04c00c90f4d15b216f29.zip frameworks_av-a5a103c579d5ecde233e04c00c90f4d15b216f29.tar.gz frameworks_av-a5a103c579d5ecde233e04c00c90f4d15b216f29.tar.bz2 |
Fix AAC timestamps
When playing an mpeg-2 transport stream with AAC audio, there will be
more than one packet per input buffer, resulting in multiple output
buffers for each input buffers. Additional timestamps needs to be
generated in that case.
b/15755476
Change-Id: I2df50b0cb3690eb36d56871daa1263de0028db06
Diffstat (limited to 'media/libstagefright/codecs/aacdec/SoftAAC2.h')
-rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.h b/media/libstagefright/codecs/aacdec/SoftAAC2.h index 5cde03a..865bd15 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.h +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.h @@ -58,7 +58,9 @@ private: size_t mInputBufferCount; size_t mOutputBufferCount; bool mSignalledError; - int64_t mAnchorTimeUs[kNumDelayBlocksMax]; + OMX_BUFFERHEADERTYPE *mLastInHeader; + int64_t mCurrentInputTime; + Vector<int64_t> mAnchorTimes; CDrcPresModeWrapper mDrcWrap; |