diff options
| author | Andreas Huber <andih@google.com> | 2010-12-15 09:17:21 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-15 09:17:21 -0800 |
| commit | 08f83a6cd8c03a1a252b1dea13c72cee3def70c0 (patch) | |
| tree | 0fc679d726afafaa728f1d0050efd9b8a5b0f592 | |
| parent | 92272ab18945d93e7569fc73692220bf1365af36 (diff) | |
| parent | 3d6576efd025641182ec0145c9a03e5b9c26c6ef (diff) | |
| download | frameworks_base-08f83a6cd8c03a1a252b1dea13c72cee3def70c0.zip frameworks_base-08f83a6cd8c03a1a252b1dea13c72cee3def70c0.tar.gz frameworks_base-08f83a6cd8c03a1a252b1dea13c72cee3def70c0.tar.bz2 | |
Merge "Emit better (correct) timestamps that respect AAC upsampling."
| -rw-r--r-- | media/libstagefright/codecs/aacdec/AACDecoder.cpp | 2 |
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; |