summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacdec/SoftAAC2.h
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-09-05 09:28:24 -0700
committerMarco Nelissen <marcone@google.com>2014-09-07 11:05:03 -0700
commitfa20a1db4be377a004efd756887f8b212e31d670 (patch)
treed329181b02dffe13578c36e2c0883fd91509408f /media/libstagefright/codecs/aacdec/SoftAAC2.h
parent767fc12e58422eef14aa40a5e7ffefd0b3949b82 (diff)
downloadframeworks_av-fa20a1db4be377a004efd756887f8b212e31d670.zip
frameworks_av-fa20a1db4be377a004efd756887f8b212e31d670.tar.gz
frameworks_av-fa20a1db4be377a004efd756887f8b212e31d670.tar.bz2
Fix AAC timestamps for multiple aac frames per input buffer
Support multiple aac frames per input buffer also for non-ADTS streams. Bug: 16715379 Change-Id: I84f33d9bb65b6821b2a697f6750356cea98777c4
Diffstat (limited to 'media/libstagefright/codecs/aacdec/SoftAAC2.h')
-rw-r--r--media/libstagefright/codecs/aacdec/SoftAAC2.h5
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;