summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacdec/AACDecoder.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-12-14 16:05:16 -0800
committerAndreas Huber <andih@google.com>2010-12-14 16:05:16 -0800
commit3d6576efd025641182ec0145c9a03e5b9c26c6ef (patch)
tree274ef4829bf9c6d6646cbbcc2536446d6498b8fa /media/libstagefright/codecs/aacdec/AACDecoder.cpp
parent1f356b9569da882df22ca231c1c0fdea6e330abf (diff)
downloadframeworks_base-3d6576efd025641182ec0145c9a03e5b9c26c6ef.zip
frameworks_base-3d6576efd025641182ec0145c9a03e5b9c26c6ef.tar.gz
frameworks_base-3d6576efd025641182ec0145c9a03e5b9c26c6ef.tar.bz2
Emit better (correct) timestamps that respect AAC upsampling.
Change-Id: I6587416c9caa0e263aa8ec6c6d89a42e28f6ff19
Diffstat (limited to 'media/libstagefright/codecs/aacdec/AACDecoder.cpp')
-rw-r--r--media/libstagefright/codecs/aacdec/AACDecoder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/aacdec/AACDecoder.cpp b/media/libstagefright/codecs/aacdec/AACDecoder.cpp
index f58c16d..2171a67 100644
--- a/media/libstagefright/codecs/aacdec/AACDecoder.cpp
+++ b/media/libstagefright/codecs/aacdec/AACDecoder.cpp
@@ -308,7 +308,7 @@ status_t AACDecoder::read(
mAnchorTimeUs
+ (mNumSamplesOutput * 1000000) / mConfig->samplingRate);
- mNumSamplesOutput += mConfig->frameLength;
+ mNumSamplesOutput += mConfig->frameLength * mUpsamplingFactor;
*out = buffer;