Fix build warnings
Change-Id: Idfdaff3a7a8f60cd8817bd306bfba28020a391c8
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index f0c5a21..016c25e 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1302,7 +1302,7 @@
bool removed = false;
for (size_t i = 0; i< num; ) {
AudioSessionRef *ref = mAudioSessionRefs.itemAt(i);
- ALOGV(" pid %d @ %d", ref->mPid, i);
+ ALOGV(" pid %d @ %zu", ref->mPid, i);
if (ref->mPid == pid) {
ALOGV(" removing entry for pid %d session %d", pid, ref->mSessionid);
mAudioSessionRefs.removeAt(i);
@@ -1563,7 +1563,7 @@
int rc = load_audio_interface(name, &dev);
if (rc) {
- ALOGI("loadHwModule() error %d loading module %s ", rc, name);
+ ALOGE("loadHwModule() error %d loading module %s", rc, name);
return 0;
}
@@ -1571,7 +1571,7 @@
rc = dev->init_check(dev);
mHardwareStatus = AUDIO_HW_IDLE;
if (rc) {
- ALOGI("loadHwModule() init check error %d for module %s ", rc, name);
+ ALOGE("loadHwModule() init check error %d for module %s", rc, name);
return 0;
}
@@ -2857,7 +2857,7 @@
{
audio_session_t session = chain->sessionId();
ssize_t index = mOrphanEffectChains.indexOfKey(session);
- ALOGV("putOrphanEffectChain_l session %d index %d", session, index);
+ ALOGV("putOrphanEffectChain_l session %d index %zd", session, index);
if (index >= 0) {
ALOGW("putOrphanEffectChain_l chain for session %d already present", session);
return ALREADY_EXISTS;
@@ -2870,7 +2870,7 @@
{
sp<EffectChain> chain;
ssize_t index = mOrphanEffectChains.indexOfKey(session);
- ALOGV("getOrphanEffectChain_l session %d index %d", session, index);
+ ALOGV("getOrphanEffectChain_l session %d index %zd", session, index);
if (index >= 0) {
chain = mOrphanEffectChains.valueAt(index);
mOrphanEffectChains.removeItemsAt(index);
@@ -2883,11 +2883,11 @@
Mutex::Autolock _l(mLock);
audio_session_t session = effect->sessionId();
ssize_t index = mOrphanEffectChains.indexOfKey(session);
- ALOGV("updateOrphanEffectChains session %d index %d", session, index);
+ ALOGV("updateOrphanEffectChains session %d index %zd", session, index);
if (index >= 0) {
sp<EffectChain> chain = mOrphanEffectChains.valueAt(index);
if (chain->removeEffect_l(effect) == 0) {
- ALOGV("updateOrphanEffectChains removing effect chain at index %d", index);
+ ALOGV("updateOrphanEffectChains removing effect chain at index %zd", index);
mOrphanEffectChains.removeItemsAt(index);
}
return true;
diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 93768ca..00304b2 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -138,7 +138,7 @@
} else {
status = ALREADY_EXISTS;
}
- ALOGV("addHandle() %p added handle %p in position %d", this, handle, i);
+ ALOGV("addHandle() %p added handle %p in position %zu", this, handle, i);
mHandles.insertAt(handle, i);
return status;
}
@@ -156,7 +156,7 @@
if (i == size) {
return size;
}
- ALOGV("removeHandle() %p removed handle %p in position %d", this, handle, i);
+ ALOGV("removeHandle() %p removed handle %p in position %zu", this, handle, i);
mHandles.removeAt(i);
// if removed from first place, move effect control from this handle to next in line
@@ -380,7 +380,7 @@
mConfig.inputCfg.buffer.frameCount = thread->frameCount();
mConfig.outputCfg.buffer.frameCount = mConfig.inputCfg.buffer.frameCount;
- ALOGV("configure() %p thread %p buffer %p framecount %d",
+ ALOGV("configure() %p thread %p buffer %p framecount %zu",
this, thread.get(), mConfig.inputCfg.buffer.raw, mConfig.inputCfg.buffer.frameCount);
status_t cmdStatus;
@@ -1050,7 +1050,7 @@
mCblkMemory = client->heap()->allocate(EFFECT_PARAM_BUFFER_SIZE + bufOffset);
if (mCblkMemory == 0 ||
(mCblk = static_cast<effect_param_cblk_t *>(mCblkMemory->pointer())) == NULL) {
- ALOGE("not enough memory for Effect size=%u", EFFECT_PARAM_BUFFER_SIZE +
+ ALOGE("not enough memory for Effect size=%zu", EFFECT_PARAM_BUFFER_SIZE +
sizeof(effect_param_cblk_t));
mCblkMemory.clear();
return;
@@ -1579,7 +1579,7 @@
}
mEffects.insertAt(effect, idx_insert);
- ALOGV("addEffect_l() effect %p, added in chain %p at rank %d", effect.get(), this,
+ ALOGV("addEffect_l() effect %p, added in chain %p at rank %zu", effect.get(), this,
idx_insert);
}
effect->configure();
@@ -1611,7 +1611,7 @@
}
}
mEffects.removeAt(i);
- ALOGV("removeEffect_l() effect %p, removed from chain %p at rank %d", effect.get(),
+ ALOGV("removeEffect_l() effect %p, removed from chain %p at rank %zu", effect.get(),
this, i);
break;
}
@@ -1726,7 +1726,7 @@
String8 result;
size_t numEffects = mEffects.size();
- snprintf(buffer, SIZE, " %d effects for session %d\n", numEffects, mSessionId);
+ snprintf(buffer, SIZE, " %zu effects for session %d\n", numEffects, mSessionId);
result.append(buffer);
if (numEffects) {
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp
index 2332f3a..26cd1f9 100644
--- a/services/audioflinger/FastMixer.cpp
+++ b/services/audioflinger/FastMixer.cpp
@@ -433,7 +433,8 @@
}
if (mMasterMono.load()) { // memory_order_seq_cst
- mono_blend(mMixerBuffer, mMixerBufferFormat, Format_channelCount(mFormat), frameCount, true /*limit*/);
+ mono_blend(mMixerBuffer, mMixerBufferFormat, Format_channelCount(mFormat), frameCount,
+ true /*limit*/);
}
// prepare the buffer used to write to sink
void *buffer = mSinkBuffer != NULL ? mSinkBuffer : mMixerBuffer;
diff --git a/services/audioflinger/PatchPanel.cpp b/services/audioflinger/PatchPanel.cpp
index 658b820..bf6763f 100644
--- a/services/audioflinger/PatchPanel.cpp
+++ b/services/audioflinger/PatchPanel.cpp
@@ -401,7 +401,7 @@
shift = playbackShift;
}
size_t frameCount = (playbackFrameCount * recordFramecount) >> shift;
- ALOGV("createPatchConnections() playframeCount %d recordFramecount %d frameCount %d ",
+ ALOGV("createPatchConnections() playframeCount %zu recordFramecount %zu frameCount %zu",
playbackFrameCount, recordFramecount, frameCount);
// create a special record track to capture from record thread
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 040cb93..973c983 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -725,7 +725,7 @@
return status;
}
mConfigEvents.add(event);
- ALOGV("sendConfigEvent_l() num events %d event %d", mConfigEvents.size(), event->mType);
+ ALOGV("sendConfigEvent_l() num events %zu event %d", mConfigEvents.size(), event->mType);
mWaitWorkCV.signal();
mLock.unlock();
{
@@ -817,7 +817,7 @@
bool configChanged = false;
while (!mConfigEvents.isEmpty()) {
- ALOGV("processConfigEvents_l() remaining events %d", mConfigEvents.size());
+ ALOGV("processConfigEvents_l() remaining events %zu", mConfigEvents.size());
sp<ConfigEvent> event = mConfigEvents[0];
mConfigEvents.removeAt(0);
switch (event->mType) {
@@ -949,7 +949,7 @@
dprintf(fd, " Sample rate: %u Hz\n", mSampleRate);
dprintf(fd, " HAL frame count: %zu\n", mFrameCount);
dprintf(fd, " HAL format: 0x%x (%s)\n", mHALFormat, formatToString(mHALFormat));
- dprintf(fd, " HAL buffer size: %u bytes\n", mBufferSize);
+ dprintf(fd, " HAL buffer size: %zu bytes\n", mBufferSize);
dprintf(fd, " Channel count: %u\n", mChannelCount);
dprintf(fd, " Channel mask: 0x%08x (%s)\n", mChannelMask,
channelMaskToString(mChannelMask, mType != RECORD).string());
@@ -1685,10 +1685,10 @@
size_t numtracks = mTracks.size();
size_t numactive = mActiveTracks.size();
- dprintf(fd, " %d Tracks", numtracks);
+ dprintf(fd, " %zu Tracks", numtracks);
size_t numactiveseen = 0;
if (numtracks) {
- dprintf(fd, " of which %d are active\n", numactive);
+ dprintf(fd, " of which %zu are active\n", numactive);
Track::appendDumpHeader(result);
for (size_t i = 0; i < numtracks; ++i) {
sp<Track> track = mTracks[i];
@@ -1729,7 +1729,8 @@
dumpBase(fd, args);
dprintf(fd, " Normal frame count: %zu\n", mNormalFrameCount);
- dprintf(fd, " Last write occurred (msecs): %llu\n", ns2ms(systemTime() - mLastWriteTime));
+ dprintf(fd, " Last write occurred (msecs): %llu\n",
+ (unsigned long long) ns2ms(systemTime() - mLastWriteTime));
dprintf(fd, " Total writes: %d\n", mNumWrites);
dprintf(fd, " Delayed writes: %d\n", mNumDelayedWrites);
dprintf(fd, " Blocked in write: %s\n", mInWrite ? "yes" : "no");
@@ -1823,11 +1824,11 @@
}
frameCount = mFrameCount * sFastTrackMultiplier;
}
- ALOGV("AUDIO_OUTPUT_FLAG_FAST accepted: frameCount=%d mFrameCount=%d",
+ ALOGV("AUDIO_OUTPUT_FLAG_FAST accepted: frameCount=%zu mFrameCount=%zu",
frameCount, mFrameCount);
} else {
- ALOGV("AUDIO_OUTPUT_FLAG_FAST denied: sharedBuffer=%p frameCount=%d "
- "mFrameCount=%d format=%#x mFormat=%#x isLinear=%d channelMask=%#x "
+ ALOGV("AUDIO_OUTPUT_FLAG_FAST denied: sharedBuffer=%p frameCount=%zu "
+ "mFrameCount=%zu format=%#x mFormat=%#x isLinear=%d channelMask=%#x "
"sampleRate=%u mSampleRate=%u "
"hasFastMixer=%d tid=%d fastTrackAvailMask=%#x",
sharedBuffer.get(), frameCount, mFrameCount, format, mFormat,
@@ -2259,7 +2260,7 @@
mBufferSize = mOutput->stream->common.get_buffer_size(&mOutput->stream->common);
mFrameCount = mBufferSize / mFrameSize;
if (mFrameCount & 15) {
- ALOGW("HAL output buffer size is %u frames but AudioMixer requires multiples of 16 frames",
+ ALOGW("HAL output buffer size is %zu frames but AudioMixer requires multiples of 16 frames",
mFrameCount);
}
@@ -2345,7 +2346,7 @@
if (mType == MIXER || mType == DUPLICATING) {
mNormalFrameCount = (mNormalFrameCount + 15) & ~15;
}
- ALOGI("HAL output buffer size %u frames, normal sink buffer size %u frames", mFrameCount,
+ ALOGI("HAL output buffer size %zu frames, normal sink buffer size %zu frames", mFrameCount,
mNormalFrameCount);
// Check if we want to throttle the processing to no more than 2x normal rate
@@ -2682,7 +2683,7 @@
void AudioFlinger::PlaybackThread::invalidateTracks(audio_stream_type_t streamType)
{
- ALOGV("MixerThread::invalidateTracks() mixer %p, streamType %d, mTracks.size %d",
+ ALOGV("MixerThread::invalidateTracks() mixer %p, streamType %d, mTracks.size %zu",
this, streamType, mTracks.size());
Mutex::Autolock _l(mLock);
@@ -3126,7 +3127,7 @@
if ((now - lastWarning) > kWarningThrottleNs) {
ATRACE_NAME("underrun");
ALOGW("write blocked for %llu msecs, %d delayed writes, thread %p",
- ns2ms(delta), mNumDelayedWrites, this);
+ (unsigned long long) ns2ms(delta), mNumDelayedWrites, this);
lastWarning = now;
}
}
@@ -3471,8 +3472,8 @@
// mNormalSink below
{
ALOGV("MixerThread() id=%d device=%#x type=%d", id, device, type);
- ALOGV("mSampleRate=%u, mChannelMask=%#x, mChannelCount=%u, mFormat=%d, mFrameSize=%u, "
- "mFrameCount=%d, mNormalFrameCount=%d",
+ ALOGV("mSampleRate=%u, mChannelMask=%#x, mChannelCount=%u, mFormat=%d, mFrameSize=%zu, "
+ "mFrameCount=%zu, mNormalFrameCount=%zu",
mSampleRate, mChannelMask, mChannelCount, mFormat, mFrameSize, mFrameCount,
mNormalFrameCount);
mAudioMixer = new AudioMixer(mNormalFrameCount, mSampleRate);
@@ -4965,7 +4966,7 @@
// For compressed offload, use faster sleep time when underruning until more than an
// entire buffer was written to the audio HAL
if (!audio_has_proportional_frames(mFormat) &&
- (mType == OFFLOAD) && (mBytesWritten < mBufferSize)) {
+ (mType == OFFLOAD) && (mBytesWritten < (int64_t) mBufferSize)) {
mSleepTimeUs = kDirectMinSleepTimeUs;
} else {
mSleepTimeUs = mActiveSleepTimeUs;
@@ -5276,7 +5277,7 @@
bool doHwPause = false;
bool doHwResume = false;
- ALOGV("OffloadThread::prepareTracks_l active tracks %d", count);
+ ALOGV("OffloadThread::prepareTracks_l active tracks %zu", count);
// find out which tracks need to be processed
for (size_t i = 0; i < count; i++) {
@@ -6129,7 +6130,7 @@
// ALOGD("%s", mTimestamp.toString().c_str());
if (framesRead < 0 || (framesRead == 0 && mPipeSource == 0)) {
- ALOGE("read failed: framesRead=%d", framesRead);
+ ALOGE("read failed: framesRead=%zd", framesRead);
// Force input into standby so that it tries to recover at next read attempt
inputStandBy();
sleepUs = kRecordThreadSleepUs;
@@ -6365,10 +6366,10 @@
// there are sufficient fast track slots available
mFastTrackAvail
) {
- ALOGV("AUDIO_INPUT_FLAG_FAST accepted: frameCount=%u mFrameCount=%u",
+ ALOGV("AUDIO_INPUT_FLAG_FAST accepted: frameCount=%zu mFrameCount=%zu",
frameCount, mFrameCount);
} else {
- ALOGV("AUDIO_INPUT_FLAG_FAST denied: frameCount=%u mFrameCount=%u mPipeFramesP2=%u "
+ ALOGV("AUDIO_INPUT_FLAG_FAST denied: frameCount=%zu mFrameCount=%zu mPipeFramesP2=%zu "
"format=%#x isLinear=%d channelMask=%#x sampleRate=%u mSampleRate=%u "
"hasFastCapture=%d tid=%d mFastTrackAvail=%d",
frameCount, mFrameCount, mPipeFramesP2,
@@ -6661,9 +6662,9 @@
size_t numtracks = mTracks.size();
size_t numactive = mActiveTracks.size();
size_t numactiveseen = 0;
- dprintf(fd, " %d Tracks", numtracks);
+ dprintf(fd, " %zu Tracks", numtracks);
if (numtracks) {
- dprintf(fd, " of which %d are active\n", numactive);
+ dprintf(fd, " of which %zu are active\n", numactive);
RecordTrack::appendDumpHeader(result);
for (size_t i = 0; i < numtracks ; ++i) {
sp<RecordTrack> track = mTracks[i];
@@ -7327,7 +7328,7 @@
{
ALOGV("removeEffectChain_l() %p from thread %p", chain.get(), this);
ALOGW_IF(mEffectChains.size() != 1,
- "removeEffectChain_l() %p invalid chain size %d on thread %p",
+ "removeEffectChain_l() %p invalid chain size %zu on thread %p",
chain.get(), mEffectChains.size(), this);
if (mEffectChains.size() == 1) {
mEffectChains.removeAt(0);
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index f575918..7cbb6b8 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -122,7 +122,7 @@
mCblkMemory = client->heap()->allocate(size);
if (mCblkMemory == 0 ||
(mCblk = static_cast<audio_track_cblk_t *>(mCblkMemory->pointer())) == NULL) {
- ALOGE("not enough memory for AudioTrack size=%u", size);
+ ALOGE("not enough memory for AudioTrack size=%zu", size);
client->heap()->dump("AudioTrack");
mCblkMemory.clear();
return;
@@ -959,9 +959,9 @@
if (isOffloaded()) {
complete = true;
} else if (isDirect() || isFastTrack()) { // these do not go through linear map
- complete = framesWritten >= mPresentationCompleteFrames;
+ complete = framesWritten >= (int64_t) mPresentationCompleteFrames;
} else { // Normal tracks, OutputTracks, and PatchTracks
- complete = framesWritten >= mPresentationCompleteFrames
+ complete = framesWritten >= (int64_t) mPresentationCompleteFrames
&& mAudioTrackServerProxy->isDrained();
}
@@ -1016,7 +1016,7 @@
if (isTerminated() || mState == PAUSED ||
((framesReady() == 0) && ((mSharedBuffer != 0) ||
(mState == STOPPED)))) {
- ALOGW("Track::setSyncEvent() in invalid state %d on session %d %s mode, framesReady %d ",
+ ALOGW("Track::setSyncEvent() in invalid state %d on session %d %s mode, framesReady %zu",
mState, mSessionId, (mSharedBuffer != 0) ? "static" : "stream", framesReady());
event->cancel();
return INVALID_OPERATION;
@@ -1137,7 +1137,7 @@
mOutBuffer.frameCount = 0;
playbackThread->mTracks.add(this);
ALOGV("OutputTrack constructor mCblk %p, mBuffer %p, "
- "frameCount %u, mChannelMask 0x%08x",
+ "frameCount %zu, mChannelMask 0x%08x",
mCblk, mBuffer,
frameCount, mChannelMask);
// since client and server are in the same process,
@@ -1246,7 +1246,7 @@
mBufferQueue.removeAt(0);
free(pInBuffer->mBuffer);
delete pInBuffer;
- ALOGV("OutputTrack::write() %p thread %p released overflow buffer %d", this,
+ ALOGV("OutputTrack::write() %p thread %p released overflow buffer %zu", this,
mThread.unsafe_get(), mBufferQueue.size());
} else {
break;
@@ -1265,7 +1265,7 @@
pInBuffer->raw = pInBuffer->mBuffer;
memcpy(pInBuffer->raw, inBuffer.raw, inBuffer.frameCount * mFrameSize);
mBufferQueue.add(pInBuffer);
- ALOGV("OutputTrack::write() %p thread %p adding overflow buffer %d", this,
+ ALOGV("OutputTrack::write() %p thread %p adding overflow buffer %zu", this,
mThread.unsafe_get(), mBufferQueue.size());
} else {
ALOGW("OutputTrack::write() %p thread %p no more overflow buffers",