From 49f36ba3b4624ddd3d7efa34c95128a73bda6208 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Wed, 6 Dec 2017 13:02:02 -0800 Subject: [PATCH] Logs use either %#x or 0x%x for flags, channel mask, format, device Preferred is %#x but 0x%x is also permitted because it is widely used. The benefit is that it reduces ambiguity and possible confusion, without needing to read the source code for each log. Test: builds OK and logs are less ambiguous Change-Id: Ie2404e071d22278b8bba1e094ad336887844212c --- media/libaudioclient/AudioSystem.cpp | 2 +- media/libaudioclient/AudioTrack.cpp | 4 ++-- services/audioflinger/AudioFlinger.cpp | 8 ++++---- services/audioflinger/BufLog.cpp | 2 +- services/audioflinger/Threads.cpp | 6 +++--- .../audiopolicy/managerdefault/AudioPolicyManager.cpp | 9 +++++---- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp index c284f7301b..50fe385ec8 100644 --- a/media/libaudioclient/AudioSystem.cpp +++ b/media/libaudioclient/AudioSystem.cpp @@ -631,7 +631,7 @@ status_t AudioSystem::AudioFlingerClient::getInputBufferSize( || (channelMask != mInChannelMask)) { size_t inBuffSize = af->getInputBufferSize(sampleRate, format, channelMask); if (inBuffSize == 0) { - ALOGE("AudioSystem::getInputBufferSize failed sampleRate %d format %#x channelMask %x", + ALOGE("AudioSystem::getInputBufferSize failed sampleRate %d format %#x channelMask %#x", sampleRate, format, channelMask); return BAD_VALUE; } diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp index c8fa618f9b..6d829a0741 100644 --- a/media/libaudioclient/AudioTrack.cpp +++ b/media/libaudioclient/AudioTrack.cpp @@ -2674,13 +2674,13 @@ status_t AudioTrack::dump(int fd, const Vector& args __unused) const String8 result; result.append(" AudioTrack::dump\n"); - result.appendFormat(" status(%d), state(%d), session Id(%d), flags(%x)\n", + result.appendFormat(" status(%d), state(%d), session Id(%d), flags(%#x)\n", mStatus, mState, mSessionId, mFlags); result.appendFormat(" stream type(%d), left - right volume(%f, %f)\n", (mStreamType == AUDIO_STREAM_DEFAULT) ? audio_attributes_to_stream_type(&mAttributes) : mStreamType, mVolume[AUDIO_INTERLEAVE_LEFT], mVolume[AUDIO_INTERLEAVE_RIGHT]); - result.appendFormat(" format(%x), channel mask(%x), channel count(%u)\n", + result.appendFormat(" format(%#x), channel mask(%#x), channel count(%u)\n", mFormat, mChannelMask, mChannelCount); result.appendFormat(" sample rate(%u), original sample rate(%u), speed(%f)\n", mSampleRate, mOriginalSampleRate, mPlaybackRate.mSpeed); diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 9fef60fec3..3c975c30ca 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -2042,8 +2042,8 @@ status_t AudioFlinger::openOutput(audio_module_handle_t module, uint32_t *latencyMs, audio_output_flags_t flags) { - ALOGI("openOutput() this %p, module %d Device %x, SamplingRate %d, Format %#08x, Channels %x, " - "flags %x", + ALOGI("openOutput() this %p, module %d Device %#x, SamplingRate %d, Format %#08x, " + "Channels %#x, flags %#x", this, module, (devices != NULL) ? *devices : 0, config->sample_rate, @@ -2285,8 +2285,8 @@ sp AudioFlinger::openInput_l(audio_module_handle_t mod sp inStream; status_t status = inHwHal->openInputStream( *input, devices, &halconfig, flags, address.string(), source, &inStream); - ALOGV("openInput_l() openInputStream returned input %p, devices %x, SamplingRate %d" - ", Format %#x, Channels %x, flags %#x, status %d addr %s", + ALOGV("openInput_l() openInputStream returned input %p, devices %#x, SamplingRate %d" + ", Format %#x, Channels %#x, flags %#x, status %d addr %s", inStream.get(), devices, halconfig.sample_rate, diff --git a/services/audioflinger/BufLog.cpp b/services/audioflinger/BufLog.cpp index 9680eb5e45..2780290155 100644 --- a/services/audioflinger/BufLog.cpp +++ b/services/audioflinger/BufLog.cpp @@ -121,7 +121,7 @@ BufLogStream::BufLogStream(unsigned int id, } else { mTag[0] = 0; } - ALOGV("Creating BufLogStream id:%d tag:%s format:%d ch:%d sr:%d maxbytes:%zu", mId, mTag, + ALOGV("Creating BufLogStream id:%d tag:%s format:%#x ch:%d sr:%d maxbytes:%zu", mId, mTag, mFormat, mChannels, mSamplingRate, mMaxBytes); //open file (s), info about tag, format, etc. diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 0601233ab7..3bb5803271 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1412,7 +1412,7 @@ status_t AudioFlinger::ThreadBase::addEffect_l(const sp& effect) bool chainCreated = false; ALOGD_IF((mType == OFFLOAD) && !effect->isOffloadable(), - "addEffect_l() on offloaded thread %p: effect %s does not support offload flags %x", + "addEffect_l() on offloaded thread %p: effect %s does not support offload flags %#x", this, effect->desc().name, effect->desc().flags); if (chain == 0) { @@ -3697,7 +3697,7 @@ AudioFlinger::MixerThread::MixerThread(const sp& audioFlinger, Aud // mNormalSink below { ALOGV("MixerThread() id=%d device=%#x type=%d", id, device, type); - ALOGV("mSampleRate=%u, mChannelMask=%#x, mChannelCount=%u, mFormat=%d, mFrameSize=%zu, " + ALOGV("mSampleRate=%u, mChannelMask=%#x, mChannelCount=%u, mFormat=%#x, mFrameSize=%zu, " "mFrameCount=%zu, mNormalFrameCount=%zu", mSampleRate, mChannelMask, mChannelCount, mFormat, mFrameSize, mFrameCount, mNormalFrameCount); @@ -3765,7 +3765,7 @@ AudioFlinger::MixerThread::MixerThread(const sp& audioFlinger, Aud NBAIO_Format origformat = format; #endif // adjust format to match that of the Fast Mixer - ALOGV("format changed from %d to %d", format.mFormat, fastMixerFormat); + ALOGV("format changed from %#x to %#x", format.mFormat, fastMixerFormat); format.mFormat = fastMixerFormat; format.mFrameSize = audio_bytes_per_sample(format.mFormat) * format.mChannelCount; diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index ae3dd08cee..68730a59db 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp @@ -804,7 +804,8 @@ status_t AudioPolicyManager::getOutputForAttr(const audio_attributes_t *attr, flags = (audio_output_flags_t)(flags | AUDIO_OUTPUT_FLAG_HW_AV_SYNC); } - ALOGV("getOutputForAttr() device 0x%x, sampling rate %d, format %x, channel mask %x, flags %x", + ALOGV("getOutputForAttr() device 0x%x, sampling rate %d, format %#x, channel mask %#x, " + "flags %#x", device, config->sample_rate, config->format, config->channel_mask, flags); *output = getOutputForDevice(device, session, *stream, config, flags); @@ -972,7 +973,7 @@ non_direct_output: output = selectOutput(outputs, flags, config->format); } ALOGW_IF((output == 0), "getOutputForDevice() could not find output for stream %d, " - "sampling rate %d, format %d, channels %x, flags %x", + "sampling rate %d, format %#x, channels %#x, flags %#x", stream, config->sample_rate, config->format, config->channel_mask, flags); return output; @@ -1401,7 +1402,7 @@ status_t AudioPolicyManager::getInputForAttr(const audio_attributes_t *attr, input_type_t *inputType, audio_port_handle_t *portId) { - ALOGV("getInputForAttr() source %d, sampling rate %d, format %d, channel mask %x," + ALOGV("getInputForAttr() source %d, sampling rate %d, format %#x, channel mask %#x," "session %d, flags %#x", attr->source, config->sample_rate, config->format, config->channel_mask, session, flags); @@ -1705,7 +1706,7 @@ audio_io_handle_t AudioPolicyManager::getInputForDevice(audio_devices_t device, !audio_formats_match(profileFormat, lConfig.format) || (profileChannelMask != lConfig.channel_mask)) { ALOGW("getInputForAttr() failed opening input: sampling rate %d" - ", format %d, channel mask %x", + ", format %#x, channel mask %#x", profileSamplingRate, profileFormat, profileChannelMask); if (input != AUDIO_IO_HANDLE_NONE) { inputDesc->close();