diff options
Diffstat (limited to 'services/audioflinger/tests')
| -rw-r--r-- | services/audioflinger/tests/resampler_tests.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/tests/test-mixer.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/tests/test_utils.h | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/services/audioflinger/tests/resampler_tests.cpp b/services/audioflinger/tests/resampler_tests.cpp index 169ce02..d6217ba 100644 --- a/services/audioflinger/tests/resampler_tests.cpp +++ b/services/audioflinger/tests/resampler_tests.cpp @@ -60,7 +60,7 @@ void buffercmp(const void *reference, const void *test, int check = memcmp((const char*)reference + i * outputFrameSize, (const char*)test + i * outputFrameSize, outputFrameSize); if (check) { - ALOGE("Failure at frame %d", i); + ALOGE("Failure at frame %zu", i); ASSERT_EQ(check, 0); /* fails */ } } diff --git a/services/audioflinger/tests/test-mixer.cpp b/services/audioflinger/tests/test-mixer.cpp index 5a00f40..9a4fad6 100644 --- a/services/audioflinger/tests/test-mixer.cpp +++ b/services/audioflinger/tests/test-mixer.cpp @@ -62,7 +62,7 @@ static int writeFile(const char *filename, const void *buffer, info.samplerate = sampleRate; info.channels = channels; info.format = SF_FORMAT_WAV | (isBufferFloat ? SF_FORMAT_FLOAT : SF_FORMAT_PCM_16); - printf("saving file:%s channels:%d samplerate:%d frames:%d\n", + printf("saving file:%s channels:%u samplerate:%u frames:%zu\n", filename, info.channels, info.samplerate, frames); SNDFILE *sf = sf_open(filename, SFM_WRITE, &info); if (sf == NULL) { diff --git a/services/audioflinger/tests/test_utils.h b/services/audioflinger/tests/test_utils.h index e446216..3d51cdc 100644 --- a/services/audioflinger/tests/test_utils.h +++ b/services/audioflinger/tests/test_utils.h @@ -120,7 +120,7 @@ public: } if (!mInputIncr.empty()) { size_t provided = mInputIncr[mNextIdx++]; - ALOGV("getNextBuffer() mValue[%d]=%u not %u", + ALOGV("getNextBuffer() mValue[%zu]=%zu not %zu", mNextIdx-1, provided, buffer->frameCount); if (provided < buffer->frameCount) { buffer->frameCount = provided; @@ -129,8 +129,8 @@ public: mNextIdx = 0; } } - ALOGV("getNextBuffer() requested %u frames out of %u frames available" - " and returned %u frames\n", + ALOGV("getNextBuffer() requested %zu frames out of %zu frames available" + " and returned %zu frames", requestedFrames, mNumFrames - mNextFrame, buffer->frameCount); mUnrel = buffer->frameCount; if (buffer->frameCount > 0) { @@ -145,14 +145,14 @@ public: virtual void releaseBuffer(Buffer* buffer) { if (buffer->frameCount > mUnrel) { - ALOGE("releaseBuffer() released %u frames but only %u available " - "to release\n", buffer->frameCount, mUnrel); + ALOGE("releaseBuffer() released %zu frames but only %zu available " + "to release", buffer->frameCount, mUnrel); mNextFrame += mUnrel; mUnrel = 0; } else { - ALOGV("releaseBuffer() released %u frames out of %u frames available " - "to release\n", buffer->frameCount, mUnrel); + ALOGV("releaseBuffer() released %zu frames out of %zu frames available " + "to release", buffer->frameCount, mUnrel); mNextFrame += buffer->frameCount; mUnrel -= buffer->frameCount; } |