summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MP3Extractor.cpp
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-17 13:46:19 -0700
committerLajos Molnar <lajos@google.com>2015-04-17 13:46:43 -0700
commitee4e1b1a63758941460ae79a064249d3a5189443 (patch)
treed27f03a73170da9cce96b6eae5b2ecd874eace22 /media/libstagefright/MP3Extractor.cpp
parent2170233c49e50f3986cdc4f726016d6003cb5b8e (diff)
downloadframeworks_av-ee4e1b1a63758941460ae79a064249d3a5189443.zip
frameworks_av-ee4e1b1a63758941460ae79a064249d3a5189443.tar.gz
frameworks_av-ee4e1b1a63758941460ae79a064249d3a5189443.tar.bz2
stagefright: warnings be gone, some are now errors, use clang
Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
Diffstat (limited to 'media/libstagefright/MP3Extractor.cpp')
-rw-r--r--media/libstagefright/MP3Extractor.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp
index 4a63152..55e3c19 100644
--- a/media/libstagefright/MP3Extractor.cpp
+++ b/media/libstagefright/MP3Extractor.cpp
@@ -82,7 +82,7 @@ static bool Resync(
*inout_pos += len;
ALOGV("skipped ID3 tag, new starting offset is %lld (0x%016llx)",
- *inout_pos, *inout_pos);
+ (long long)*inout_pos, (long long)*inout_pos);
}
if (post_id3_pos != NULL) {
@@ -103,9 +103,9 @@ static bool Resync(
uint8_t *tmp = buf;
do {
- if (pos >= *inout_pos + kMaxBytesChecked) {
+ if (pos >= (off64_t)(*inout_pos + kMaxBytesChecked)) {
// Don't scan forever.
- ALOGV("giving up at offset %lld", pos);
+ ALOGV("giving up at offset %lld", (long long)pos);
break;
}
@@ -155,7 +155,7 @@ static bool Resync(
continue;
}
- ALOGV("found possible 1st frame at %lld (header = 0x%08x)", pos, header);
+ ALOGV("found possible 1st frame at %lld (header = 0x%08x)", (long long)pos, header);
// We found what looks like a valid frame,
// now find its successors.
@@ -186,7 +186,7 @@ static bool Resync(
break;
}
- ALOGV("found subsequent frame #%d at %lld", j + 2, test_pos);
+ ALOGV("found subsequent frame #%d at %lld", j + 2, (long long)test_pos);
test_pos += test_frame_size;
}