am 3ea395dd: am 4e853598: Merge "Fix printf format"
automerge: 2c2415a
* commit '2c2415a552b62016886af62419080ca7ac327871':
Fix printf format
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp
index f42f850..a8b91d2 100644
--- a/media/jni/soundpool/SoundPool.cpp
+++ b/media/jni/soundpool/SoundPool.cpp
@@ -479,7 +479,7 @@
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 @@
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);