summaryrefslogtreecommitdiffstats
path: root/media
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
commit41dabbcd9ab62d7ecea1570cc76c39ac485de2ce (patch)
tree9cdb7779de37846c8be6943e5a1a2577be035e8e /media
parent123e95a584556a64a2e0f9e242f48b9a080750a5 (diff)
downloadframeworks_av-41dabbcd9ab62d7ecea1570cc76c39ac485de2ce.zip
frameworks_av-41dabbcd9ab62d7ecea1570cc76c39ac485de2ce.tar.gz
frameworks_av-41dabbcd9ab62d7ecea1570cc76c39ac485de2ce.tar.bz2
Emit better (correct) timestamps that respect AAC upsampling.
Change-Id: I6587416c9caa0e263aa8ec6c6d89a42e28f6ff19
Diffstat (limited to 'media')
-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;