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

Commit e89affc1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libaudiohal@aidl: Fix `setPortConfigFromConfig` for unspecified values"... 

Merge "libaudiohal@aidl: Fix `setPortConfigFromConfig` for unspecified values" into main am: 62cabb4e am: 50a26883 am: 8a19ad77

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2744878



Change-Id: Ibeb5cf7deedd495b3c8cc9887cd3259ea382b98e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce20e0a3 8a19ad77

media/libaudiohal/impl/DeviceHalAidl.cpp

+13 −4
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ using aidl::android::media::audio::common::AudioConfig; 
using aidl::android::media::audio::common::AudioDevice;

using aidl::android::media::audio::common::AudioDevice;

using aidl::android::media::audio::common::AudioDeviceAddress;

using aidl::android::media::audio::common::AudioDeviceAddress;

using aidl::android::media::audio::common::AudioDeviceType;

using aidl::android::media::audio::common::AudioDeviceType;

using aidl::android::media::audio::common::AudioFormatDescription;

using aidl::android::media::audio::common::AudioFormatType;

using aidl::android::media::audio::common::AudioFormatType;

using aidl::android::media::audio::common::AudioInputFlags;

using aidl::android::media::audio::common::AudioInputFlags;

using aidl::android::media::audio::common::AudioIoFlags;

using aidl::android::media::audio::common::AudioIoFlags;
@@ -97,10 +98,16 @@ void setConfigFromPortConfig(AudioConfig* config, const AudioPortConfig& portCon 
}

}





void setPortConfigFromConfig(AudioPortConfig* portConfig, const AudioConfig& config) {

void setPortConfigFromConfig(AudioPortConfig* portConfig, const AudioConfig& config) {

    if (config.base.sampleRate != 0) {

        portConfig->sampleRate = Int{ .value = config.base.sampleRate };

        portConfig->sampleRate = Int{ .value = config.base.sampleRate };

    }

    if (config.base.channelMask != AudioChannelLayout{}) {

        portConfig->channelMask = config.base.channelMask;

        portConfig->channelMask = config.base.channelMask;

    }

    if (config.base.format != AudioFormatDescription{}) {

        portConfig->format = config.base.format;

        portConfig->format = config.base.format;

    }

    }

}





// Note: these converters are for types defined in different AIDL files. Although these

// Note: these converters are for types defined in different AIDL files. Although these

// AIDL files are copies of each other, however formally these are different types

// AIDL files are copies of each other, however formally these are different types
@@ -1069,7 +1076,9 @@ status_t DeviceHalAidl::setConnectedState(const struct audio_port_v7 *port, bool 
        matchDevice.address = AudioDeviceAddress::make<AudioDeviceAddress::id>();

        matchDevice.address = AudioDeviceAddress::make<AudioDeviceAddress::id>();

        auto portsIt = findPort(matchDevice);

        auto portsIt = findPort(matchDevice);

        if (portsIt == mPorts.end()) {

        if (portsIt == mPorts.end()) {

            ALOGW("%s: device port for device %s is not found in the module %s",

            // Since 'setConnectedState' is called for all modules, it is normal when the device

            // port not found in every one of them.

            ALOGD("%s: device port for device %s is not found in the module %s",

                    __func__, matchDevice.toString().c_str(), mInstance.c_str());

                    __func__, matchDevice.toString().c_str(), mInstance.c_str());

            return BAD_VALUE;

            return BAD_VALUE;

        }

        }