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

Commit 23fbc714 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ie9410637,I0486d5fb into udc-qpr-dev 

* changes:
  Use 'audio_port_config' in DeviceHalInterface::add/removeDeviceEffect
  Clean up EffectHalInterface
parents 50f23f6e 570ce38d

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

+9 −6
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <util/CoreUtils.h>



#include "DeviceHalHidl.h"

#include "EffectHalHidl.h"

#include "ParameterUtils.h"

#include "StreamHalHidl.h"
@@ -523,30 +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), effect->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), effect->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/impl/EffectConversionHelperHidl.h

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 


#include "ConversionHelperHidl.h"



#include PATH(android/hardware/audio/effect/FILE_VERSION/types.h)

#include PATH(android/hardware/audio/effect/COMMON_TYPES_FILE_VERSION/types.h)



using EffectResult = ::android::hardware::audio::effect::CPP_VERSION::Result;

using EffectResult = ::android::hardware::audio::effect::COMMON_TYPES_CPP_VERSION::Result;



namespace android {