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

Commit 93b5778e authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Fix audio port "mix" role parameter conversion 

'usecase.source' field is used for AUDIO_PORT_ROLE_SINK,
'usecase.stream' field is used for AUDIO_PORT_ROLE_SOURCE.

The HIDL<->legacy conversion code was doing it opposite.

Test: make
Change-Id: I93722f422a8f226f11a6be97215453af3234029c
parent 25cc53cc

audio/common/all-versions/default/include/common/all-versions/default/HidlUtils.impl.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -174,9 +174,9 @@ void HidlUtils::audioPortConfigFromHal(const struct audio_port_config& halConfig 
            config->ext.mix.hwModule = halConfig.ext.mix.hw_module;

            config->ext.mix.hwModule = halConfig.ext.mix.hw_module;

            config->ext.mix.ioHandle = halConfig.ext.mix.handle;

            config->ext.mix.ioHandle = halConfig.ext.mix.handle;

            if (halConfig.role == AUDIO_PORT_ROLE_SOURCE) {

            if (halConfig.role == AUDIO_PORT_ROLE_SOURCE) {

                config->ext.mix.useCase.source = AudioSource(halConfig.ext.mix.usecase.source);

            } else if (halConfig.role == AUDIO_PORT_ROLE_SINK) {

                config->ext.mix.useCase.stream = AudioStreamType(halConfig.ext.mix.usecase.stream);

                config->ext.mix.useCase.stream = AudioStreamType(halConfig.ext.mix.usecase.stream);

            } else if (halConfig.role == AUDIO_PORT_ROLE_SINK) {

                config->ext.mix.useCase.source = AudioSource(halConfig.ext.mix.usecase.source);

            }

            }

            break;

            break;

        }

        }
@@ -212,11 +212,11 @@ void HidlUtils::audioPortConfigToHal(const AudioPortConfig& config, 
            halConfig->ext.mix.hw_module = config.ext.mix.hwModule;

            halConfig->ext.mix.hw_module = config.ext.mix.hwModule;

            halConfig->ext.mix.handle = config.ext.mix.ioHandle;

            halConfig->ext.mix.handle = config.ext.mix.ioHandle;

            if (config.role == AudioPortRole::SOURCE) {

            if (config.role == AudioPortRole::SOURCE) {

                halConfig->ext.mix.usecase.source =

                    static_cast<audio_source_t>(config.ext.mix.useCase.source);

            } else if (config.role == AudioPortRole::SINK) {

                halConfig->ext.mix.usecase.stream =

                halConfig->ext.mix.usecase.stream =

                    static_cast<audio_stream_type_t>(config.ext.mix.useCase.stream);

                    static_cast<audio_stream_type_t>(config.ext.mix.useCase.stream);

            } else if (config.role == AudioPortRole::SINK) {

                halConfig->ext.mix.usecase.source =

                    static_cast<audio_source_t>(config.ext.mix.useCase.source);

            }

            }

            break;

            break;

        }

        }