drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3ea395dd: am 4e853598: Merge "Fix printf format"

Browse Source 
* commit '3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
  Fix printf format
This commit is contained in:
Marco Nelissen
2015-01-27 20:33:09 +00:00
committed by Android Git Automerger
parent 847514499f 3ea395ddc7
commit 2c2415a552
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/soundpool/SoundPool.cpp
View File

@ -479,7 +479,7 @@ static status_t decode(int fd, int64_t offset, int64_t length,
uint32_t *rate, int *numChannels, audio_format_t *audioFormat,
sp<MemoryHeapBase> heap, size_t *memsize) {
ALOGV("fd %d, offset %lld, size %lld", fd, offset, length);
ALOGV("fd %d, offset %" PRId64 ", size %" PRId64, fd, offset, length);
AMediaExtractor *ex = AMediaExtractor_new();
status_t err = AMediaExtractor_setDataSourceFd(ex, fd, offset, length);
@ -523,7 +523,7 @@ static status_t decode(int fd, int64_t offset, int64_t length,
while (!sawOutputEOS) {
if (!sawInputEOS) {
ssize_t bufidx = AMediaCodec_dequeueInputBuffer(codec, 5000);
ALOGV("input buffer %d", bufidx);
ALOGV("input buffer %zd", bufidx);
if (bufidx >= 0) {
size_t bufsize;
uint8_t *buf = AMediaCodec_getInputBuffer(codec, bufidx, &bufsize);