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

Commit eca7062a authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge "libaudiohal@aidl: Pass AudioSource when opening input stream"

parents edd344ab d8d01f73

media/libaudiohal/impl/DeviceHalAidl.cpp

+22 −10
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ using aidl::android::media::audio::common::AudioPort; 
using aidl::android::media::audio::common::AudioPortConfig;

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

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

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

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

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

using aidl::android::media::audio::common::Int;
@@ -249,13 +250,14 @@ status_t DeviceHalAidl::getInputBufferSize(const struct audio_config* config, si 
            ::aidl::android::legacy2aidl_audio_config_t_AudioConfig(*config, true /*isInput*/));

    AudioDevice aidlDevice;

    aidlDevice.type.type = AudioDeviceType::IN_DEFAULT;

    AudioSource aidlSource = AudioSource::DEFAULT;

    AudioIoFlags aidlFlags = AudioIoFlags::make<AudioIoFlags::Tag::input>(0);

    AudioPortConfig mixPortConfig;

    Cleanups cleanups;

    audio_config writableConfig = *config;

    int32_t nominalLatency;

    RETURN_STATUS_IF_ERROR(prepareToOpenStream(0 /*handle*/, aidlDevice, aidlFlags, &writableConfig,

                    &cleanups, &aidlConfig, &mixPortConfig, &nominalLatency));

    RETURN_STATUS_IF_ERROR(prepareToOpenStream(0 /*handle*/, aidlDevice, aidlFlags, aidlSource,

                    &writableConfig, &cleanups, &aidlConfig, &mixPortConfig, &nominalLatency));

    *size = aidlConfig.frameCount *

            getFrameSizeInBytes(aidlConfig.base.format, aidlConfig.base.channelMask);

    // Do not disarm cleanups to release temporary port configs.
