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

Commit 05399f48 authored by Andy Hung's avatar Andy Hung
Browse files

Revert "Rename AudioGain.useInChannelMask -> isInput" 

This reverts commit e028aed5.

Reason for revert: Android Auto regression b/194987848

Change-Id: I80ce258defca1a1c75e8a4c656690bd8cf809331
parent e028aed5

media/libaudioclient/AidlConversion.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2777,7 +2777,7 @@ aidl2legacy_AudioGain_audio_gain(const media::AudioGain& aidl) { 
    audio_gain legacy;

    legacy.mode = VALUE_OR_RETURN(aidl2legacy_int32_t_audio_gain_mode_t_mask(aidl.mode));

    legacy.channel_mask = VALUE_OR_RETURN(aidl2legacy_AudioChannelLayout_audio_channel_mask_t(

                    aidl.channelMask, aidl.isInput));

                    aidl.channelMask, aidl.useInChannelMask));

    legacy.min_value = VALUE_OR_RETURN(convertIntegral<int>(aidl.minValue));

    legacy.max_value = VALUE_OR_RETURN(convertIntegral<int>(aidl.maxValue));

    legacy.default_value = VALUE_OR_RETURN(convertIntegral<int>(aidl.defaultValue));
@@ -2791,7 +2791,7 @@ ConversionResult<media::AudioGain> 
legacy2aidl_audio_gain_AudioGain(const audio_gain& legacy, bool isInput) {

    media::AudioGain aidl;

    aidl.mode = VALUE_OR_RETURN(legacy2aidl_audio_gain_mode_t_int32_t_mask(legacy.mode));

    aidl.isInput = isInput;

    aidl.useInChannelMask = isInput;

    aidl.channelMask = VALUE_OR_RETURN(

            legacy2aidl_audio_channel_mask_t_AudioChannelLayout(legacy.channel_mask, isInput));

    aidl.minValue = VALUE_OR_RETURN(convertIntegral<int32_t>(legacy.min_value));

media/libaudioclient/aidl/android/media/AudioGain.aidl

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.media.AudioChannelLayout; 
 */

parcelable AudioGain {

    int index;

    boolean isInput;

    boolean useInChannelMask;

    boolean useForVolume;

    /** Bitmask, indexed by AudioGainMode. */

    int mode;

media/libaudiofoundation/AudioGain.cpp

+19 −13
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ 


namespace android {



AudioGain::AudioGain(int index, bool isInput)

AudioGain::AudioGain(int index, bool useInChannelMask)

{

    mIndex = index;

    mIsInput = isInput;

    mUseInChannelMask = useInChannelMask;

    memset(&mGain, 0, sizeof(struct audio_gain));

}
@@ -49,9 +49,12 @@ void AudioGain::getDefaultConfig(struct audio_gain_config *config) 
    if ((mGain.mode & AUDIO_GAIN_MODE_JOINT) == AUDIO_GAIN_MODE_JOINT) {

        config->values[0] = mGain.default_value;

    } else {

        const uint32_t numValues = mIsInput ?

                audio_channel_count_from_in_mask(mGain.channel_mask) :

                audio_channel_count_from_out_mask(mGain.channel_mask);

        uint32_t numValues;

        if (mUseInChannelMask) {

            numValues = audio_channel_count_from_in_mask(mGain.channel_mask);

        } else {

            numValues = audio_channel_count_from_out_mask(mGain.channel_mask);

        }

        for (size_t i = 0; i < numValues; i++) {

            config->values[i] = mGain.default_value;

        }
@@ -75,9 +78,12 @@ status_t AudioGain::checkConfig(const struct audio_gain_config *config) 
        if ((config->channel_mask & ~mGain.channel_mask) != 0) {

            return BAD_VALUE;

        }

        const uint32_t numValues = mIsInput ?

                audio_channel_count_from_in_mask(config->channel_mask) :

                audio_channel_count_from_out_mask(config->channel_mask);

        uint32_t numValues;

        if (mUseInChannelMask) {

            numValues = audio_channel_count_from_in_mask(config->channel_mask);

        } else {

            numValues = audio_channel_count_from_out_mask(config->channel_mask);

        }

        for (size_t i = 0; i < numValues; i++) {

            if ((config->values[i] < mGain.min_value) ||

                    (config->values[i] > mGain.max_value)) {
@@ -110,7 +116,7 @@ void AudioGain::dump(std::string *dst, int spaces, int index) const 
bool AudioGain::equals(const sp<AudioGain>& other) const

{

    return other != nullptr &&

           mIsInput == other->mIsInput &&

           mUseInChannelMask == other->mUseInChannelMask &&

           mUseForVolume == other->mUseForVolume &&

           // Compare audio gain

           mGain.mode == other->mGain.mode &&
@@ -131,13 +137,13 @@ status_t AudioGain::writeToParcel(android::Parcel *parcel) const { 


status_t AudioGain::writeToParcelable(media::AudioGain* parcelable) const {

    parcelable->index = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(mIndex));

    parcelable->isInput = mIsInput;

    parcelable->useInChannelMask = mUseInChannelMask;

    parcelable->useForVolume = mUseForVolume;

    parcelable->mode = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_gain_mode_t_int32_t_mask(mGain.mode));

    parcelable->channelMask = VALUE_OR_RETURN_STATUS(

            legacy2aidl_audio_channel_mask_t_AudioChannelLayout(

                    mGain.channel_mask, mIsInput));

                    mGain.channel_mask, mUseInChannelMask));

    parcelable->minValue = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(mGain.min_value));

    parcelable->maxValue = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(mGain.max_value));

    parcelable->defaultValue = VALUE_OR_RETURN_STATUS(
@@ -156,13 +162,13 @@ status_t AudioGain::readFromParcel(const android::Parcel *parcel) { 


status_t AudioGain::readFromParcelable(const media::AudioGain& parcelable) {

    mIndex = VALUE_OR_RETURN_STATUS(convertIntegral<int>(parcelable.index));

    mIsInput = parcelable.isInput;

    mUseInChannelMask = parcelable.useInChannelMask;

    mUseForVolume = parcelable.useForVolume;

    mGain.mode = VALUE_OR_RETURN_STATUS(

            aidl2legacy_int32_t_audio_gain_mode_t_mask(parcelable.mode));

    mGain.channel_mask = VALUE_OR_RETURN_STATUS(

            aidl2legacy_AudioChannelLayout_audio_channel_mask_t(

                    parcelable.channelMask, parcelable.isInput));

                    parcelable.channelMask, parcelable.useInChannelMask));

    mGain.min_value = VALUE_OR_RETURN_STATUS(convertIntegral<int>(parcelable.minValue));

    mGain.max_value = VALUE_OR_RETURN_STATUS(convertIntegral<int>(parcelable.maxValue));

    mGain.default_value = VALUE_OR_RETURN_STATUS(convertIntegral<int>(parcelable.defaultValue));

media/libaudiofoundation/include/media/AudioGain.h

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ namespace android { 
class AudioGain: public RefBase, public Parcelable

{

public:

    AudioGain(int index, bool isInput);

    AudioGain(int index, bool useInChannelMask);

    virtual ~AudioGain() {}



    void setMode(audio_gain_mode_t mode) { mGain.mode = mode; }
@@ -80,7 +80,7 @@ public: 
private:

    int               mIndex;

    struct audio_gain mGain;

    bool              mIsInput;

    bool              mUseInChannelMask;

    bool              mUseForVolume = false;

};

media/libaudiofoundation/tests/audiofoundation_parcelable_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public: 


AudioGains getAudioGainsForTest() {

    AudioGains audioGains;

    sp<AudioGain> audioGain = new AudioGain(0 /*index*/, false /*isInput*/);

    sp<AudioGain> audioGain = new AudioGain(0 /*index*/, false /*useInChannelMask*/);

    audioGain->setMode(AUDIO_GAIN_MODE_JOINT);

    audioGain->setChannelMask(AUDIO_CHANNEL_OUT_STEREO);

    audioGain->setMinValueInMb(-3200);