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

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

Merge "Use standard name and type for channel mask"

parents ae4b5f93 fad226ab

include/media/AudioSystem.h

+2 −2
Original line number Diff line number Diff line
@@ -155,11 +155,11 @@ public: 
    class OutputDescriptor {

    public:

        OutputDescriptor()

        : samplingRate(0), format(AUDIO_FORMAT_DEFAULT), channels(0), frameCount(0), latency(0)  {}

        : samplingRate(0), format(AUDIO_FORMAT_DEFAULT), channelMask(0), frameCount(0), latency(0)  {}



        uint32_t samplingRate;

        int32_t format;

        int32_t channels;

        audio_channel_mask_t channelMask;

        size_t frameCount;

        uint32_t latency;

    };

media/libmedia/AudioSystem.cpp

+4 −4
Original line number Diff line number Diff line
@@ -447,9 +447,9 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, audio_io_handle 


        OutputDescriptor *outputDesc =  new OutputDescriptor(*desc);

        gOutputs.add(ioHandle, outputDesc);

        ALOGV("ioConfigChanged() new output samplingRate %u, format %d channels %#x frameCount %u "

        ALOGV("ioConfigChanged() new output samplingRate %u, format %d channel mask %#x frameCount %u "

                "latency %d",

                outputDesc->samplingRate, outputDesc->format, outputDesc->channels,

                outputDesc->samplingRate, outputDesc->format, outputDesc->channelMask,

                outputDesc->frameCount, outputDesc->latency);

        } break;

    case OUTPUT_CLOSED: {
@@ -471,10 +471,10 @@ void AudioSystem::AudioFlingerClient::ioConfigChanged(int event, audio_io_handle 
        if (param2 == NULL) break;

        desc = (const OutputDescriptor *)param2;



        ALOGV("ioConfigChanged() new config for output %d samplingRate %u, format %d channels %#x "

        ALOGV("ioConfigChanged() new config for output %d samplingRate %u, format %d channel mask %#x "

                "frameCount %d latency %d",

                ioHandle, desc->samplingRate, desc->format,

                desc->channels, desc->frameCount, desc->latency);

                desc->channelMask, desc->frameCount, desc->latency);

        OutputDescriptor *outputDesc = gOutputs.valueAt(index);

        delete outputDesc;

        outputDesc =  new OutputDescriptor(*desc);

media/libmedia/IAudioFlingerClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public: 
                    (const AudioSystem::OutputDescriptor *)param2;

            data.writeInt32(desc->samplingRate);

            data.writeInt32(desc->format);

            data.writeInt32(desc->channels);

            data.writeInt32(desc->channelMask);

            data.writeInt32(desc->frameCount);

            data.writeInt32(desc->latency);

        }
@@ -84,7 +84,7 @@ status_t BnAudioFlingerClient::onTransact( 
            } else if (event != AudioSystem::OUTPUT_CLOSED && event != AudioSystem::INPUT_CLOSED) {

                desc.samplingRate = data.readInt32();

                desc.format = data.readInt32();

                desc.channels = data.readInt32();

                desc.channelMask = (audio_channel_mask_t) data.readInt32();

                desc.frameCount = data.readInt32();

                desc.latency = data.readInt32();

                param2 = &desc;

services/audioflinger/Threads.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1469,7 +1469,7 @@ void AudioFlinger::PlaybackThread::audioConfigChanged_l(int event, int param) { 
    switch (event) {

    case AudioSystem::OUTPUT_OPENED:

    case AudioSystem::OUTPUT_CONFIG_CHANGED:

        desc.channels = mChannelMask;

        desc.channelMask = mChannelMask;

        desc.samplingRate = mSampleRate;

        desc.format = mFormat;

        desc.frameCount = mNormalFrameCount; // FIXME see
@@ -3225,7 +3225,7 @@ bool AudioFlinger::MixerThread::checkForNewParameters_l() 
            }

        }

        if (param.getInt(String8(AudioParameter::keyChannels), value) == NO_ERROR) {

            if (value != AUDIO_CHANNEL_OUT_STEREO) {

            if ((audio_channel_mask_t) value != AUDIO_CHANNEL_OUT_STEREO) {

                status = BAD_VALUE;

            } else {

                reconfig = true;
@@ -4889,7 +4889,7 @@ void AudioFlinger::RecordThread::audioConfigChanged_l(int event, int param) { 
    switch (event) {

    case AudioSystem::INPUT_OPENED:

    case AudioSystem::INPUT_CONFIG_CHANGED:

        desc.channels = mChannelMask;

        desc.channelMask = mChannelMask;

        desc.samplingRate = mSampleRate;

        desc.format = mFormat;

        desc.frameCount = mFrameCount;