diff options
| author | Chong Zhang <chz@google.com> | 2015-03-04 21:44:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-04 21:44:22 +0000 |
| commit | 74b19286cfeb952adf4711ef4a3e18a1ea9ff03f (patch) | |
| tree | d12c7e1add9622d647673c4d9196922218ed5172 /media | |
| parent | df68f07ca7cdeb500fcf101b317c61a0f0865723 (diff) | |
| parent | 0e225c442d8603afb55dc2567a7144ccb675b01e (diff) | |
| download | frameworks_av-74b19286cfeb952adf4711ef4a3e18a1ea9ff03f.zip frameworks_av-74b19286cfeb952adf4711ef4a3e18a1ea9ff03f.tar.gz frameworks_av-74b19286cfeb952adf4711ef4a3e18a1ea9ff03f.tar.bz2 | |
Merge "SoftAAC2: calculate timestamp from aacSampleRate"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index 495bad0..1505f08 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -623,7 +623,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) { } else { int64_t currentTime = mBufferTimestamps.top(); currentTime += mStreamInfo->aacSamplesPerFrame * - 1000000ll / mStreamInfo->sampleRate; + 1000000ll / mStreamInfo->aacSampleRate; mBufferTimestamps.add(currentTime); } } else { @@ -874,7 +874,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) { // adjust/interpolate next time stamp *currentBufLeft -= decodedSize; *nextTimeStamp += mStreamInfo->aacSamplesPerFrame * - 1000000ll / mStreamInfo->sampleRate; + 1000000ll / mStreamInfo->aacSampleRate; ALOGV("adjusted nextTimeStamp/size to %lld/%d", (long long) *nextTimeStamp, *currentBufLeft); } else { |