diff options
author | Glenn Kasten <gkasten@google.com> | 2014-04-08 10:41:02 -0700 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2014-04-08 10:41:02 -0700 |
commit | 1e4e4f40b4e2c655ca377adbba53df897545c3ae (patch) | |
tree | abf495ff585fcda3118bbf02adfc05690200b366 /services/audioflinger | |
parent | c51db0a6bfb71ea9c934fb7971cb5ae1f1cf03a0 (diff) | |
download | frameworks_av-1e4e4f40b4e2c655ca377adbba53df897545c3ae.zip frameworks_av-1e4e4f40b4e2c655ca377adbba53df897545c3ae.tar.gz frameworks_av-1e4e4f40b4e2c655ca377adbba53df897545c3ae.tar.bz2 |
Fix 64-bit build warnings
Change-Id: I667401522cb4ccd41013e2883a4c75ddeca08ef6
Diffstat (limited to 'services/audioflinger')
-rw-r--r-- | services/audioflinger/test-resample.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/services/audioflinger/test-resample.cpp b/services/audioflinger/test-resample.cpp index 7b7cdac..6279665 100644 --- a/services/audioflinger/test-resample.cpp +++ b/services/audioflinger/test-resample.cpp @@ -24,6 +24,7 @@ #include <sys/mman.h> #include <sys/stat.h> #include <errno.h> +#include <inttypes.h> #include <time.h> #include <math.h> #include <audio_utils/sndfile.h> @@ -251,7 +252,7 @@ int main(int argc, char* argv[]) { } if (!mPvalues.isEmpty()) { size_t provided = mPvalues[mNextPidx++]; - printf("mPvalue[%d]=%u not %u\n", mNextPidx-1, provided, buffer->frameCount); + printf("mPvalue[%zu]=%zu not %zu\n", mNextPidx-1, provided, buffer->frameCount); if (provided < buffer->frameCount) { buffer->frameCount = provided; } @@ -260,9 +261,9 @@ int main(int argc, char* argv[]) { } } if (gVerbose) { - printf("getNextBuffer() requested %u frames out of %u frames available," - " and returned %u frames\n", - requestedFrames, mNumFrames - mNextFrame, buffer->frameCount); + printf("getNextBuffer() requested %zu frames out of %zu frames available," + " and returned %zu frames\n", + requestedFrames, (size_t) (mNumFrames - mNextFrame), buffer->frameCount); } mUnrel = buffer->frameCount; if (buffer->frameCount > 0) { @@ -275,13 +276,13 @@ int main(int argc, char* argv[]) { } virtual void releaseBuffer(Buffer* buffer) { if (buffer->frameCount > mUnrel) { - fprintf(stderr, "ERROR releaseBuffer() released %u frames but only %u available " + fprintf(stderr, "ERROR releaseBuffer() released %zu frames but only %zu available " "to release\n", buffer->frameCount, mUnrel); mNextFrame += mUnrel; mUnrel = 0; } else { if (gVerbose) { - printf("releaseBuffer() released %u frames out of %u frames available " + printf("releaseBuffer() released %zu frames out of %zu frames available " "to release\n", buffer->frameCount, mUnrel); } mNextFrame += buffer->frameCount; @@ -297,7 +298,7 @@ int main(int argc, char* argv[]) { size_t input_frames = input_size / (channels * sizeof(int16_t)); if (gVerbose) { - printf("%u input frames\n", input_frames); + printf("%zu input frames\n", input_frames); } size_t output_size = 2 * 4 * ((int64_t) input_frames * output_freq) / input_freq; output_size &= ~7; // always stereo, 32-bits @@ -386,7 +387,7 @@ int main(int argc, char* argv[]) { const int trials = 4; const int looplimit = 4; timespec start, end; - int64_t time; + int64_t time = 0; for (int n = 0; n < trials; ++n) { clock_gettime(CLOCK_MONOTONIC, &start); @@ -403,14 +404,14 @@ int main(int argc, char* argv[]) { } } // Mfrms/s is "Millions of output frames per second". - printf("quality: %d channels: %d msec: %lld Mfrms/s: %.2lf\n", + printf("quality: %d channels: %d msec: %" PRId64 " Mfrms/s: %.2lf\n", quality, channels, time/1000000, out_frames * looplimit / (time / 1e9) / 1e6); resampler->reset(); } memset(output_vaddr, 0, output_size); if (gVerbose) { - printf("resample() %u output frames\n", out_frames); + printf("resample() %zu output frames\n", out_frames); } if (Ovalues.isEmpty()) { Ovalues.push(out_frames); |