@@ -264,7 +266,7 @@ status_t DeviceHalAidl::getInputBufferSize(const struct audio_config* config, si 


status_t DeviceHalAidl::prepareToOpenStream(

        int32_t aidlHandle, const AudioDevice& aidlDevice, const AudioIoFlags& aidlFlags,

        struct audio_config* config,

        AudioSource aidlSource, struct audio_config* config,

        Cleanups* cleanups, AudioConfig* aidlConfig, AudioPortConfig* mixPortConfig,

        int32_t* nominalLatency) {

    const bool isInput = aidlFlags.getTag() == AudioIoFlags::Tag::input;
@@ -276,7 +278,7 @@ status_t DeviceHalAidl::prepareToOpenStream( 
    if (created) {

        cleanups->emplace_front(this, &DeviceHalAidl::resetPortConfig, devicePortConfig.id);

    }

    RETURN_STATUS_IF_ERROR(findOrCreatePortConfig(*aidlConfig, aidlFlags, aidlHandle,

    RETURN_STATUS_IF_ERROR(findOrCreatePortConfig(*aidlConfig, aidlFlags, aidlHandle, aidlSource,

                    mixPortConfig, &created));

    if (created) {

        cleanups->emplace_front(this, &DeviceHalAidl::resetPortConfig, mixPortConfig->id);
@@ -442,8 +444,9 @@ status_t DeviceHalAidl::openOutputStream( 
    AudioPortConfig mixPortConfig;

    Cleanups cleanups;

    int32_t nominalLatency;

    RETURN_STATUS_IF_ERROR(prepareToOpenStream(aidlHandle, aidlDevice, aidlFlags, config,

                    &cleanups, &aidlConfig, &mixPortConfig, &nominalLatency));

    RETURN_STATUS_IF_ERROR(prepareToOpenStream(aidlHandle, aidlDevice, aidlFlags,

                    AudioSource::SYS_RESERVED_INVALID /*only needed for input*/,

                    config, &cleanups, &aidlConfig, &mixPortConfig, &nominalLatency));

    ::aidl::android::hardware::audio::core::IModule::OpenOutputStreamArguments args;

    args.portConfigId = mixPortConfig.id;

    const bool isOffload = isBitPositionFlagSet(
@@ -506,8 +509,8 @@ status_t DeviceHalAidl::openInputStream( 
    AudioPortConfig mixPortConfig;

    Cleanups cleanups;

    int32_t nominalLatency;

    RETURN_STATUS_IF_ERROR(prepareToOpenStream(aidlHandle, aidlDevice, aidlFlags, config,

                    &cleanups, &aidlConfig, &mixPortConfig, &nominalLatency));

    RETURN_STATUS_IF_ERROR(prepareToOpenStream(aidlHandle, aidlDevice, aidlFlags, aidlSource,

                    config, &cleanups, &aidlConfig, &mixPortConfig, &nominalLatency));

    ::aidl::android::hardware::audio::core::IModule::OpenInputStreamArguments args;

    args.portConfigId = mixPortConfig.id;

    RecordTrackMetadata aidlTrackMetadata{
@@ -823,7 +826,7 @@ status_t DeviceHalAidl::findOrCreatePortConfig(const AudioDevice& device, 


status_t DeviceHalAidl::findOrCreatePortConfig(

        const AudioConfig& config, const std::optional<AudioIoFlags>& flags, int32_t ioHandle,

        AudioPortConfig* portConfig, bool* created) {

        AudioSource source, AudioPortConfig* portConfig, bool* created) {

    // These flags get removed one by one in this order when retrying port finding.

    static const std::vector<AudioInputFlags> kOptionalInputFlags{

        AudioInputFlags::FAST, AudioInputFlags::RAW };
@@ -857,6 +860,11 @@ status_t DeviceHalAidl::findOrCreatePortConfig( 
        requestedPortConfig.portId = portsIt->first;

        setPortConfigFromConfig(&requestedPortConfig, config);

        requestedPortConfig.ext = AudioPortMixExt{ .handle = ioHandle };

        if (matchFlags.getTag() == AudioIoFlags::Tag::input

                && source != AudioSource::SYS_RESERVED_INVALID) {

            requestedPortConfig.ext.get<AudioPortExt::Tag::mix>().usecase =

                    AudioPortMixExtUseCase::make<AudioPortMixExtUseCase::Tag::source>(source);

        }

        RETURN_STATUS_IF_ERROR(createPortConfig(requestedPortConfig, &portConfigIt));

        *created = true;

    } else if (!flags.has_value()) {
@@ -884,8 +892,12 @@ status_t DeviceHalAidl::findOrCreatePortConfig( 
        }

        AudioConfig config;

        setConfigFromPortConfig(&config, requestedPortConfig);

        AudioSource source = requestedPortConfig.ext.get<Tag::mix>().usecase.getTag() ==

                AudioPortMixExtUseCase::Tag::source ?

                requestedPortConfig.ext.get<Tag::mix>().usecase.

                get<AudioPortMixExtUseCase::Tag::source>() : AudioSource::SYS_RESERVED_INVALID;

        return findOrCreatePortConfig(config, requestedPortConfig.flags,

                requestedPortConfig.ext.get<Tag::mix>().handle, portConfig, created);

                requestedPortConfig.ext.get<Tag::mix>().handle, source, portConfig, created);

    } else if (requestedPortConfig.ext.getTag() == Tag::device) {

        return findOrCreatePortConfig(

                requestedPortConfig.ext.get<Tag::device>().device, portConfig, created);

media/libaudiohal/impl/DeviceHalAidl.h

+2 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ class DeviceHalAidl : public DeviceHalInterface, public ConversionHelperAidl, 
            const ::aidl::android::media::audio::common::AudioConfig& config,

            const std::optional<::aidl::android::media::audio::common::AudioIoFlags>& flags,

            int32_t ioHandle,

            ::aidl::android::media::audio::common::AudioSource aidlSource,

            ::aidl::android::media::audio::common::AudioPortConfig* portConfig, bool* created);

    status_t findOrCreatePortConfig(

        const ::aidl::android::media::audio::common::AudioPortConfig& requestedPortConfig,
@@ -218,6 +219,7 @@ class DeviceHalAidl : public DeviceHalInterface, public ConversionHelperAidl, 
        int32_t aidlHandle,

        const ::aidl::android::media::audio::common::AudioDevice& aidlDevice,

        const ::aidl::android::media::audio::common::AudioIoFlags& aidlFlags,

        ::aidl::android::media::audio::common::AudioSource aidlSource,

        struct audio_config* config,

        Cleanups* cleanups,

        ::aidl::android::media::audio::common::AudioConfig* aidlConfig,