Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49f36ba3 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

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
parent b3ded702

media/libaudioclient/AudioSystem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

media/libaudioclient/AudioTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2674,13 +2674,13 @@ status_t AudioTrack::dump(int fd, const Vector<String16>& 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);

services/audioflinger/AudioFlinger.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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::ThreadBase> AudioFlinger::openInput_l(audio_module_handle_t mod 
    sp<StreamInHalInterface> 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,

services/audioflinger/BufLog.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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.

services/audioflinger/Threads.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1412,7 +1412,7 @@ status_t AudioFlinger::ThreadBase::addEffect_l(const sp<EffectModule>& 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>& 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>& 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;