summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-12-09 14:41:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 14:41:16 +0000
commit853bc5a2379a59859795027a9dd4bc11a54b2a5f (patch)
treea577f069bda8961d97a4472e59e41bd188d0e110 /media
parent08fa30dcc5427daefb34e0bfa781da31f85b9e58 (diff)
parentf3c253464e0047a28960b27bbee7366d5bd63327 (diff)
downloadframeworks_av-853bc5a2379a59859795027a9dd4bc11a54b2a5f.zip
frameworks_av-853bc5a2379a59859795027a9dd4bc11a54b2a5f.tar.gz
frameworks_av-853bc5a2379a59859795027a9dd4bc11a54b2a5f.tar.bz2
am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."
* commit 'f3c253464e0047a28960b27bbee7366d5bd63327': Cast int64_t values to long long before print.
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/codecs/aacdec/SoftAAC2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index 0546871..495bad0 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