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

Commit 5be847c2 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Treat mChannelCount as uint32_t consistently"

parents ea543db8 f6ed423a

services/audioflinger/Threads.cpp

+4 −4
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ void AudioFlinger::ThreadBase::dumpBase(int fd, const Vector<String16>& args) 
    result.append(buffer);

    snprintf(buffer, SIZE, "Normal frame count: %d\n", mNormalFrameCount);

    result.append(buffer);

    snprintf(buffer, SIZE, "Channel Count: %d\n", mChannelCount);

    snprintf(buffer, SIZE, "Channel Count: %u\n", mChannelCount);

    result.append(buffer);

    snprintf(buffer, SIZE, "Channel Mask: 0x%08x\n", mChannelMask);

    result.append(buffer);
@@ -1553,7 +1553,7 @@ void AudioFlinger::PlaybackThread::readOutputParameters() 
        LOG_FATAL("HAL channel mask %#x not supported for mixed output; "

                "must be AUDIO_CHANNEL_OUT_STEREO", mChannelMask);

    }

    mChannelCount = (uint16_t)popcount(mChannelMask);

    mChannelCount = popcount(mChannelMask);

    mFormat = mOutput->stream->common.get_format(&mOutput->stream->common);

    if (!audio_is_valid_format(mFormat)) {

        LOG_FATAL("HAL format %d not valid for output", mFormat);
@@ -2317,7 +2317,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=%d, mFormat=%d, mFrameSize=%u, "

    ALOGV("mSampleRate=%u, mChannelMask=%#x, mChannelCount=%u, mFormat=%d, mFrameSize=%u, "

            "mFrameCount=%d, mNormalFrameCount=%d",

            mSampleRate, mChannelMask, mChannelCount, mFormat, mFrameSize, mFrameCount,

            mNormalFrameCount);
@@ -4921,7 +4921,7 @@ void AudioFlinger::RecordThread::readInputParameters() 


    mSampleRate = mInput->stream->common.get_sample_rate(&mInput->stream->common);

    mChannelMask = mInput->stream->common.get_channels(&mInput->stream->common);

    mChannelCount = (uint16_t)popcount(mChannelMask);

    mChannelCount = popcount(mChannelMask);

    mFormat = mInput->stream->common.get_format(&mInput->stream->common);

    mFrameSize = audio_stream_frame_size(&mInput->stream->common);

    mInputBytes = mInput->stream->common.get_buffer_size(&mInput->stream->common);

services/audioflinger/Threads.h

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ protected: 
                size_t                  mFrameCount;       // output HAL, direct output, record

                size_t                  mNormalFrameCount; // normal mixer and effects

                audio_channel_mask_t    mChannelMask;

                uint16_t                mChannelCount;

                uint32_t                mChannelCount;

                size_t                  mFrameSize;

                audio_format_t          mFormat;

services/audioflinger/TrackBase.h

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ protected: 
                        // support dynamic rates, the current value is in control block

    const audio_format_t mFormat;

    const audio_channel_mask_t mChannelMask;

    const uint8_t       mChannelCount;

    const uint32_t      mChannelCount;

    const size_t        mFrameSize; // AudioFlinger's view of frame size in shared memory,

                                    // where for AudioTrack (but not AudioRecord),

                                    // 8-bit PCM samples are stored as 16-bit