diff options
| author | Marco Nelissen <marcone@google.com> | 2014-09-05 09:28:24 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-09-10 15:44:29 -0700 |
| commit | a3d078b02d22ee2329e3778f63974be59296f64f (patch) | |
| tree | f98812d5ff5fb0127b354724613162d026254def /media/libstagefright/codecs/aacdec/SoftAAC2.h | |
| parent | e4c8b32f1123aa639f46d234203ad5c5e7926628 (diff) | |
| download | frameworks_av-a3d078b02d22ee2329e3778f63974be59296f64f.zip frameworks_av-a3d078b02d22ee2329e3778f63974be59296f64f.tar.gz frameworks_av-a3d078b02d22ee2329e3778f63974be59296f64f.tar.bz2 | |
Fix AAC timestamps for multiple aac frames per input buffer
Support multiple aac frames per input buffer also for non-ADTS streams,
now also works with 5.1 audio.
Bug: 16715379
Diffstat (limited to 'media/libstagefright/codecs/aacdec/SoftAAC2.h')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.h b/media/libstagefright/codecs/aacdec/SoftAAC2.h index 865bd15..9fcb598 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.h +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.h @@ -59,8 +59,9 @@ private: size_t mOutputBufferCount; bool mSignalledError; OMX_BUFFERHEADERTYPE *mLastInHeader; - int64_t mCurrentInputTime; - Vector<int64_t> mAnchorTimes; + Vector<int32_t> mBufferSizes; + Vector<int32_t> mDecodedSizes; + Vector<int64_t> mBufferTimestamps; CDrcPresModeWrapper mDrcWrap; |