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

Commit 3fa20b7a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update AudioPort <-> configs mapping"

parents f64e4631 6313e57e

media/libaudioclient/AidlConversion.cpp

+3 −7
Original line number Diff line number Diff line
@@ -2957,11 +2957,8 @@ aidl2legacy_AudioPort_audio_port_v7(const media::AudioPort& aidl) { 
                                 }));

    legacy.num_gains = aidl.hal.gains.size();



    media::AudioPortConfig aidlPortConfig;

    aidlPortConfig.hal = aidl.hal.activeConfig;

    aidlPortConfig.sys = aidl.sys.activeConfig;

    legacy.active_config = VALUE_OR_RETURN(

            aidl2legacy_AudioPortConfig_audio_port_config(aidlPortConfig));

            aidl2legacy_AudioPortConfig_audio_port_config(aidl.sys.activeConfig));

    legacy.ext = VALUE_OR_RETURN(

            aidl2legacy_AudioPortExt_audio_port_v7_ext(aidl.hal.ext, aidl.sys.type, aidl.sys.ext));

    return legacy;
@@ -3007,10 +3004,9 @@ legacy2aidl_audio_port_v7_AudioPort(const audio_port_v7& legacy) { 
                         }));

    aidl.sys.gains.resize(legacy.num_gains);



    media::AudioPortConfig aidlPortConfig = VALUE_OR_RETURN(

    aidl.sys.activeConfig = VALUE_OR_RETURN(

            legacy2aidl_audio_port_config_AudioPortConfig(legacy.active_config));

    aidl.hal.activeConfig = aidlPortConfig.hal;

    aidl.sys.activeConfig = aidlPortConfig.sys;

    aidl.sys.activeConfig.hal.portId = aidl.hal.id;

    RETURN_IF_ERROR(

            legacy2aidl_AudioPortExt(legacy.ext, legacy.type, &aidl.hal.ext, &aidl.sys.ext));

    return aidl;

media/libaudioclient/aidl/android/media/AudioPortSys.aidl

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.media;



import android.media.AudioGainSys;

import android.media.AudioPortConfigSys;

import android.media.AudioPortConfig;

import android.media.AudioPortExtSys;

import android.media.AudioPortRole;

import android.media.AudioPortType;
@@ -35,8 +35,8 @@ parcelable AudioPortSys { 
    AudioProfileSys[] profiles;

    /** System-only parameters for each AudioGain from 'port.gains'. */

    AudioGainSys[] gains;

    /** System-only parameters for 'port.activeConfig'. */

    AudioPortConfigSys activeConfig;

    /** Current audio port configuration. */

    AudioPortConfig activeConfig;

    /** System-only extra parameters for 'port.ext'. */

    AudioPortExtSys ext;

}

media/libaudiofoundation/DeviceDescriptorBase.cpp

+3 −2
Original line number Diff line number Diff line
@@ -176,8 +176,9 @@ bool DeviceDescriptorBase::supportsFormat(audio_format_t format) 


status_t DeviceDescriptorBase::writeToParcelable(media::AudioPort* parcelable) const {

    AudioPort::writeToParcelable(parcelable);

    AudioPortConfig::writeToParcelable(&parcelable->hal.activeConfig, useInputChannelMask());

    AudioPortConfig::writeToParcelable(&parcelable->sys.activeConfig.hal, useInputChannelMask());

    parcelable->hal.id = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_port_handle_t_int32_t(mId));

    parcelable->sys.activeConfig.hal.portId = parcelable->hal.id;



    media::audio::common::AudioPortDeviceExt deviceExt;

    deviceExt.device = VALUE_OR_RETURN_STATUS(
@@ -201,7 +202,7 @@ status_t DeviceDescriptorBase::readFromParcelable(const media::AudioPort& parcel 
    }

    status_t status = AudioPort::readFromParcelable(parcelable)

            ?: AudioPortConfig::readFromParcelable(

                    parcelable.hal.activeConfig, useInputChannelMask());

                    parcelable.sys.activeConfig.hal, useInputChannelMask());

    if (status != OK) {

        return status;

    }