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

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

Merge "Use 'audio_port_config' in DeviceHalInterface::add/removeDeviceEffect"... 

Merge "Use 'audio_port_config' in DeviceHalInterface::add/removeDeviceEffect" am: 9ee7d5c0 am: 1e0e8ff6 am: 8e684111 am: e7bc635e am: 6db4a3ae am: 902ccd4a

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



Change-Id: I604cfbe894df26c721f0137b5e3e68d3fedd6bd4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cac2af69 902ccd4a

media/libaudiohal/impl/DeviceHalAidl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ status_t DeviceHalAidl::getMicrophones( 
    return OK;

}



status_t DeviceHalAidl::addDeviceEffect(audio_port_handle_t device __unused,

status_t DeviceHalAidl::addDeviceEffect(const struct audio_port_config *device __unused,

        sp<EffectHalInterface> effect) {

    if (!effect) {

        return BAD_VALUE;
@@ -892,7 +892,7 @@ status_t DeviceHalAidl::addDeviceEffect(audio_port_handle_t device __unused, 
    ALOGE("%s not implemented yet", __func__);

    return OK;

}

status_t DeviceHalAidl::removeDeviceEffect(audio_port_handle_t device __unused,

status_t DeviceHalAidl::removeDeviceEffect(const struct audio_port_config *device __unused,

                            sp<EffectHalInterface> effect) {

    if (!effect) {

        return BAD_VALUE;

media/libaudiohal/impl/DeviceHalAidl.h

+4 −2
Original line number Diff line number Diff line
@@ -149,9 +149,11 @@ class DeviceHalAidl : public DeviceHalInterface, public ConversionHelperAidl, 
    // List microphones

    status_t getMicrophones(std::vector<audio_microphone_characteristic_t>* microphones) override;



    status_t addDeviceEffect(audio_port_handle_t device, sp<EffectHalInterface> effect) override;

    status_t addDeviceEffect(

            const struct audio_port_config *device, sp<EffectHalInterface> effect) override;



    status_t removeDeviceEffect(audio_port_handle_t device, sp<EffectHalInterface> effect) override;

    status_t removeDeviceEffect(

            const struct audio_port_config *device, sp<EffectHalInterface> effect) override;



    status_t getMmapPolicyInfos(media::audio::common::AudioMMapPolicyType policyType __unused,

                                std::vector<media::audio::common::AudioMMapPolicyInfo>* policyInfos

media/libaudiohal/impl/DeviceHalHidl.cpp

+6 −6
Original line number Diff line number Diff line
@@ -524,32 +524,32 @@ status_t DeviceHalHidl::getMicrophones( 


#if MAJOR_VERSION >= 6

status_t DeviceHalHidl::addDeviceEffect(

        audio_port_handle_t device, sp<EffectHalInterface> effect) {

        const struct audio_port_config *device, sp<EffectHalInterface> effect) {

    TIME_CHECK();

    if (mDevice == 0) return NO_INIT;

    auto hidlEffect = sp<effect::EffectHalHidl>::cast(effect);

    return processReturn("addDeviceEffect", mDevice->addDeviceEffect(

            static_cast<AudioPortHandle>(device), hidlEffect->effectId()));

            static_cast<AudioPortHandle>(device->id), hidlEffect->effectId()));

}

#else

status_t DeviceHalHidl::addDeviceEffect(

        audio_port_handle_t device __unused, sp<EffectHalInterface> effect __unused) {

        const struct audio_port_config *device __unused, sp<EffectHalInterface> effect __unused) {

    return INVALID_OPERATION;

}

#endif



#if MAJOR_VERSION >= 6

status_t DeviceHalHidl::removeDeviceEffect(

        audio_port_handle_t device, sp<EffectHalInterface> effect) {

        const struct audio_port_config *device, sp<EffectHalInterface> effect) {

    TIME_CHECK();

    if (mDevice == 0) return NO_INIT;

    auto hidlEffect = sp<effect::EffectHalHidl>::cast(effect);

    return processReturn("removeDeviceEffect", mDevice->removeDeviceEffect(

            static_cast<AudioPortHandle>(device), hidlEffect->effectId()));

            static_cast<AudioPortHandle>(device->id), hidlEffect->effectId()));

}

#else

status_t DeviceHalHidl::removeDeviceEffect(

        audio_port_handle_t device __unused, sp<EffectHalInterface> effect __unused) {

        const struct audio_port_config *device __unused, sp<EffectHalInterface> effect __unused) {

    return INVALID_OPERATION;

}

#endif

media/libaudiohal/impl/DeviceHalHidl.h

+4 −2
Original line number Diff line number Diff line
@@ -105,8 +105,10 @@ class DeviceHalHidl : public DeviceHalInterface, public CoreConversionHelperHidl 
    // List microphones

    status_t getMicrophones(std::vector<audio_microphone_characteristic_t>* microphones) override;



    status_t addDeviceEffect(audio_port_handle_t device, sp<EffectHalInterface> effect) override;

    status_t removeDeviceEffect(audio_port_handle_t device, sp<EffectHalInterface> effect) override;

    status_t addDeviceEffect(

            const struct audio_port_config *device, sp<EffectHalInterface> effect) override;

    status_t removeDeviceEffect(

            const struct audio_port_config *device, sp<EffectHalInterface> effect) override;



    status_t getMmapPolicyInfos(

            media::audio::common::AudioMMapPolicyType policyType __unused,

media/libaudiohal/include/media/audiohal/DeviceHalInterface.h

+2 −2
Original line number Diff line number Diff line
@@ -132,9 +132,9 @@ class DeviceHalInterface : public virtual RefBase 
            std::vector<audio_microphone_characteristic_t>* microphones) = 0;



    virtual status_t addDeviceEffect(

            audio_port_handle_t device, sp<EffectHalInterface> effect) = 0;

            const struct audio_port_config *device, sp<EffectHalInterface> effect) = 0;

    virtual status_t removeDeviceEffect(

            audio_port_handle_t device, sp<EffectHalInterface> effect) = 0;

            const struct audio_port_config *device, sp<EffectHalInterface> effect) = 0;



    virtual status_t getMmapPolicyInfos(

            media::audio::common::AudioMMapPolicyType policyType,