Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74b19286 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "SoftAAC2: calculate timestamp from aacSampleRate"

parents df68f07c 0e225c44

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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 {