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

Commit 22505e6b authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Audio V4: Fix issues in the effect legacy wrapper raised by clang-format 



This patch only contains cosmetic reformatting imposed by clang-format.

Bug: 38184704
Test: compile
Change-Id: If5e61eecd0a67fec19997792c9db73936ce7be2e
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent e9e4e165

audio/effect/2.0/default/AcousticEchoCancelerEffect.cpp

+28 −40
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
 */



#define LOG_TAG "AEC_Effect_HAL"

#include <system/audio_effects/effect_aec.h>

#include <android/log.h>

#include <system/audio_effects/effect_aec.h>



#include "AcousticEchoCancelerEffect.h"
@@ -28,8 +28,7 @@ namespace V2_0 { 
namespace implementation {



AcousticEchoCancelerEffect::AcousticEchoCancelerEffect(effect_handle_t handle)

        : mEffect(new Effect(handle)) {

}

    : mEffect(new Effect(handle)) {}



AcousticEchoCancelerEffect::~AcousticEchoCancelerEffect() {}
@@ -39,8 +38,7 @@ Return<Result> AcousticEchoCancelerEffect::init() { 
}



Return<Result> AcousticEchoCancelerEffect::setConfig(

        const EffectConfig& config,

        const sp<IEffectBufferProviderCallback>& inputBufferProvider,

    const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,

    const sp<IEffectBufferProviderCallback>& outputBufferProvider) {

    return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);

}
@@ -61,8 +59,8 @@ Return<Result> AcousticEchoCancelerEffect::setDevice(AudioDevice device) { 
    return mEffect->setDevice(device);

}



Return<void> AcousticEchoCancelerEffect::setAndGetVolume(

        const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {

Return<void> AcousticEchoCancelerEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,

                                                         setAndGetVolume_cb _hidl_cb) {

    return mEffect->setAndGetVolume(volumes, _hidl_cb);

}
@@ -76,8 +74,7 @@ Return<Result> AcousticEchoCancelerEffect::setAudioMode(AudioMode mode) { 
}



Return<Result> AcousticEchoCancelerEffect::setConfigReverse(

        const EffectConfig& config,

        const sp<IEffectBufferProviderCallback>& inputBufferProvider,

    const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,

    const sp<IEffectBufferProviderCallback>& outputBufferProvider) {

    return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);

}
@@ -120,48 +117,39 @@ Return<void> AcousticEchoCancelerEffect::getDescriptor(getDescriptor_cb _hidl_cb 
    return mEffect->getDescriptor(_hidl_cb);

}



Return<void> AcousticEchoCancelerEffect::prepareForProcessing(

        prepareForProcessing_cb _hidl_cb) {

Return<void> AcousticEchoCancelerEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {

    return mEffect->prepareForProcessing(_hidl_cb);

}



Return<Result> AcousticEchoCancelerEffect::setProcessBuffers(

        const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {

Return<Result> AcousticEchoCancelerEffect::setProcessBuffers(const AudioBuffer& inBuffer,

                                                             const AudioBuffer& outBuffer) {

    return mEffect->setProcessBuffers(inBuffer, outBuffer);

}



Return<void> AcousticEchoCancelerEffect::command(

        uint32_t commandId,

        const hidl_vec<uint8_t>& data,

        uint32_t resultMaxSize,

        command_cb _hidl_cb) {

Return<void> AcousticEchoCancelerEffect::command(uint32_t commandId, const hidl_vec<uint8_t>& data,

                                                 uint32_t resultMaxSize, command_cb _hidl_cb) {

    return mEffect->command(commandId, data, resultMaxSize, _hidl_cb);

}



Return<Result> AcousticEchoCancelerEffect::setParameter(

        const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {

Return<Result> AcousticEchoCancelerEffect::setParameter(const hidl_vec<uint8_t>& parameter,

                                                        const hidl_vec<uint8_t>& value) {

    return mEffect->setParameter(parameter, value);

}



Return<void> AcousticEchoCancelerEffect::getParameter(

        const hidl_vec<uint8_t>& parameter,

Return<void> AcousticEchoCancelerEffect::getParameter(const hidl_vec<uint8_t>& parameter,

                                                      uint32_t valueMaxSize,

                                                      getParameter_cb _hidl_cb) {

    return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);

}



Return<void> AcousticEchoCancelerEffect::getSupportedConfigsForFeature(

        uint32_t featureId,

        uint32_t maxConfigs,

        uint32_t configSize,

    uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,

    getSupportedConfigsForFeature_cb _hidl_cb) {

    return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);

}



Return<void> AcousticEchoCancelerEffect::getCurrentConfigForFeature(

        uint32_t featureId,

        uint32_t configSize,

        getCurrentConfigForFeature_cb _hidl_cb) {

    uint32_t featureId, uint32_t configSize, getCurrentConfigForFeature_cb _hidl_cb) {

    return mEffect->getCurrentConfigForFeature(featureId, configSize, _hidl_cb);

}

audio/effect/2.0/default/AcousticEchoCancelerEffect.h

+42 −53
Original line number Diff line number Diff line
@@ -45,20 +45,18 @@ struct AcousticEchoCancelerEffect : public IAcousticEchoCancelerEffect { 
    // Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.

    Return<Result> init() override;

    Return<Result> setConfig(

            const EffectConfig& config,

            const sp<IEffectBufferProviderCallback>& inputBufferProvider,

        const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,

        const sp<IEffectBufferProviderCallback>& outputBufferProvider) override;

    Return<Result> reset() override;

    Return<Result> enable() override;

    Return<Result> disable() override;

    Return<Result> setDevice(AudioDevice device) override;

    Return<void> setAndGetVolume(

            const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb)  override;

    Return<void> setAndGetVolume(const hidl_vec<uint32_t>& volumes,

                                 setAndGetVolume_cb _hidl_cb) override;

    Return<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;

    Return<Result> setAudioMode(AudioMode mode) override;

    Return<Result> setConfigReverse(

            const EffectConfig& config,

            const sp<IEffectBufferProviderCallback>& inputBufferProvider,

        const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,

        const sp<IEffectBufferProviderCallback>& outputBufferProvider) override;

    Return<Result> setInputDevice(AudioDevice device) override;

    Return<void> getConfig(getConfig_cb _hidl_cb) override;
@@ -71,30 +69,21 @@ struct AcousticEchoCancelerEffect : public IAcousticEchoCancelerEffect { 
    Return<Result> offload(const EffectOffloadParameter& param) override;

    Return<void> getDescriptor(getDescriptor_cb _hidl_cb) override;

    Return<void> prepareForProcessing(prepareForProcessing_cb _hidl_cb) override;

    Return<Result> setProcessBuffers(

            const AudioBuffer& inBuffer, const AudioBuffer& outBuffer)  override;

    Return<void> command(

            uint32_t commandId,

            const hidl_vec<uint8_t>& data,

            uint32_t resultMaxSize,

    Return<Result> setProcessBuffers(const AudioBuffer& inBuffer,

                                     const AudioBuffer& outBuffer) override;

    Return<void> command(uint32_t commandId, const hidl_vec<uint8_t>& data, uint32_t resultMaxSize,

                         command_cb _hidl_cb) override;

    Return<Result> setParameter(

            const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value)  override;

    Return<void> getParameter(

            const hidl_vec<uint8_t>& parameter,

            uint32_t valueMaxSize,

    Return<Result> setParameter(const hidl_vec<uint8_t>& parameter,

                                const hidl_vec<uint8_t>& value) override;

    Return<void> getParameter(const hidl_vec<uint8_t>& parameter, uint32_t valueMaxSize,

                              getParameter_cb _hidl_cb) override;

    Return<void> getSupportedConfigsForFeature(

            uint32_t featureId,

            uint32_t maxConfigs,

    Return<void> getSupportedConfigsForFeature(uint32_t featureId, uint32_t maxConfigs,

                                               uint32_t configSize,

                                               getSupportedConfigsForFeature_cb _hidl_cb) override;

    Return<void> getCurrentConfigForFeature(

            uint32_t featureId,

            uint32_t configSize,

    Return<void> getCurrentConfigForFeature(uint32_t featureId, uint32_t configSize,

                                            getCurrentConfigForFeature_cb _hidl_cb) override;

    Return<Result> setCurrentConfigForFeature(

            uint32_t featureId, const hidl_vec<uint8_t>& configData)  override;

    Return<Result> setCurrentConfigForFeature(uint32_t featureId,

                                              const hidl_vec<uint8_t>& configData) override;

    Return<Result> close() override;



    // Methods from ::android::hardware::audio::effect::V2_0::IAcousticEchoCancelerEffect follow.

audio/effect/2.0/default/AudioBufferManager.cpp

+2 −3
Original line number Diff line number Diff line
@@ -56,9 +56,8 @@ namespace effect { 
namespace V2_0 {

namespace implementation {



AudioBufferWrapper::AudioBufferWrapper(const AudioBuffer& buffer) :

        mHidlBuffer(buffer), mHalBuffer{ 0, { nullptr } } {

}

AudioBufferWrapper::AudioBufferWrapper(const AudioBuffer& buffer)

    : mHidlBuffer(buffer), mHalBuffer{0, {nullptr}} {}



AudioBufferWrapper::~AudioBufferWrapper() {

    AudioBufferManager::getInstance().removeEntry(mHidlBuffer.id);

audio/effect/2.0/default/AudioBufferManager.h

+6 −5
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
#include <android/hardware/audio/effect/2.0/types.h>

#include <android/hidl/memory/1.0/IMemory.h>

#include <system/audio_effect.h>

#include <utils/RefBase.h>

#include <utils/KeyedVector.h>

#include <utils/RefBase.h>

#include <utils/Singleton.h>



using ::android::hardware::audio::effect::V2_0::AudioBuffer;
@@ -42,6 +42,7 @@ class AudioBufferWrapper : public RefBase { 
    virtual ~AudioBufferWrapper();

    bool init();

    audio_buffer_t* getHalBuffer() { return &mHalBuffer; }



   private:

    AudioBufferWrapper(const AudioBufferWrapper&) = delete;

    void operator=(AudioBufferWrapper) = delete;

audio/effect/2.0/default/AutomaticGainControlEffect.cpp

+36 −49
Original line number Diff line number Diff line
@@ -27,22 +27,19 @@ namespace V2_0 { 
namespace implementation {



AutomaticGainControlEffect::AutomaticGainControlEffect(effect_handle_t handle)

        : mEffect(new Effect(handle)) {

}

    : mEffect(new Effect(handle)) {}



AutomaticGainControlEffect::~AutomaticGainControlEffect() {}



void AutomaticGainControlEffect::propertiesFromHal(

        const t_agc_settings& halProperties,

        IAutomaticGainControlEffect::AllProperties* properties) {

    const t_agc_settings& halProperties, IAutomaticGainControlEffect::AllProperties* properties) {

    properties->targetLevelMb = halProperties.targetLevel;

    properties->compGainMb = halProperties.compGain;

    properties->limiterEnabled = halProperties.limiterEnabled;

}



void AutomaticGainControlEffect::propertiesToHal(

        const IAutomaticGainControlEffect::AllProperties& properties,

        t_agc_settings* halProperties) {

    const IAutomaticGainControlEffect::AllProperties& properties, t_agc_settings* halProperties) {

    halProperties->targetLevel = properties.targetLevelMb;

    halProperties->compGain = properties.compGainMb;

    halProperties->limiterEnabled = properties.limiterEnabled;
@@ -54,8 +51,7 @@ Return<Result> AutomaticGainControlEffect::init() { 
}



Return<Result> AutomaticGainControlEffect::setConfig(

        const EffectConfig& config,

        const sp<IEffectBufferProviderCallback>& inputBufferProvider,

    const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,

    const sp<IEffectBufferProviderCallback>& outputBufferProvider) {

    return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);

}
@@ -76,8 +72,8 @@ Return<Result> AutomaticGainControlEffect::setDevice(AudioDevice device) { 
    return mEffect->setDevice(device);

}



Return<void> AutomaticGainControlEffect::setAndGetVolume(

        const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {

Return<void> AutomaticGainControlEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,

                                                         setAndGetVolume_cb _hidl_cb) {

    return mEffect->setAndGetVolume(volumes, _hidl_cb);

}
@@ -91,8 +87,7 @@ Return<Result> AutomaticGainControlEffect::setAudioMode(AudioMode mode) { 
}



Return<Result> AutomaticGainControlEffect::setConfigReverse(

        const EffectConfig& config,

        const sp<IEffectBufferProviderCallback>& inputBufferProvider,

    const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,

    const sp<IEffectBufferProviderCallback>& outputBufferProvider) {

    return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);

}
@@ -135,48 +130,39 @@ Return<void> AutomaticGainControlEffect::getDescriptor(getDescriptor_cb _hidl_cb 
    return mEffect->getDescriptor(_hidl_cb);

}



Return<void> AutomaticGainControlEffect::prepareForProcessing(

        prepareForProcessing_cb _hidl_cb) {

Return<void> AutomaticGainControlEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {

    return mEffect->prepareForProcessing(_hidl_cb);

}



Return<Result> AutomaticGainControlEffect::setProcessBuffers(

        const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {

Return<Result> AutomaticGainControlEffect::setProcessBuffers(const AudioBuffer& inBuffer,

                                                             const AudioBuffer& outBuffer) {

    return mEffect->setProcessBuffers(inBuffer, outBuffer);

}



Return<void> AutomaticGainControlEffect::command(

        uint32_t commandId,

        const hidl_vec<uint8_t>& data,

        uint32_t resultMaxSize,

        command_cb _hidl_cb) {

Return<void> AutomaticGainControlEffect::command(uint32_t commandId, const hidl_vec<uint8_t>& data,

                                                 uint32_t resultMaxSize, command_cb _hidl_cb) {

    return mEffect->command(commandId, data, resultMaxSize, _hidl_cb);

}



Return<Result> AutomaticGainControlEffect::setParameter(

        const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {

Return<Result> AutomaticGainControlEffect::setParameter(const hidl_vec<uint8_t>& parameter,

                                                        const hidl_vec<uint8_t>& value) {

    return mEffect->setParameter(parameter, value);

}



Return<void> AutomaticGainControlEffect::getParameter(

        const hidl_vec<uint8_t>& parameter,

Return<void> AutomaticGainControlEffect::getParameter(const hidl_vec<uint8_t>& parameter,

                                                      uint32_t valueMaxSize,

                                                      getParameter_cb _hidl_cb) {

    return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);

}



Return<void> AutomaticGainControlEffect::getSupportedConfigsForFeature(

        uint32_t featureId,

        uint32_t maxConfigs,

        uint32_t configSize,

    uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,

    getSupportedConfigsForFeature_cb _hidl_cb) {

    return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);

}



Return<void> AutomaticGainControlEffect::getCurrentConfigForFeature(

        uint32_t featureId,

        uint32_t configSize,

        getCurrentConfigForFeature_cb _hidl_cb) {

    uint32_t featureId, uint32_t configSize, getCurrentConfigForFeature_cb _hidl_cb) {

    return mEffect->getCurrentConfigForFeature(featureId, configSize, _hidl_cb);

}
@@ -214,7 +200,8 @@ Return<void> AutomaticGainControlEffect::isLimiterEnabled(isLimiterEnabled_cb _h 
    return mEffect->getIntegerParam(AGC_PARAM_LIMITER_ENA, _hidl_cb);

}



Return<Result> AutomaticGainControlEffect::setAllProperties(const IAutomaticGainControlEffect::AllProperties& properties)  {

Return<Result> AutomaticGainControlEffect::setAllProperties(

    const IAutomaticGainControlEffect::AllProperties& properties) {

    t_agc_settings halProperties;

    propertiesToHal(properties, &halProperties);

    return mEffect->setParam(AGC_PARAM_PROPERTIES, halProperties);