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 | 00502849dcc54086ad9fabbd90ef3d0e41ae78f5 (patch) | |
| tree | f41167f435fd3f660a8b25c1d16228329b8bd939 /media/libstagefright | |
| parent | d27f1e6959cdcdadfa471b9824686d784ca55def (diff) | |
| parent | 41dabbcd9ab62d7ecea1570cc76c39ac485de2ce (diff) | |
| download | frameworks_av-00502849dcc54086ad9fabbd90ef3d0e41ae78f5.zip frameworks_av-00502849dcc54086ad9fabbd90ef3d0e41ae78f5.tar.gz frameworks_av-00502849dcc54086ad9fabbd90ef3d0e41ae78f5.tar.bz2 | |
Merge "Emit better (correct) timestamps that respect AAC upsampling."
Diffstat (limited to 'media/libstagefright')
| -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; |