diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-09 01:20:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-09 01:20:10 +0000 |
| commit | 66172f5cd25d1ce05870be70ad4f5fc0af6289f0 (patch) | |
| tree | d438b1f707e8d104e8967bf905c9a134ab12aee5 /media | |
| parent | 3cc937346baf31fda7f0587a8e622938fbb68983 (diff) | |
| parent | 12a61347d0f0ba2ee99c1ef7626aeebc39307227 (diff) | |
| download | frameworks_av-66172f5cd25d1ce05870be70ad4f5fc0af6289f0.zip frameworks_av-66172f5cd25d1ce05870be70ad4f5fc0af6289f0.tar.gz frameworks_av-66172f5cd25d1ce05870be70ad4f5fc0af6289f0.tar.bz2 | |
Merge "Cast int64_t values to long long before print."
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 0bb1eb8..7209cb3 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -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 |