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

Commit 66172f5c authored by Lajos Molnar's avatar Lajos Molnar Committed by Gerrit Code Review
Browse files

Merge "Cast int64_t values to long long before print."

parents 3cc93734 12a61347

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+2 −2
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) { 
                        *nextTimeStamp += mStreamInfo->aacSamplesPerFrame *

                                1000000ll / mStreamInfo->sampleRate;

                        ALOGV("adjusted nextTimeStamp/size to %lld/%d",

                                *nextTimeStamp, *currentBufLeft);

                                (long long) *nextTimeStamp, *currentBufLeft);

                    } else {

                        // move to next timestamp in list

                        if (mBufferTimestamps.size() > 0) {
@@ -885,7 +885,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) { 
                            mBufferSizes.removeAt(0);

                            currentBufLeft = &mBufferSizes.editItemAt(0);

                            ALOGV("moved to next time/size: %lld/%d",

                                    *nextTimeStamp, *currentBufLeft);

                                    (long long) *nextTimeStamp, *currentBufLeft);

                        }

                        // try to limit output buffer size to match input buffers

                        // (e.g when an input buffer contained 4 "sub" frames, output