Fix build when #define LOG_NDEBUG 0
A few variables have changed type and when building with LOG_NDEBUG 0
the code no longer compile. Adjust the ALOG_ASSERT strings to use the
correct types.
Test: make with LOG_NDEBUG enabled
Bug: 31584070
Change-Id: Ib47f369f8be9fa0c12fa4f69c294a719df8ad018
diff --git a/services/audioflinger/AudioResamplerDyn.cpp b/services/audioflinger/AudioResamplerDyn.cpp
index e615700..b7ca5d9 100644
--- a/services/audioflinger/AudioResamplerDyn.cpp
+++ b/services/audioflinger/AudioResamplerDyn.cpp
@@ -520,7 +520,7 @@
// inFrameCount, outputIndex, outFrameCount, phaseFraction, phaseWrapLimit);
// check inputIndex overflow
- ALOG_ASSERT(inputIndex <= mBuffer.frameCount, "inputIndex%d > frameCount%d",
+ ALOG_ASSERT(inputIndex <= mBuffer.frameCount, "inputIndex%zu > frameCount%zu",
inputIndex, mBuffer.frameCount);
// Buffer is empty, fetch a new one if necessary (inFrameCount > 0).
// We may not fetch a new buffer if the existing data is sufficient.
@@ -591,7 +591,7 @@
// We arrive here when we're finished or when the input buffer runs out.
// Regardless we need to release the input buffer if we've acquired it.
if (inputIndex > 0) { // we've acquired a buffer (alternatively could check frameCount)
- ALOG_ASSERT(inputIndex == frameCount, "inputIndex(%d) != frameCount(%d)",
+ ALOG_ASSERT(inputIndex == frameCount, "inputIndex(%zu) != frameCount(%zu)",
inputIndex, frameCount); // must have been fully read.
inputIndex = 0;
provider->releaseBuffer(&mBuffer);
@@ -603,7 +603,7 @@
// inputIndex must be zero in all three cases:
// (1) the buffer never was been acquired; (2) the buffer was
// released at "done:"; or (3) getNextBuffer() failed.
- ALOG_ASSERT(inputIndex == 0, "Releasing: inputindex:%d frameCount:%d phaseFraction:%u",
+ ALOG_ASSERT(inputIndex == 0, "Releasing: inputindex:%zu frameCount:%zu phaseFraction:%u",
inputIndex, mBuffer.frameCount, phaseFraction);
ALOG_ASSERT(mBuffer.frameCount == 0); // there must be no frames in the buffer
mInBuffer.setImpulse(impulse);