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: Kevin Rocard <krocard@google.com>
diff --git a/audio/effect/2.0/default/AcousticEchoCancelerEffect.cpp b/audio/effect/2.0/default/AcousticEchoCancelerEffect.cpp
index 7b9ca30..9315e3e 100644
--- a/audio/effect/2.0/default/AcousticEchoCancelerEffect.cpp
+++ b/audio/effect/2.0/default/AcousticEchoCancelerEffect.cpp
@@ -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 implementation {
AcousticEchoCancelerEffect::AcousticEchoCancelerEffect(effect_handle_t handle)
- : mEffect(new Effect(handle)) {
-}
+ : mEffect(new Effect(handle)) {}
AcousticEchoCancelerEffect::~AcousticEchoCancelerEffect() {}
@@ -39,9 +38,8 @@
}
Return<Result> AcousticEchoCancelerEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -61,13 +59,13 @@
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);
}
Return<Result> AcousticEchoCancelerEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+ const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -76,9 +74,8 @@
}
Return<Result> AcousticEchoCancelerEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -95,7 +92,7 @@
}
Return<void> AcousticEchoCancelerEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -104,7 +101,7 @@
}
Return<Result> AcousticEchoCancelerEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+ const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -120,53 +117,44 @@
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,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+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,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ 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);
}
Return<Result> AcousticEchoCancelerEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+ uint32_t featureId, const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -175,15 +163,15 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::IAcousticEchoCancelerEffect follow.
-Return<Result> AcousticEchoCancelerEffect::setEchoDelay(uint32_t echoDelayMs) {
+Return<Result> AcousticEchoCancelerEffect::setEchoDelay(uint32_t echoDelayMs) {
return mEffect->setParam(AEC_PARAM_ECHO_DELAY, echoDelayMs);
}
-Return<void> AcousticEchoCancelerEffect::getEchoDelay(getEchoDelay_cb _hidl_cb) {
+Return<void> AcousticEchoCancelerEffect::getEchoDelay(getEchoDelay_cb _hidl_cb) {
return mEffect->getIntegerParam(AEC_PARAM_ECHO_DELAY, _hidl_cb);
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/AcousticEchoCancelerEffect.h b/audio/effect/2.0/default/AcousticEchoCancelerEffect.h
index 1ac925d..b9833bd 100644
--- a/audio/effect/2.0/default/AcousticEchoCancelerEffect.h
+++ b/audio/effect/2.0/default/AcousticEchoCancelerEffect.h
@@ -43,65 +43,54 @@
explicit AcousticEchoCancelerEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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.
- Return<Result> setEchoDelay(uint32_t echoDelayMs) override;
- Return<void> getEchoDelay(getEchoDelay_cb _hidl_cb) override;
+ Return<Result> setEchoDelay(uint32_t echoDelayMs) override;
+ Return<void> getEchoDelay(getEchoDelay_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
virtual ~AcousticEchoCancelerEffect();
diff --git a/audio/effect/2.0/default/AudioBufferManager.cpp b/audio/effect/2.0/default/AudioBufferManager.cpp
index bba0c4a..3d4d3d5 100644
--- a/audio/effect/2.0/default/AudioBufferManager.cpp
+++ b/audio/effect/2.0/default/AudioBufferManager.cpp
@@ -56,9 +56,8 @@
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);
diff --git a/audio/effect/2.0/default/AudioBufferManager.h b/audio/effect/2.0/default/AudioBufferManager.h
index 6d65995..e19db12 100644
--- a/audio/effect/2.0/default/AudioBufferManager.h
+++ b/audio/effect/2.0/default/AudioBufferManager.h
@@ -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;
@@ -37,12 +37,13 @@
namespace implementation {
class AudioBufferWrapper : public RefBase {
- public:
+ public:
explicit AudioBufferWrapper(const AudioBuffer& buffer);
virtual ~AudioBufferWrapper();
bool init();
audio_buffer_t* getHalBuffer() { return &mHalBuffer; }
- private:
+
+ private:
AudioBufferWrapper(const AudioBufferWrapper&) = delete;
void operator=(AudioBufferWrapper) = delete;
@@ -64,10 +65,10 @@
// This class needs to be in 'android' ns because Singleton macros require that.
class AudioBufferManager : public Singleton<AudioBufferManager> {
- public:
+ public:
bool wrap(const AudioBuffer& buffer, sp<AudioBufferWrapper>* wrapper);
- private:
+ private:
friend class hardware::audio::effect::V2_0::implementation::AudioBufferWrapper;
// Called by AudioBufferWrapper.
diff --git a/audio/effect/2.0/default/AutomaticGainControlEffect.cpp b/audio/effect/2.0/default/AutomaticGainControlEffect.cpp
index 62fe5f7..382a4bc 100644
--- a/audio/effect/2.0/default/AutomaticGainControlEffect.cpp
+++ b/audio/effect/2.0/default/AutomaticGainControlEffect.cpp
@@ -27,22 +27,19 @@
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,9 +51,8 @@
}
Return<Result> AutomaticGainControlEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -76,13 +72,13 @@
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);
}
Return<Result> AutomaticGainControlEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+ const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -91,9 +87,8 @@
}
Return<Result> AutomaticGainControlEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -110,7 +105,7 @@
}
Return<void> AutomaticGainControlEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -119,7 +114,7 @@
}
Return<Result> AutomaticGainControlEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+ const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -135,53 +130,44 @@
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,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+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,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ 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);
}
Return<Result> AutomaticGainControlEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+ uint32_t featureId, const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -190,37 +176,38 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::IAutomaticGainControlEffect follow.
-Return<Result> AutomaticGainControlEffect::setTargetLevel(int16_t targetLevelMb) {
+Return<Result> AutomaticGainControlEffect::setTargetLevel(int16_t targetLevelMb) {
return mEffect->setParam(AGC_PARAM_TARGET_LEVEL, targetLevelMb);
}
-Return<void> AutomaticGainControlEffect::getTargetLevel(getTargetLevel_cb _hidl_cb) {
+Return<void> AutomaticGainControlEffect::getTargetLevel(getTargetLevel_cb _hidl_cb) {
return mEffect->getIntegerParam(AGC_PARAM_TARGET_LEVEL, _hidl_cb);
}
-Return<Result> AutomaticGainControlEffect::setCompGain(int16_t compGainMb) {
+Return<Result> AutomaticGainControlEffect::setCompGain(int16_t compGainMb) {
return mEffect->setParam(AGC_PARAM_COMP_GAIN, compGainMb);
}
-Return<void> AutomaticGainControlEffect::getCompGain(getCompGain_cb _hidl_cb) {
+Return<void> AutomaticGainControlEffect::getCompGain(getCompGain_cb _hidl_cb) {
return mEffect->getIntegerParam(AGC_PARAM_COMP_GAIN, _hidl_cb);
}
-Return<Result> AutomaticGainControlEffect::setLimiterEnabled(bool enabled) {
+Return<Result> AutomaticGainControlEffect::setLimiterEnabled(bool enabled) {
return mEffect->setParam(AGC_PARAM_LIMITER_ENA, enabled);
}
-Return<void> AutomaticGainControlEffect::isLimiterEnabled(isLimiterEnabled_cb _hidl_cb) {
+Return<void> AutomaticGainControlEffect::isLimiterEnabled(isLimiterEnabled_cb _hidl_cb) {
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);
}
-Return<void> AutomaticGainControlEffect::getAllProperties(getAllProperties_cb _hidl_cb) {
+Return<void> AutomaticGainControlEffect::getAllProperties(getAllProperties_cb _hidl_cb) {
t_agc_settings halProperties;
Result retval = mEffect->getParam(AGC_PARAM_PROPERTIES, halProperties);
AllProperties properties;
@@ -229,7 +216,7 @@
return Void();
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/AutomaticGainControlEffect.h b/audio/effect/2.0/default/AutomaticGainControlEffect.h
index 5e1f279..5536e14 100644
--- a/audio/effect/2.0/default/AutomaticGainControlEffect.h
+++ b/audio/effect/2.0/default/AutomaticGainControlEffect.h
@@ -45,82 +45,69 @@
explicit AutomaticGainControlEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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::IAutomaticGainControlEffect follow.
- Return<Result> setTargetLevel(int16_t targetLevelMb) override;
- Return<void> getTargetLevel(getTargetLevel_cb _hidl_cb) override;
- Return<Result> setCompGain(int16_t compGainMb) override;
- Return<void> getCompGain(getCompGain_cb _hidl_cb) override;
- Return<Result> setLimiterEnabled(bool enabled) override;
- Return<void> isLimiterEnabled(isLimiterEnabled_cb _hidl_cb) override;
+ Return<Result> setTargetLevel(int16_t targetLevelMb) override;
+ Return<void> getTargetLevel(getTargetLevel_cb _hidl_cb) override;
+ Return<Result> setCompGain(int16_t compGainMb) override;
+ Return<void> getCompGain(getCompGain_cb _hidl_cb) override;
+ Return<Result> setLimiterEnabled(bool enabled) override;
+ Return<void> isLimiterEnabled(isLimiterEnabled_cb _hidl_cb) override;
Return<Result> setAllProperties(
- const IAutomaticGainControlEffect::AllProperties& properties) override;
- Return<void> getAllProperties(getAllProperties_cb _hidl_cb) override;
+ const IAutomaticGainControlEffect::AllProperties& properties) override;
+ Return<void> getAllProperties(getAllProperties_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
virtual ~AutomaticGainControlEffect();
- void propertiesFromHal(
- const t_agc_settings& halProperties,
- IAutomaticGainControlEffect::AllProperties* properties);
- void propertiesToHal(
- const IAutomaticGainControlEffect::AllProperties& properties,
- t_agc_settings* halProperties);
+ void propertiesFromHal(const t_agc_settings& halProperties,
+ IAutomaticGainControlEffect::AllProperties* properties);
+ void propertiesToHal(const IAutomaticGainControlEffect::AllProperties& properties,
+ t_agc_settings* halProperties);
};
} // namespace implementation
diff --git a/audio/effect/2.0/default/BassBoostEffect.cpp b/audio/effect/2.0/default/BassBoostEffect.cpp
index 8f35e5f..3366fcc 100644
--- a/audio/effect/2.0/default/BassBoostEffect.cpp
+++ b/audio/effect/2.0/default/BassBoostEffect.cpp
@@ -15,8 +15,8 @@
*/
#define LOG_TAG "BassBoost_HAL"
-#include <system/audio_effects/effect_bassboost.h>
#include <android/log.h>
+#include <system/audio_effects/effect_bassboost.h>
#include "BassBoostEffect.h"
@@ -27,9 +27,7 @@
namespace V2_0 {
namespace implementation {
-BassBoostEffect::BassBoostEffect(effect_handle_t handle)
- : mEffect(new Effect(handle)) {
-}
+BassBoostEffect::BassBoostEffect(effect_handle_t handle) : mEffect(new Effect(handle)) {}
BassBoostEffect::~BassBoostEffect() {}
@@ -39,9 +37,8 @@
}
Return<Result> BassBoostEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -61,13 +58,12 @@
return mEffect->setDevice(device);
}
-Return<void> BassBoostEffect::setAndGetVolume(
- const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {
+Return<void> BassBoostEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
+ setAndGetVolume_cb _hidl_cb) {
return mEffect->setAndGetVolume(volumes, _hidl_cb);
}
-Return<Result> BassBoostEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+Return<Result> BassBoostEffect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -76,9 +72,8 @@
}
Return<Result> BassBoostEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -95,7 +90,7 @@
}
Return<void> BassBoostEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -103,8 +98,7 @@
return mEffect->getAuxChannelsConfig(_hidl_cb);
}
-Return<Result> BassBoostEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+Return<Result> BassBoostEffect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -120,53 +114,43 @@
return mEffect->getDescriptor(_hidl_cb);
}
-Return<void> BassBoostEffect::prepareForProcessing(
- prepareForProcessing_cb _hidl_cb) {
+Return<void> BassBoostEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
return mEffect->prepareForProcessing(_hidl_cb);
}
-Return<Result> BassBoostEffect::setProcessBuffers(
- const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {
+Return<Result> BassBoostEffect::setProcessBuffers(const AudioBuffer& inBuffer,
+ const AudioBuffer& outBuffer) {
return mEffect->setProcessBuffers(inBuffer, outBuffer);
}
-Return<void> BassBoostEffect::command(
- uint32_t commandId,
- const hidl_vec<uint8_t>& data,
- uint32_t resultMaxSize,
- command_cb _hidl_cb) {
+Return<void> BassBoostEffect::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> BassBoostEffect::setParameter(
- const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {
+Return<Result> BassBoostEffect::setParameter(const hidl_vec<uint8_t>& parameter,
+ const hidl_vec<uint8_t>& value) {
return mEffect->setParameter(parameter, value);
}
-Return<void> BassBoostEffect::getParameter(
- const hidl_vec<uint8_t>& parameter,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+Return<void> BassBoostEffect::getParameter(const hidl_vec<uint8_t>& parameter,
+ uint32_t valueMaxSize, getParameter_cb _hidl_cb) {
return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);
}
Return<void> BassBoostEffect::getSupportedConfigsForFeature(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ getSupportedConfigsForFeature_cb _hidl_cb) {
return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);
}
-Return<void> BassBoostEffect::getCurrentConfigForFeature(
- uint32_t featureId,
- uint32_t configSize,
- getCurrentConfigForFeature_cb _hidl_cb) {
+Return<void> BassBoostEffect::getCurrentConfigForFeature(uint32_t featureId, uint32_t configSize,
+ getCurrentConfigForFeature_cb _hidl_cb) {
return mEffect->getCurrentConfigForFeature(featureId, configSize, _hidl_cb);
}
-Return<Result> BassBoostEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+Return<Result> BassBoostEffect::setCurrentConfigForFeature(uint32_t featureId,
+ const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -175,19 +159,19 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::IBassBoostEffect follow.
-Return<void> BassBoostEffect::isStrengthSupported(isStrengthSupported_cb _hidl_cb) {
+Return<void> BassBoostEffect::isStrengthSupported(isStrengthSupported_cb _hidl_cb) {
return mEffect->getIntegerParam(BASSBOOST_PARAM_STRENGTH_SUPPORTED, _hidl_cb);
}
-Return<Result> BassBoostEffect::setStrength(uint16_t strength) {
+Return<Result> BassBoostEffect::setStrength(uint16_t strength) {
return mEffect->setParam(BASSBOOST_PARAM_STRENGTH, strength);
}
-Return<void> BassBoostEffect::getStrength(getStrength_cb _hidl_cb) {
+Return<void> BassBoostEffect::getStrength(getStrength_cb _hidl_cb) {
return mEffect->getIntegerParam(BASSBOOST_PARAM_STRENGTH, _hidl_cb);
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/BassBoostEffect.h b/audio/effect/2.0/default/BassBoostEffect.h
index 1e5053b..278f37b 100644
--- a/audio/effect/2.0/default/BassBoostEffect.h
+++ b/audio/effect/2.0/default/BassBoostEffect.h
@@ -43,66 +43,55 @@
explicit BassBoostEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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::IBassBoostEffect follow.
- Return<void> isStrengthSupported(isStrengthSupported_cb _hidl_cb) override;
- Return<Result> setStrength(uint16_t strength) override;
- Return<void> getStrength(getStrength_cb _hidl_cb) override;
+ Return<void> isStrengthSupported(isStrengthSupported_cb _hidl_cb) override;
+ Return<Result> setStrength(uint16_t strength) override;
+ Return<void> getStrength(getStrength_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
virtual ~BassBoostEffect();
diff --git a/audio/effect/2.0/default/Conversions.cpp b/audio/effect/2.0/default/Conversions.cpp
index e839288..0b485d5 100644
--- a/audio/effect/2.0/default/Conversions.cpp
+++ b/audio/effect/2.0/default/Conversions.cpp
@@ -29,35 +29,27 @@
namespace V2_0 {
namespace implementation {
-void effectDescriptorFromHal(
- const effect_descriptor_t& halDescriptor, EffectDescriptor* descriptor) {
+void effectDescriptorFromHal(const effect_descriptor_t& halDescriptor,
+ EffectDescriptor* descriptor) {
HidlUtils::uuidFromHal(halDescriptor.type, &descriptor->type);
HidlUtils::uuidFromHal(halDescriptor.uuid, &descriptor->uuid);
descriptor->flags = EffectFlags(halDescriptor.flags);
descriptor->cpuLoad = halDescriptor.cpuLoad;
descriptor->memoryUsage = halDescriptor.memoryUsage;
memcpy(descriptor->name.data(), halDescriptor.name, descriptor->name.size());
- memcpy(descriptor->implementor.data(),
- halDescriptor.implementor, descriptor->implementor.size());
+ memcpy(descriptor->implementor.data(), halDescriptor.implementor,
+ descriptor->implementor.size());
}
std::string uuidToString(const effect_uuid_t& halUuid) {
char str[64];
- snprintf(str, sizeof(str), "%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x",
- halUuid.timeLow,
- halUuid.timeMid,
- halUuid.timeHiAndVersion,
- halUuid.clockSeq,
- halUuid.node[0],
- halUuid.node[1],
- halUuid.node[2],
- halUuid.node[3],
- halUuid.node[4],
- halUuid.node[5]);
+ snprintf(str, sizeof(str), "%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x", halUuid.timeLow,
+ halUuid.timeMid, halUuid.timeHiAndVersion, halUuid.clockSeq, halUuid.node[0],
+ halUuid.node[1], halUuid.node[2], halUuid.node[3], halUuid.node[4], halUuid.node[5]);
return str;
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/Conversions.h b/audio/effect/2.0/default/Conversions.h
index 7cef362..e13f36b 100644
--- a/audio/effect/2.0/default/Conversions.h
+++ b/audio/effect/2.0/default/Conversions.h
@@ -31,11 +31,11 @@
using ::android::hardware::audio::effect::V2_0::EffectDescriptor;
-void effectDescriptorFromHal(
- const effect_descriptor_t& halDescriptor, EffectDescriptor* descriptor);
+void effectDescriptorFromHal(const effect_descriptor_t& halDescriptor,
+ EffectDescriptor* descriptor);
std::string uuidToString(const effect_uuid_t& halUuid);
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/DownmixEffect.cpp b/audio/effect/2.0/default/DownmixEffect.cpp
index 92f15bd..e45f996 100644
--- a/audio/effect/2.0/default/DownmixEffect.cpp
+++ b/audio/effect/2.0/default/DownmixEffect.cpp
@@ -15,8 +15,8 @@
*/
#define LOG_TAG "Downmix_HAL"
-#include <system/audio_effects/effect_downmix.h>
#include <android/log.h>
+#include <system/audio_effects/effect_downmix.h>
#include "DownmixEffect.h"
@@ -27,9 +27,7 @@
namespace V2_0 {
namespace implementation {
-DownmixEffect::DownmixEffect(effect_handle_t handle)
- : mEffect(new Effect(handle)) {
-}
+DownmixEffect::DownmixEffect(effect_handle_t handle) : mEffect(new Effect(handle)) {}
DownmixEffect::~DownmixEffect() {}
@@ -39,9 +37,8 @@
}
Return<Result> DownmixEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -61,13 +58,12 @@
return mEffect->setDevice(device);
}
-Return<void> DownmixEffect::setAndGetVolume(
- const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {
+Return<void> DownmixEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
+ setAndGetVolume_cb _hidl_cb) {
return mEffect->setAndGetVolume(volumes, _hidl_cb);
}
-Return<Result> DownmixEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+Return<Result> DownmixEffect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -76,9 +72,8 @@
}
Return<Result> DownmixEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -95,7 +90,7 @@
}
Return<void> DownmixEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -103,8 +98,7 @@
return mEffect->getAuxChannelsConfig(_hidl_cb);
}
-Return<Result> DownmixEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+Return<Result> DownmixEffect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -120,53 +114,43 @@
return mEffect->getDescriptor(_hidl_cb);
}
-Return<void> DownmixEffect::prepareForProcessing(
- prepareForProcessing_cb _hidl_cb) {
+Return<void> DownmixEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
return mEffect->prepareForProcessing(_hidl_cb);
}
-Return<Result> DownmixEffect::setProcessBuffers(
- const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {
+Return<Result> DownmixEffect::setProcessBuffers(const AudioBuffer& inBuffer,
+ const AudioBuffer& outBuffer) {
return mEffect->setProcessBuffers(inBuffer, outBuffer);
}
-Return<void> DownmixEffect::command(
- uint32_t commandId,
- const hidl_vec<uint8_t>& data,
- uint32_t resultMaxSize,
- command_cb _hidl_cb) {
+Return<void> DownmixEffect::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> DownmixEffect::setParameter(
- const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {
+Return<Result> DownmixEffect::setParameter(const hidl_vec<uint8_t>& parameter,
+ const hidl_vec<uint8_t>& value) {
return mEffect->setParameter(parameter, value);
}
-Return<void> DownmixEffect::getParameter(
- const hidl_vec<uint8_t>& parameter,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+Return<void> DownmixEffect::getParameter(const hidl_vec<uint8_t>& parameter, uint32_t valueMaxSize,
+ getParameter_cb _hidl_cb) {
return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);
}
Return<void> DownmixEffect::getSupportedConfigsForFeature(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ getSupportedConfigsForFeature_cb _hidl_cb) {
return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);
}
-Return<void> DownmixEffect::getCurrentConfigForFeature(
- uint32_t featureId,
- uint32_t configSize,
- getCurrentConfigForFeature_cb _hidl_cb) {
+Return<void> DownmixEffect::getCurrentConfigForFeature(uint32_t featureId, uint32_t configSize,
+ getCurrentConfigForFeature_cb _hidl_cb) {
return mEffect->getCurrentConfigForFeature(featureId, configSize, _hidl_cb);
}
-Return<Result> DownmixEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+Return<Result> DownmixEffect::setCurrentConfigForFeature(uint32_t featureId,
+ const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -175,18 +159,18 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::IDownmixEffect follow.
-Return<Result> DownmixEffect::setType(IDownmixEffect::Type preset) {
+Return<Result> DownmixEffect::setType(IDownmixEffect::Type preset) {
return mEffect->setParam(DOWNMIX_PARAM_TYPE, static_cast<downmix_type_t>(preset));
}
-Return<void> DownmixEffect::getType(getType_cb _hidl_cb) {
+Return<void> DownmixEffect::getType(getType_cb _hidl_cb) {
downmix_type_t halPreset = DOWNMIX_TYPE_INVALID;
Result retval = mEffect->getParam(DOWNMIX_PARAM_TYPE, halPreset);
_hidl_cb(retval, Type(halPreset));
return Void();
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/DownmixEffect.h b/audio/effect/2.0/default/DownmixEffect.h
index 125f34d..edcc95a 100644
--- a/audio/effect/2.0/default/DownmixEffect.h
+++ b/audio/effect/2.0/default/DownmixEffect.h
@@ -43,65 +43,54 @@
explicit DownmixEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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::IDownmixEffect follow.
- Return<Result> setType(IDownmixEffect::Type preset) override;
- Return<void> getType(getType_cb _hidl_cb) override;
+ Return<Result> setType(IDownmixEffect::Type preset) override;
+ Return<void> getType(getType_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
virtual ~DownmixEffect();
diff --git a/audio/effect/2.0/default/Effect.cpp b/audio/effect/2.0/default/Effect.cpp
index 4026cf2..487bbe6 100644
--- a/audio/effect/2.0/default/Effect.cpp
+++ b/audio/effect/2.0/default/Effect.cpp
@@ -41,26 +41,22 @@
namespace {
class ProcessThread : public Thread {
- public:
+ public:
// ProcessThread's lifespan never exceeds Effect's lifespan.
- ProcessThread(std::atomic<bool>* stop,
- effect_handle_t effect,
- std::atomic<audio_buffer_t*>* inBuffer,
- std::atomic<audio_buffer_t*>* outBuffer,
- Effect::StatusMQ* statusMQ,
- EventFlag* efGroup)
- : Thread(false /*canCallJava*/),
- mStop(stop),
- mEffect(effect),
- mHasProcessReverse((*mEffect)->process_reverse != NULL),
- mInBuffer(inBuffer),
- mOutBuffer(outBuffer),
- mStatusMQ(statusMQ),
- mEfGroup(efGroup) {
- }
+ ProcessThread(std::atomic<bool>* stop, effect_handle_t effect,
+ std::atomic<audio_buffer_t*>* inBuffer, std::atomic<audio_buffer_t*>* outBuffer,
+ Effect::StatusMQ* statusMQ, EventFlag* efGroup)
+ : Thread(false /*canCallJava*/),
+ mStop(stop),
+ mEffect(effect),
+ mHasProcessReverse((*mEffect)->process_reverse != NULL),
+ mInBuffer(inBuffer),
+ mOutBuffer(outBuffer),
+ mStatusMQ(statusMQ),
+ mEfGroup(efGroup) {}
virtual ~ProcessThread() {}
- private:
+ private:
std::atomic<bool>* mStop;
effect_handle_t mEffect;
bool mHasProcessReverse;
@@ -75,16 +71,16 @@
bool ProcessThread::threadLoop() {
// This implementation doesn't return control back to the Thread until it decides to stop,
// as the Thread uses mutexes, and this can lead to priority inversion.
- while(!std::atomic_load_explicit(mStop, std::memory_order_acquire)) {
+ while (!std::atomic_load_explicit(mStop, std::memory_order_acquire)) {
uint32_t efState = 0;
mEfGroup->wait(static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_ALL), &efState);
- if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_ALL))
- || (efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_QUIT))) {
+ if (!(efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_ALL)) ||
+ (efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_QUIT))) {
continue; // Nothing to do or time to quit.
}
Result retval = Result::OK;
- if (efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_REVERSE)
- && !mHasProcessReverse) {
+ if (efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS_REVERSE) &&
+ !mHasProcessReverse) {
retval = Result::NOT_SUPPORTED;
}
@@ -93,9 +89,9 @@
std::atomic_thread_fence(std::memory_order_acquire);
int32_t processResult;
audio_buffer_t* inBuffer =
- std::atomic_load_explicit(mInBuffer, std::memory_order_relaxed);
+ std::atomic_load_explicit(mInBuffer, std::memory_order_relaxed);
audio_buffer_t* outBuffer =
- std::atomic_load_explicit(mOutBuffer, std::memory_order_relaxed);
+ std::atomic_load_explicit(mOutBuffer, std::memory_order_relaxed);
if (inBuffer != nullptr && outBuffer != nullptr) {
if (efState & static_cast<uint32_t>(MessageQueueFlagBits::REQUEST_PROCESS)) {
processResult = (*mEffect)->process(mEffect, inBuffer, outBuffer);
@@ -107,11 +103,18 @@
ALOGE("processing buffers were not set before calling 'process'");
processResult = -ENODEV;
}
- switch(processResult) {
- case 0: retval = Result::OK; break;
- case -ENODATA: retval = Result::INVALID_STATE; break;
- case -EINVAL: retval = Result::INVALID_ARGUMENTS; break;
- default: retval = Result::NOT_INITIALIZED;
+ switch (processResult) {
+ case 0:
+ retval = Result::OK;
+ break;
+ case -ENODATA:
+ retval = Result::INVALID_STATE;
+ break;
+ case -EINVAL:
+ retval = Result::INVALID_ARGUMENTS;
+ break;
+ default:
+ retval = Result::NOT_INITIALIZED;
}
}
if (!mStatusMQ->write(&retval)) {
@@ -126,13 +129,12 @@
} // namespace
// static
-const char *Effect::sContextResultOfCommand = "returned status";
-const char *Effect::sContextCallToCommand = "error";
-const char *Effect::sContextCallFunction = sContextCallToCommand;
+const char* Effect::sContextResultOfCommand = "returned status";
+const char* Effect::sContextCallToCommand = "error";
+const char* Effect::sContextCallFunction = sContextCallToCommand;
Effect::Effect(effect_handle_t handle)
- : mIsClosed(false), mHandle(handle), mEfGroup(nullptr), mStopProcessThread(false) {
-}
+ : mIsClosed(false), mHandle(handle), mEfGroup(nullptr), mStopProcessThread(false) {}
Effect::~Effect() {
ATRACE_CALL();
@@ -155,13 +157,14 @@
}
// static
-template<typename T> size_t Effect::alignedSizeIn(size_t s) {
+template <typename T>
+size_t Effect::alignedSizeIn(size_t s) {
return (s + sizeof(T) - 1) / sizeof(T);
}
// static
-template<typename T> std::unique_ptr<uint8_t[]> Effect::hidlVecToHal(
- const hidl_vec<T>& vec, uint32_t* halDataSize) {
+template <typename T>
+std::unique_ptr<uint8_t[]> Effect::hidlVecToHal(const hidl_vec<T>& vec, uint32_t* halDataSize) {
// Due to bugs in HAL, they may attempt to write into the provided
// input buffer. The original binder buffer is r/o, thus it is needed
// to create a r/w version.
@@ -172,22 +175,22 @@
}
// static
-void Effect::effectAuxChannelsConfigFromHal(
- const channel_config_t& halConfig, EffectAuxChannelsConfig* config) {
+void Effect::effectAuxChannelsConfigFromHal(const channel_config_t& halConfig,
+ EffectAuxChannelsConfig* config) {
config->mainChannels = AudioChannelMask(halConfig.main_channels);
config->auxChannels = AudioChannelMask(halConfig.aux_channels);
}
// static
-void Effect::effectAuxChannelsConfigToHal(
- const EffectAuxChannelsConfig& config, channel_config_t* halConfig) {
+void Effect::effectAuxChannelsConfigToHal(const EffectAuxChannelsConfig& config,
+ channel_config_t* halConfig) {
halConfig->main_channels = static_cast<audio_channel_mask_t>(config.mainChannels);
halConfig->aux_channels = static_cast<audio_channel_mask_t>(config.auxChannels);
}
// static
-void Effect::effectBufferConfigFromHal(
- const buffer_config_t& halConfig, EffectBufferConfig* config) {
+void Effect::effectBufferConfigFromHal(const buffer_config_t& halConfig,
+ EffectBufferConfig* config) {
config->buffer.id = 0;
config->buffer.frameCount = 0;
config->samplingRateHz = halConfig.samplingRate;
@@ -227,22 +230,19 @@
}
// static
-void Effect::effectOffloadParamToHal(
- const EffectOffloadParameter& offload, effect_offload_param_t* halOffload) {
+void Effect::effectOffloadParamToHal(const EffectOffloadParameter& offload,
+ effect_offload_param_t* halOffload) {
halOffload->isOffload = offload.isOffload;
halOffload->ioHandle = offload.ioHandle;
}
// static
-std::vector<uint8_t> Effect::parameterToHal(
- uint32_t paramSize,
- const void* paramData,
- uint32_t valueSize,
- const void** valueData) {
+std::vector<uint8_t> Effect::parameterToHal(uint32_t paramSize, const void* paramData,
+ uint32_t valueSize, const void** valueData) {
size_t valueOffsetFromData = alignedSizeIn<uint32_t>(paramSize) * sizeof(uint32_t);
size_t halParamBufferSize = sizeof(effect_param_t) + valueOffsetFromData + valueSize;
std::vector<uint8_t> halParamBuffer(halParamBufferSize, 0);
- effect_param_t *halParam = reinterpret_cast<effect_param_t*>(&halParamBuffer[0]);
+ effect_param_t* halParam = reinterpret_cast<effect_param_t*>(&halParamBuffer[0]);
halParam->psize = paramSize;
halParam->vsize = valueSize;
memcpy(halParam->data, paramData, paramSize);
@@ -262,31 +262,35 @@
return analyzeStatus("command", commandName, context, status);
}
-Result Effect::analyzeStatus(
- const char* funcName,
- const char* subFuncName,
- const char* contextDescription,
- status_t status) {
+Result Effect::analyzeStatus(const char* funcName, const char* subFuncName,
+ const char* contextDescription, status_t status) {
if (status != OK) {
- ALOGW("Effect %p %s %s %s: %s",
- mHandle, funcName, subFuncName, contextDescription, strerror(-status));
+ ALOGW("Effect %p %s %s %s: %s", mHandle, funcName, subFuncName, contextDescription,
+ strerror(-status));
}
switch (status) {
- case OK: return Result::OK;
- case -EINVAL: return Result::INVALID_ARGUMENTS;
- case -ENODATA: return Result::INVALID_STATE;
- case -ENODEV: return Result::NOT_INITIALIZED;
- case -ENOMEM: return Result::RESULT_TOO_BIG;
- case -ENOSYS: return Result::NOT_SUPPORTED;
- default: return Result::INVALID_STATE;
+ case OK:
+ return Result::OK;
+ case -EINVAL:
+ return Result::INVALID_ARGUMENTS;
+ case -ENODATA:
+ return Result::INVALID_STATE;
+ case -ENODEV:
+ return Result::NOT_INITIALIZED;
+ case -ENOMEM:
+ return Result::RESULT_TOO_BIG;
+ case -ENOSYS:
+ return Result::NOT_SUPPORTED;
+ default:
+ return Result::INVALID_STATE;
}
}
void Effect::getConfigImpl(int commandCode, const char* commandName, GetConfigCallback cb) {
uint32_t halResultSize = sizeof(effect_config_t);
effect_config_t halConfig{};
- status_t status = (*mHandle)->command(
- mHandle, commandCode, 0, NULL, &halResultSize, &halConfig);
+ status_t status =
+ (*mHandle)->command(mHandle, commandCode, 0, NULL, &halResultSize, &halConfig);
EffectConfig config;
if (status == OK) {
effectConfigFromHal(halConfig, &config);
@@ -294,66 +298,51 @@
cb(analyzeCommandStatus(commandName, sContextCallToCommand, status), config);
}
-Result Effect::getCurrentConfigImpl(
- uint32_t featureId, uint32_t configSize, GetCurrentConfigSuccessCallback onSuccess) {
+Result Effect::getCurrentConfigImpl(uint32_t featureId, uint32_t configSize,
+ GetCurrentConfigSuccessCallback onSuccess) {
uint32_t halCmd = featureId;
uint32_t halResult[alignedSizeIn<uint32_t>(sizeof(uint32_t) + configSize)];
memset(halResult, 0, sizeof(halResult));
uint32_t halResultSize = 0;
- return sendCommandReturningStatusAndData(
- EFFECT_CMD_GET_FEATURE_CONFIG, "GET_FEATURE_CONFIG",
- sizeof(uint32_t), &halCmd,
- &halResultSize, halResult,
- sizeof(uint32_t),
- [&]{ onSuccess(&halResult[1]); });
+ return sendCommandReturningStatusAndData(EFFECT_CMD_GET_FEATURE_CONFIG, "GET_FEATURE_CONFIG",
+ sizeof(uint32_t), &halCmd, &halResultSize, halResult,
+ sizeof(uint32_t), [&] { onSuccess(&halResult[1]); });
}
-Result Effect::getParameterImpl(
- uint32_t paramSize,
- const void* paramData,
- uint32_t requestValueSize,
- uint32_t replyValueSize,
- GetParameterSuccessCallback onSuccess) {
+Result Effect::getParameterImpl(uint32_t paramSize, const void* paramData,
+ uint32_t requestValueSize, uint32_t replyValueSize,
+ GetParameterSuccessCallback onSuccess) {
// As it is unknown what method HAL uses for copying the provided parameter data,
// it is safer to make sure that input and output buffers do not overlap.
std::vector<uint8_t> halCmdBuffer =
- parameterToHal(paramSize, paramData, requestValueSize, nullptr);
- const void *valueData = nullptr;
+ parameterToHal(paramSize, paramData, requestValueSize, nullptr);
+ const void* valueData = nullptr;
std::vector<uint8_t> halParamBuffer =
- parameterToHal(paramSize, paramData, replyValueSize, &valueData);
+ parameterToHal(paramSize, paramData, replyValueSize, &valueData);
uint32_t halParamBufferSize = halParamBuffer.size();
return sendCommandReturningStatusAndData(
- EFFECT_CMD_GET_PARAM, "GET_PARAM",
- halCmdBuffer.size(), &halCmdBuffer[0],
- &halParamBufferSize, &halParamBuffer[0],
- sizeof(effect_param_t),
- [&]{
- effect_param_t *halParam = reinterpret_cast<effect_param_t*>(&halParamBuffer[0]);
- onSuccess(halParam->vsize, valueData);
- });
+ EFFECT_CMD_GET_PARAM, "GET_PARAM", halCmdBuffer.size(), &halCmdBuffer[0],
+ &halParamBufferSize, &halParamBuffer[0], sizeof(effect_param_t), [&] {
+ effect_param_t* halParam = reinterpret_cast<effect_param_t*>(&halParamBuffer[0]);
+ onSuccess(halParam->vsize, valueData);
+ });
}
-Result Effect::getSupportedConfigsImpl(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- GetSupportedConfigsSuccessCallback onSuccess) {
- uint32_t halCmd[2] = { featureId, maxConfigs };
+Result Effect::getSupportedConfigsImpl(uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ GetSupportedConfigsSuccessCallback onSuccess) {
+ uint32_t halCmd[2] = {featureId, maxConfigs};
uint32_t halResultSize = 2 * sizeof(uint32_t) + maxConfigs * sizeof(configSize);
uint8_t halResult[halResultSize];
memset(&halResult[0], 0, halResultSize);
return sendCommandReturningStatusAndData(
- EFFECT_CMD_GET_FEATURE_SUPPORTED_CONFIGS, "GET_FEATURE_SUPPORTED_CONFIGS",
- sizeof(halCmd), halCmd,
- &halResultSize, &halResult[0],
- 2 * sizeof(uint32_t),
- [&]{
- uint32_t *halResult32 = reinterpret_cast<uint32_t*>(&halResult[0]);
- uint32_t supportedConfigs = *(++halResult32); // skip status field
- if (supportedConfigs > maxConfigs) supportedConfigs = maxConfigs;
- onSuccess(supportedConfigs, ++halResult32);
- });
+ EFFECT_CMD_GET_FEATURE_SUPPORTED_CONFIGS, "GET_FEATURE_SUPPORTED_CONFIGS", sizeof(halCmd),
+ halCmd, &halResultSize, &halResult[0], 2 * sizeof(uint32_t), [&] {
+ uint32_t* halResult32 = reinterpret_cast<uint32_t*>(&halResult[0]);
+ uint32_t supportedConfigs = *(++halResult32); // skip status field
+ if (supportedConfigs > maxConfigs) supportedConfigs = maxConfigs;
+ onSuccess(supportedConfigs, ++halResult32);
+ });
}
Return<void> Effect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
@@ -378,13 +367,8 @@
}
// Create and launch the thread.
- mProcessThread = new ProcessThread(
- &mStopProcessThread,
- mHandle,
- &mHalInBufferPtr,
- &mHalOutBufferPtr,
- tempStatusMQ.get(),
- mEfGroup);
+ mProcessThread = new ProcessThread(&mStopProcessThread, mHandle, &mHalInBufferPtr,
+ &mHalOutBufferPtr, tempStatusMQ.get(), mEfGroup);
status = mProcessThread->run("effect", PRIORITY_URGENT_AUDIO);
if (status != OK) {
ALOGW("failed to start effect processing thread: %s", strerror(-status));
@@ -397,8 +381,8 @@
return Void();
}
-Return<Result> Effect::setProcessBuffers(
- const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {
+Return<Result> Effect::setProcessBuffers(const AudioBuffer& inBuffer,
+ const AudioBuffer& outBuffer) {
AudioBufferManager& manager = AudioBufferManager::getInstance();
sp<AudioBufferWrapper> tempInBuffer, tempOutBuffer;
if (!manager.wrap(inBuffer, &tempInBuffer)) {
@@ -422,22 +406,18 @@
return sendCommand(commandCode, commandName, 0, NULL);
}
-Result Effect::sendCommand(
- int commandCode, const char* commandName, uint32_t size, void* data) {
+Result Effect::sendCommand(int commandCode, const char* commandName, uint32_t size, void* data) {
status_t status = (*mHandle)->command(mHandle, commandCode, size, data, 0, NULL);
return analyzeCommandStatus(commandName, sContextCallToCommand, status);
}
-Result Effect::sendCommandReturningData(
- int commandCode, const char* commandName,
- uint32_t* replySize, void* replyData) {
+Result Effect::sendCommandReturningData(int commandCode, const char* commandName,
+ uint32_t* replySize, void* replyData) {
return sendCommandReturningData(commandCode, commandName, 0, NULL, replySize, replyData);
}
-Result Effect::sendCommandReturningData(
- int commandCode, const char* commandName,
- uint32_t size, void* data,
- uint32_t* replySize, void* replyData) {
+Result Effect::sendCommandReturningData(int commandCode, const char* commandName, uint32_t size,
+ void* data, uint32_t* replySize, void* replyData) {
uint32_t expectedReplySize = *replySize;
status_t status = (*mHandle)->command(mHandle, commandCode, size, data, replySize, replyData);
if (status == OK && *replySize != expectedReplySize) {
@@ -450,22 +430,19 @@
return sendCommandReturningStatus(commandCode, commandName, 0, NULL);
}
-Result Effect::sendCommandReturningStatus(
- int commandCode, const char* commandName, uint32_t size, void* data) {
+Result Effect::sendCommandReturningStatus(int commandCode, const char* commandName, uint32_t size,
+ void* data) {
uint32_t replyCmdStatus;
uint32_t replySize = sizeof(uint32_t);
- return sendCommandReturningStatusAndData(
- commandCode, commandName, size, data, &replySize, &replyCmdStatus, replySize, []{});
+ return sendCommandReturningStatusAndData(commandCode, commandName, size, data, &replySize,
+ &replyCmdStatus, replySize, [] {});
}
-Result Effect::sendCommandReturningStatusAndData(
- int commandCode, const char* commandName,
- uint32_t size, void* data,
- uint32_t* replySize, void* replyData,
- uint32_t minReplySize,
- CommandSuccessCallback onSuccess) {
- status_t status =
- (*mHandle)->command(mHandle, commandCode, size, data, replySize, replyData);
+Result Effect::sendCommandReturningStatusAndData(int commandCode, const char* commandName,
+ uint32_t size, void* data, uint32_t* replySize,
+ void* replyData, uint32_t minReplySize,
+ CommandSuccessCallback onSuccess) {
+ status_t status = (*mHandle)->command(mHandle, commandCode, size, data, replySize, replyData);
Result retval;
if (status == OK && minReplySize >= sizeof(uint32_t) && *replySize >= minReplySize) {
uint32_t commandStatus = *reinterpret_cast<uint32_t*>(replyData);
@@ -479,11 +456,9 @@
return retval;
}
-Result Effect::setConfigImpl(
- int commandCode, const char* commandName,
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+Result Effect::setConfigImpl(int commandCode, const char* commandName, const EffectConfig& config,
+ const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
effect_config_t halConfig;
effectConfigToHal(config, &halConfig);
if (inputBufferProvider != 0) {
@@ -492,59 +467,55 @@
if (outputBufferProvider != 0) {
LOG_FATAL("Using output buffer provider is not supported");
}
- return sendCommandReturningStatus(
- commandCode, commandName, sizeof(effect_config_t), &halConfig);
+ return sendCommandReturningStatus(commandCode, commandName, sizeof(effect_config_t),
+ &halConfig);
}
-
-Result Effect::setParameterImpl(
- uint32_t paramSize, const void* paramData, uint32_t valueSize, const void* valueData) {
- std::vector<uint8_t> halParamBuffer = parameterToHal(
- paramSize, paramData, valueSize, &valueData);
- return sendCommandReturningStatus(
- EFFECT_CMD_SET_PARAM, "SET_PARAM", halParamBuffer.size(), &halParamBuffer[0]);
+Result Effect::setParameterImpl(uint32_t paramSize, const void* paramData, uint32_t valueSize,
+ const void* valueData) {
+ std::vector<uint8_t> halParamBuffer =
+ parameterToHal(paramSize, paramData, valueSize, &valueData);
+ return sendCommandReturningStatus(EFFECT_CMD_SET_PARAM, "SET_PARAM", halParamBuffer.size(),
+ &halParamBuffer[0]);
}
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
-Return<Result> Effect::init() {
+Return<Result> Effect::init() {
return sendCommandReturningStatus(EFFECT_CMD_INIT, "INIT");
}
-Return<Result> Effect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
- return setConfigImpl(
- EFFECT_CMD_SET_CONFIG, "SET_CONFIG", config, inputBufferProvider, outputBufferProvider);
+Return<Result> Effect::setConfig(const EffectConfig& config,
+ const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ return setConfigImpl(EFFECT_CMD_SET_CONFIG, "SET_CONFIG", config, inputBufferProvider,
+ outputBufferProvider);
}
-Return<Result> Effect::reset() {
+Return<Result> Effect::reset() {
return sendCommand(EFFECT_CMD_RESET, "RESET");
}
-Return<Result> Effect::enable() {
+Return<Result> Effect::enable() {
return sendCommandReturningStatus(EFFECT_CMD_ENABLE, "ENABLE");
}
-Return<Result> Effect::disable() {
+Return<Result> Effect::disable() {
return sendCommandReturningStatus(EFFECT_CMD_DISABLE, "DISABLE");
}
-Return<Result> Effect::setDevice(AudioDevice device) {
+Return<Result> Effect::setDevice(AudioDevice device) {
uint32_t halDevice = static_cast<uint32_t>(device);
return sendCommand(EFFECT_CMD_SET_DEVICE, "SET_DEVICE", sizeof(uint32_t), &halDevice);
}
-Return<void> Effect::setAndGetVolume(
- const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {
+Return<void> Effect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
+ setAndGetVolume_cb _hidl_cb) {
uint32_t halDataSize;
std::unique_ptr<uint8_t[]> halData = hidlVecToHal(volumes, &halDataSize);
uint32_t halResultSize = halDataSize;
uint32_t halResult[volumes.size()];
- Result retval = sendCommandReturningData(
- EFFECT_CMD_SET_VOLUME, "SET_VOLUME",
- halDataSize, &halData[0],
- &halResultSize, halResult);
+ Result retval = sendCommandReturningData(EFFECT_CMD_SET_VOLUME, "SET_VOLUME", halDataSize,
+ &halData[0], &halResultSize, halResult);
hidl_vec<uint32_t> result;
if (retval == Result::OK) {
result.setToExternal(&halResult[0], halResultSize);
@@ -553,99 +524,91 @@
return Void();
}
-Return<Result> Effect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
+Return<Result> Effect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
uint32_t halDataSize;
std::unique_ptr<uint8_t[]> halData = hidlVecToHal(volumes, &halDataSize);
- return sendCommand(
- EFFECT_CMD_SET_VOLUME, "SET_VOLUME",
- halDataSize, &halData[0]);
+ return sendCommand(EFFECT_CMD_SET_VOLUME, "SET_VOLUME", halDataSize, &halData[0]);
}
-Return<Result> Effect::setAudioMode(AudioMode mode) {
+Return<Result> Effect::setAudioMode(AudioMode mode) {
uint32_t halMode = static_cast<uint32_t>(mode);
- return sendCommand(
- EFFECT_CMD_SET_AUDIO_MODE, "SET_AUDIO_MODE", sizeof(uint32_t), &halMode);
+ return sendCommand(EFFECT_CMD_SET_AUDIO_MODE, "SET_AUDIO_MODE", sizeof(uint32_t), &halMode);
}
Return<Result> Effect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
- return setConfigImpl(EFFECT_CMD_SET_CONFIG_REVERSE, "SET_CONFIG_REVERSE",
- config, inputBufferProvider, outputBufferProvider);
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ return setConfigImpl(EFFECT_CMD_SET_CONFIG_REVERSE, "SET_CONFIG_REVERSE", config,
+ inputBufferProvider, outputBufferProvider);
}
-Return<Result> Effect::setInputDevice(AudioDevice device) {
+Return<Result> Effect::setInputDevice(AudioDevice device) {
uint32_t halDevice = static_cast<uint32_t>(device);
- return sendCommand(
- EFFECT_CMD_SET_INPUT_DEVICE, "SET_INPUT_DEVICE", sizeof(uint32_t), &halDevice);
+ return sendCommand(EFFECT_CMD_SET_INPUT_DEVICE, "SET_INPUT_DEVICE", sizeof(uint32_t),
+ &halDevice);
}
-Return<void> Effect::getConfig(getConfig_cb _hidl_cb) {
+Return<void> Effect::getConfig(getConfig_cb _hidl_cb) {
getConfigImpl(EFFECT_CMD_GET_CONFIG, "GET_CONFIG", _hidl_cb);
return Void();
}
-Return<void> Effect::getConfigReverse(getConfigReverse_cb _hidl_cb) {
+Return<void> Effect::getConfigReverse(getConfigReverse_cb _hidl_cb) {
getConfigImpl(EFFECT_CMD_GET_CONFIG_REVERSE, "GET_CONFIG_REVERSE", _hidl_cb);
return Void();
}
-Return<void> Effect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+Return<void> Effect::getSupportedAuxChannelsConfigs(uint32_t maxConfigs,
+ getSupportedAuxChannelsConfigs_cb _hidl_cb) {
hidl_vec<EffectAuxChannelsConfig> result;
Result retval = getSupportedConfigsImpl(
- EFFECT_FEATURE_AUX_CHANNELS,
- maxConfigs,
- sizeof(channel_config_t),
- [&] (uint32_t supportedConfigs, void* configsData) {
- result.resize(supportedConfigs);
- channel_config_t *config = reinterpret_cast<channel_config_t*>(configsData);
- for (size_t i = 0; i < result.size(); ++i) {
- effectAuxChannelsConfigFromHal(*config++, &result[i]);
- }
- });
+ EFFECT_FEATURE_AUX_CHANNELS, maxConfigs, sizeof(channel_config_t),
+ [&](uint32_t supportedConfigs, void* configsData) {
+ result.resize(supportedConfigs);
+ channel_config_t* config = reinterpret_cast<channel_config_t*>(configsData);
+ for (size_t i = 0; i < result.size(); ++i) {
+ effectAuxChannelsConfigFromHal(*config++, &result[i]);
+ }
+ });
_hidl_cb(retval, result);
return Void();
}
-Return<void> Effect::getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) {
+Return<void> Effect::getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) {
uint32_t halResult[alignedSizeIn<uint32_t>(sizeof(uint32_t) + sizeof(channel_config_t))];
memset(halResult, 0, sizeof(halResult));
EffectAuxChannelsConfig result;
Result retval = getCurrentConfigImpl(
- EFFECT_FEATURE_AUX_CHANNELS,
- sizeof(channel_config_t),
- [&] (void* configData) {
- effectAuxChannelsConfigFromHal(
- *reinterpret_cast<channel_config_t*>(configData), &result);
- });
+ EFFECT_FEATURE_AUX_CHANNELS, sizeof(channel_config_t), [&](void* configData) {
+ effectAuxChannelsConfigFromHal(*reinterpret_cast<channel_config_t*>(configData),
+ &result);
+ });
_hidl_cb(retval, result);
return Void();
}
-Return<Result> Effect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
+Return<Result> Effect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
uint32_t halCmd[alignedSizeIn<uint32_t>(sizeof(uint32_t) + sizeof(channel_config_t))];
halCmd[0] = EFFECT_FEATURE_AUX_CHANNELS;
effectAuxChannelsConfigToHal(config, reinterpret_cast<channel_config_t*>(&halCmd[1]));
return sendCommandReturningStatus(EFFECT_CMD_SET_FEATURE_CONFIG,
- "SET_FEATURE_CONFIG AUX_CHANNELS", sizeof(halCmd), halCmd);
+ "SET_FEATURE_CONFIG AUX_CHANNELS", sizeof(halCmd), halCmd);
}
-Return<Result> Effect::setAudioSource(AudioSource source) {
+Return<Result> Effect::setAudioSource(AudioSource source) {
uint32_t halSource = static_cast<uint32_t>(source);
- return sendCommand(
- EFFECT_CMD_SET_AUDIO_SOURCE, "SET_AUDIO_SOURCE", sizeof(uint32_t), &halSource);
+ return sendCommand(EFFECT_CMD_SET_AUDIO_SOURCE, "SET_AUDIO_SOURCE", sizeof(uint32_t),
+ &halSource);
}
-Return<Result> Effect::offload(const EffectOffloadParameter& param) {
+Return<Result> Effect::offload(const EffectOffloadParameter& param) {
effect_offload_param_t halParam;
effectOffloadParamToHal(param, &halParam);
- return sendCommandReturningStatus(
- EFFECT_CMD_OFFLOAD, "OFFLOAD", sizeof(effect_offload_param_t), &halParam);
+ return sendCommandReturningStatus(EFFECT_CMD_OFFLOAD, "OFFLOAD", sizeof(effect_offload_param_t),
+ &halParam);
}
-Return<void> Effect::getDescriptor(getDescriptor_cb _hidl_cb) {
+Return<void> Effect::getDescriptor(getDescriptor_cb _hidl_cb) {
effect_descriptor_t halDescriptor;
memset(&halDescriptor, 0, sizeof(effect_descriptor_t));
status_t status = (*mHandle)->get_descriptor(mHandle, &halDescriptor);
@@ -657,11 +620,8 @@
return Void();
}
-Return<void> Effect::command(
- uint32_t commandId,
- const hidl_vec<uint8_t>& data,
- uint32_t resultMaxSize,
- command_cb _hidl_cb) {
+Return<void> Effect::command(uint32_t commandId, const hidl_vec<uint8_t>& data,
+ uint32_t resultMaxSize, command_cb _hidl_cb) {
uint32_t halDataSize;
std::unique_ptr<uint8_t[]> halData = hidlVecToHal(data, &halDataSize);
uint32_t halResultSize = resultMaxSize;
@@ -670,8 +630,8 @@
void* dataPtr = halDataSize > 0 ? &halData[0] : NULL;
void* resultPtr = halResultSize > 0 ? &halResult[0] : NULL;
- status_t status = (*mHandle)->command(
- mHandle, commandId, halDataSize, dataPtr, &halResultSize, resultPtr);
+ status_t status =
+ (*mHandle)->command(mHandle, commandId, halDataSize, dataPtr, &halResultSize, resultPtr);
hidl_vec<uint8_t> result;
if (status == OK && resultPtr != NULL) {
result.setToExternal(&halResult[0], halResultSize);
@@ -680,68 +640,58 @@
return Void();
}
-Return<Result> Effect::setParameter(
- const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {
+Return<Result> Effect::setParameter(const hidl_vec<uint8_t>& parameter,
+ const hidl_vec<uint8_t>& value) {
return setParameterImpl(parameter.size(), ¶meter[0], value.size(), &value[0]);
}
-Return<void> Effect::getParameter(
- const hidl_vec<uint8_t>& parameter, uint32_t valueMaxSize, getParameter_cb _hidl_cb) {
+Return<void> Effect::getParameter(const hidl_vec<uint8_t>& parameter, uint32_t valueMaxSize,
+ getParameter_cb _hidl_cb) {
hidl_vec<uint8_t> value;
Result retval = getParameterImpl(
- parameter.size(),
- ¶meter[0],
- valueMaxSize,
- [&] (uint32_t valueSize, const void* valueData) {
- value.setToExternal(
- reinterpret_cast<uint8_t*>(const_cast<void*>(valueData)), valueSize);
- });
+ parameter.size(), ¶meter[0], valueMaxSize,
+ [&](uint32_t valueSize, const void* valueData) {
+ value.setToExternal(reinterpret_cast<uint8_t*>(const_cast<void*>(valueData)),
+ valueSize);
+ });
_hidl_cb(retval, value);
return Void();
}
-Return<void> Effect::getSupportedConfigsForFeature(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+Return<void> Effect::getSupportedConfigsForFeature(uint32_t featureId, uint32_t maxConfigs,
+ uint32_t configSize,
+ getSupportedConfigsForFeature_cb _hidl_cb) {
uint32_t configCount = 0;
hidl_vec<uint8_t> result;
- Result retval = getSupportedConfigsImpl(
- featureId,
- maxConfigs,
- configSize,
- [&] (uint32_t supportedConfigs, void* configsData) {
- configCount = supportedConfigs;
- result.resize(configCount * configSize);
- memcpy(&result[0], configsData, result.size());
- });
+ Result retval = getSupportedConfigsImpl(featureId, maxConfigs, configSize,
+ [&](uint32_t supportedConfigs, void* configsData) {
+ configCount = supportedConfigs;
+ result.resize(configCount * configSize);
+ memcpy(&result[0], configsData, result.size());
+ });
_hidl_cb(retval, configCount, result);
return Void();
}
-Return<void> Effect::getCurrentConfigForFeature(
- uint32_t featureId, uint32_t configSize, getCurrentConfigForFeature_cb _hidl_cb) {
+Return<void> Effect::getCurrentConfigForFeature(uint32_t featureId, uint32_t configSize,
+ getCurrentConfigForFeature_cb _hidl_cb) {
hidl_vec<uint8_t> result;
- Result retval = getCurrentConfigImpl(
- featureId,
- configSize,
- [&] (void* configData) {
- result.resize(configSize);
- memcpy(&result[0], configData, result.size());
- });
+ Result retval = getCurrentConfigImpl(featureId, configSize, [&](void* configData) {
+ result.resize(configSize);
+ memcpy(&result[0], configData, result.size());
+ });
_hidl_cb(retval, result);
return Void();
}
-Return<Result> Effect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+Return<Result> Effect::setCurrentConfigForFeature(uint32_t featureId,
+ const hidl_vec<uint8_t>& configData) {
uint32_t halCmd[alignedSizeIn<uint32_t>(sizeof(uint32_t) + configData.size())];
memset(halCmd, 0, sizeof(halCmd));
halCmd[0] = featureId;
memcpy(&halCmd[1], &configData[0], configData.size());
- return sendCommandReturningStatus(
- EFFECT_CMD_SET_FEATURE_CONFIG, "SET_FEATURE_CONFIG", sizeof(halCmd), halCmd);
+ return sendCommandReturningStatus(EFFECT_CMD_SET_FEATURE_CONFIG, "SET_FEATURE_CONFIG",
+ sizeof(halCmd), halCmd);
}
Return<Result> Effect::close() {
@@ -756,7 +706,7 @@
return Result::OK;
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/Effect.h b/audio/effect/2.0/default/Effect.h
index 0918cd8..8f95e5e 100644
--- a/audio/effect/2.0/default/Effect.h
+++ b/audio/effect/2.0/default/Effect.h
@@ -61,127 +61,108 @@
struct Effect : public IEffect {
typedef MessageQueue<Result, kSynchronizedReadWrite> StatusMQ;
using GetParameterSuccessCallback =
- std::function<void(uint32_t valueSize, const void* valueData)>;
+ std::function<void(uint32_t valueSize, const void* valueData)>;
explicit Effect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) override;
+ Return<Result> setCurrentConfigForFeature(uint32_t featureId,
+ const hidl_vec<uint8_t>& configData) override;
+ Return<Result> close() override;
// Utility methods for extending interfaces.
- template<typename T> Return<void> getIntegerParam(
- uint32_t paramId, std::function<void(Result retval, T paramValue)> cb) {
+ template <typename T>
+ Return<void> getIntegerParam(uint32_t paramId,
+ std::function<void(Result retval, T paramValue)> cb) {
T value;
- Result retval = getParameterImpl(
- sizeof(uint32_t), ¶mId,
- sizeof(T),
- [&] (uint32_t valueSize, const void* valueData) {
- if (valueSize > sizeof(T)) valueSize = sizeof(T);
- memcpy(&value, valueData, valueSize);
- });
+ Result retval = getParameterImpl(sizeof(uint32_t), ¶mId, sizeof(T),
+ [&](uint32_t valueSize, const void* valueData) {
+ if (valueSize > sizeof(T)) valueSize = sizeof(T);
+ memcpy(&value, valueData, valueSize);
+ });
cb(retval, value);
return Void();
}
- template<typename T> Result getParam(uint32_t paramId, T& paramValue) {
- return getParameterImpl(
- sizeof(uint32_t), ¶mId,
- sizeof(T),
- [&] (uint32_t valueSize, const void* valueData) {
- if (valueSize > sizeof(T)) valueSize = sizeof(T);
- memcpy(¶mValue, valueData, valueSize);
- });
+ template <typename T>
+ Result getParam(uint32_t paramId, T& paramValue) {
+ return getParameterImpl(sizeof(uint32_t), ¶mId, sizeof(T),
+ [&](uint32_t valueSize, const void* valueData) {
+ if (valueSize > sizeof(T)) valueSize = sizeof(T);
+ memcpy(¶mValue, valueData, valueSize);
+ });
}
- template<typename T> Result getParam(uint32_t paramId, uint32_t paramArg, T& paramValue) {
- uint32_t params[2] = { paramId, paramArg };
- return getParameterImpl(
- sizeof(params), params,
- sizeof(T),
- [&] (uint32_t valueSize, const void* valueData) {
- if (valueSize > sizeof(T)) valueSize = sizeof(T);
- memcpy(¶mValue, valueData, valueSize);
- });
+ template <typename T>
+ Result getParam(uint32_t paramId, uint32_t paramArg, T& paramValue) {
+ uint32_t params[2] = {paramId, paramArg};
+ return getParameterImpl(sizeof(params), params, sizeof(T),
+ [&](uint32_t valueSize, const void* valueData) {
+ if (valueSize > sizeof(T)) valueSize = sizeof(T);
+ memcpy(¶mValue, valueData, valueSize);
+ });
}
- template<typename T> Result setParam(uint32_t paramId, const T& paramValue) {
+ template <typename T>
+ Result setParam(uint32_t paramId, const T& paramValue) {
return setParameterImpl(sizeof(uint32_t), ¶mId, sizeof(T), ¶mValue);
}
- template<typename T> Result setParam(uint32_t paramId, uint32_t paramArg, const T& paramValue) {
- uint32_t params[2] = { paramId, paramArg };
+ template <typename T>
+ Result setParam(uint32_t paramId, uint32_t paramArg, const T& paramValue) {
+ uint32_t params[2] = {paramId, paramArg};
return setParameterImpl(sizeof(params), params, sizeof(T), ¶mValue);
}
- Result getParameterImpl(
- uint32_t paramSize,
- const void* paramData,
- uint32_t valueSize,
- GetParameterSuccessCallback onSuccess) {
+ Result getParameterImpl(uint32_t paramSize, const void* paramData, uint32_t valueSize,
+ GetParameterSuccessCallback onSuccess) {
return getParameterImpl(paramSize, paramData, valueSize, valueSize, onSuccess);
}
- Result getParameterImpl(
- uint32_t paramSize,
- const void* paramData,
- uint32_t requestValueSize,
- uint32_t replyValueSize,
- GetParameterSuccessCallback onSuccess);
- Result setParameterImpl(
- uint32_t paramSize, const void* paramData, uint32_t valueSize, const void* valueData);
+ Result getParameterImpl(uint32_t paramSize, const void* paramData, uint32_t requestValueSize,
+ uint32_t replyValueSize, GetParameterSuccessCallback onSuccess);
+ Result setParameterImpl(uint32_t paramSize, const void* paramData, uint32_t valueSize,
+ const void* valueData);
- private:
+ private:
friend struct VirtualizerEffect; // for getParameterImpl
friend struct VisualizerEffect; // to allow executing commands
@@ -189,11 +170,11 @@
using GetConfigCallback = std::function<void(Result retval, const EffectConfig& config)>;
using GetCurrentConfigSuccessCallback = std::function<void(void* configData)>;
using GetSupportedConfigsSuccessCallback =
- std::function<void(uint32_t supportedConfigs, void* configsData)>;
+ std::function<void(uint32_t supportedConfigs, void* configsData)>;
- static const char *sContextResultOfCommand;
- static const char *sContextCallToCommand;
- static const char *sContextCallFunction;
+ static const char* sContextResultOfCommand;
+ static const char* sContextCallToCommand;
+ static const char* sContextCallFunction;
bool mIsClosed;
effect_handle_t mHandle;
@@ -208,61 +189,49 @@
virtual ~Effect();
- template<typename T> static size_t alignedSizeIn(size_t s);
- template<typename T> std::unique_ptr<uint8_t[]> hidlVecToHal(
- const hidl_vec<T>& vec, uint32_t* halDataSize);
- static void effectAuxChannelsConfigFromHal(
- const channel_config_t& halConfig, EffectAuxChannelsConfig* config);
- static void effectAuxChannelsConfigToHal(
- const EffectAuxChannelsConfig& config, channel_config_t* halConfig);
- static void effectBufferConfigFromHal(
- const buffer_config_t& halConfig, EffectBufferConfig* config);
- static void effectBufferConfigToHal(
- const EffectBufferConfig& config, buffer_config_t* halConfig);
+ template <typename T>
+ static size_t alignedSizeIn(size_t s);
+ template <typename T>
+ std::unique_ptr<uint8_t[]> hidlVecToHal(const hidl_vec<T>& vec, uint32_t* halDataSize);
+ static void effectAuxChannelsConfigFromHal(const channel_config_t& halConfig,
+ EffectAuxChannelsConfig* config);
+ static void effectAuxChannelsConfigToHal(const EffectAuxChannelsConfig& config,
+ channel_config_t* halConfig);
+ static void effectBufferConfigFromHal(const buffer_config_t& halConfig,
+ EffectBufferConfig* config);
+ static void effectBufferConfigToHal(const EffectBufferConfig& config,
+ buffer_config_t* halConfig);
static void effectConfigFromHal(const effect_config_t& halConfig, EffectConfig* config);
static void effectConfigToHal(const EffectConfig& config, effect_config_t* halConfig);
- static void effectOffloadParamToHal(
- const EffectOffloadParameter& offload, effect_offload_param_t* halOffload);
- static std::vector<uint8_t> parameterToHal(
- uint32_t paramSize, const void* paramData, uint32_t valueSize, const void** valueData);
+ static void effectOffloadParamToHal(const EffectOffloadParameter& offload,
+ effect_offload_param_t* halOffload);
+ static std::vector<uint8_t> parameterToHal(uint32_t paramSize, const void* paramData,
+ uint32_t valueSize, const void** valueData);
- Result analyzeCommandStatus(
- const char* commandName, const char* context, status_t status);
- Result analyzeStatus(
- const char* funcName,
- const char* subFuncName,
- const char* contextDescription,
- status_t status);
+ Result analyzeCommandStatus(const char* commandName, const char* context, status_t status);
+ Result analyzeStatus(const char* funcName, const char* subFuncName,
+ const char* contextDescription, status_t status);
void getConfigImpl(int commandCode, const char* commandName, GetConfigCallback cb);
- Result getCurrentConfigImpl(
- uint32_t featureId, uint32_t configSize, GetCurrentConfigSuccessCallback onSuccess);
- Result getSupportedConfigsImpl(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- GetSupportedConfigsSuccessCallback onSuccess);
+ Result getCurrentConfigImpl(uint32_t featureId, uint32_t configSize,
+ GetCurrentConfigSuccessCallback onSuccess);
+ Result getSupportedConfigsImpl(uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ GetSupportedConfigsSuccessCallback onSuccess);
Result sendCommand(int commandCode, const char* commandName);
Result sendCommand(int commandCode, const char* commandName, uint32_t size, void* data);
- Result sendCommandReturningData(
- int commandCode, const char* commandName, uint32_t* replySize, void* replyData);
- Result sendCommandReturningData(
- int commandCode, const char* commandName,
- uint32_t size, void* data,
- uint32_t* replySize, void* replyData);
+ Result sendCommandReturningData(int commandCode, const char* commandName, uint32_t* replySize,
+ void* replyData);
+ Result sendCommandReturningData(int commandCode, const char* commandName, uint32_t size,
+ void* data, uint32_t* replySize, void* replyData);
Result sendCommandReturningStatus(int commandCode, const char* commandName);
- Result sendCommandReturningStatus(
- int commandCode, const char* commandName, uint32_t size, void* data);
- Result sendCommandReturningStatusAndData(
- int commandCode, const char* commandName,
- uint32_t size, void* data,
- uint32_t* replySize, void* replyData,
- uint32_t minReplySize,
- CommandSuccessCallback onSuccess);
- Result setConfigImpl(
- int commandCode, const char* commandName,
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider);
+ Result sendCommandReturningStatus(int commandCode, const char* commandName, uint32_t size,
+ void* data);
+ Result sendCommandReturningStatusAndData(int commandCode, const char* commandName,
+ uint32_t size, void* data, uint32_t* replySize,
+ void* replyData, uint32_t minReplySize,
+ CommandSuccessCallback onSuccess);
+ Result setConfigImpl(int commandCode, const char* commandName, const EffectConfig& config,
+ const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider);
};
} // namespace implementation
diff --git a/audio/effect/2.0/default/EffectsFactory.cpp b/audio/effect/2.0/default/EffectsFactory.cpp
index c4ac6ae..67fd22a 100644
--- a/audio/effect/2.0/default/EffectsFactory.cpp
+++ b/audio/effect/2.0/default/EffectsFactory.cpp
@@ -15,6 +15,7 @@
*/
#define LOG_TAG "EffectFactoryHAL"
+#include <android/log.h>
#include <media/EffectsFactoryApi.h>
#include <system/audio_effects/effect_aec.h>
#include <system/audio_effects/effect_agc.h>
@@ -27,7 +28,6 @@
#include <system/audio_effects/effect_presetreverb.h>
#include <system/audio_effects/effect_virtualizer.h>
#include <system/audio_effects/effect_visualizer.h>
-#include <android/log.h>
#include "AcousticEchoCancelerEffect.h"
#include "AutomaticGainControlEffect.h"
@@ -56,9 +56,9 @@
namespace implementation {
// static
-sp<IEffect> EffectsFactory::dispatchEffectInstanceCreation(
- const effect_descriptor_t& halDescriptor, effect_handle_t handle) {
- const effect_uuid_t *halUuid = &halDescriptor.type;
+sp<IEffect> EffectsFactory::dispatchEffectInstanceCreation(const effect_descriptor_t& halDescriptor,
+ effect_handle_t handle) {
+ const effect_uuid_t* halUuid = &halDescriptor.type;
if (memcmp(halUuid, FX_IID_AEC, sizeof(effect_uuid_t)) == 0) {
return new AcousticEchoCancelerEffect(handle);
} else if (memcmp(halUuid, FX_IID_AGC, sizeof(effect_uuid_t)) == 0) {
@@ -86,7 +86,7 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::IEffectsFactory follow.
-Return<void> EffectsFactory::getAllDescriptors(getAllDescriptors_cb _hidl_cb) {
+Return<void> EffectsFactory::getAllDescriptors(getAllDescriptors_cb _hidl_cb) {
Result retval(Result::OK);
hidl_vec<EffectDescriptor> result;
uint32_t numEffects;
@@ -107,8 +107,8 @@
if (status == OK) {
effectDescriptorFromHal(halDescriptor, &result[i]);
} else {
- ALOGE("Error querying effect at position %d / %d: %s",
- i, numEffects, strerror(-status));
+ ALOGE("Error querying effect at position %d / %d: %s", i, numEffects,
+ strerror(-status));
switch (status) {
case -ENOSYS: {
// Effect list has changed.
@@ -132,7 +132,7 @@
return Void();
}
-Return<void> EffectsFactory::getDescriptor(const Uuid& uid, getDescriptor_cb _hidl_cb) {
+Return<void> EffectsFactory::getDescriptor(const Uuid& uid, getDescriptor_cb _hidl_cb) {
effect_uuid_t halUuid;
HidlUtils::uuidToHal(uid, &halUuid);
effect_descriptor_t halDescriptor;
@@ -141,8 +141,8 @@
effectDescriptorFromHal(halDescriptor, &descriptor);
Result retval(Result::OK);
if (status != OK) {
- ALOGE("Error querying effect descriptor for %s: %s",
- uuidToString(halUuid).c_str(), strerror(-status));
+ ALOGE("Error querying effect descriptor for %s: %s", uuidToString(halUuid).c_str(),
+ strerror(-status));
if (status == -ENOENT) {
retval = Result::INVALID_ARGUMENTS;
} else {
@@ -153,8 +153,8 @@
return Void();
}
-Return<void> EffectsFactory::createEffect(
- const Uuid& uid, int32_t session, int32_t ioHandle, createEffect_cb _hidl_cb) {
+Return<void> EffectsFactory::createEffect(const Uuid& uid, int32_t session, int32_t ioHandle,
+ createEffect_cb _hidl_cb) {
effect_uuid_t halUuid;
HidlUtils::uuidToHal(uid, &halUuid);
effect_handle_t handle;
@@ -170,8 +170,8 @@
effect = dispatchEffectInstanceCreation(halDescriptor, handle);
effectId = EffectMap::getInstance().add(handle);
} else {
- ALOGE("Error querying effect descriptor for %s: %s",
- uuidToString(halUuid).c_str(), strerror(-status));
+ ALOGE("Error querying effect descriptor for %s: %s", uuidToString(halUuid).c_str(),
+ strerror(-status));
EffectRelease(handle);
}
}
@@ -187,19 +187,18 @@
return Void();
}
-Return<void> EffectsFactory::debugDump(const hidl_handle& fd) {
+Return<void> EffectsFactory::debugDump(const hidl_handle& fd) {
if (fd.getNativeHandle() != nullptr && fd->numFds == 1) {
EffectDumpEffects(fd->data[0]);
}
return Void();
}
-
IEffectsFactory* HIDL_FETCH_IEffectsFactory(const char* /* name */) {
return new EffectsFactory();
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/EffectsFactory.h b/audio/effect/2.0/default/EffectsFactory.h
index 829a534..34bdb40 100644
--- a/audio/effect/2.0/default/EffectsFactory.h
+++ b/audio/effect/2.0/default/EffectsFactory.h
@@ -43,15 +43,15 @@
struct EffectsFactory : public IEffectsFactory {
// Methods from ::android::hardware::audio::effect::V2_0::IEffectsFactory follow.
- Return<void> getAllDescriptors(getAllDescriptors_cb _hidl_cb) override;
- Return<void> getDescriptor(const Uuid& uid, getDescriptor_cb _hidl_cb) override;
- Return<void> createEffect(
- const Uuid& uid, int32_t session, int32_t ioHandle, createEffect_cb _hidl_cb) override;
- Return<void> debugDump(const hidl_handle& fd) override;
+ Return<void> getAllDescriptors(getAllDescriptors_cb _hidl_cb) override;
+ Return<void> getDescriptor(const Uuid& uid, getDescriptor_cb _hidl_cb) override;
+ Return<void> createEffect(const Uuid& uid, int32_t session, int32_t ioHandle,
+ createEffect_cb _hidl_cb) override;
+ Return<void> debugDump(const hidl_handle& fd) override;
- private:
- static sp<IEffect> dispatchEffectInstanceCreation(
- const effect_descriptor_t& halDescriptor, effect_handle_t handle);
+ private:
+ static sp<IEffect> dispatchEffectInstanceCreation(const effect_descriptor_t& halDescriptor,
+ effect_handle_t handle);
};
extern "C" IEffectsFactory* HIDL_FETCH_IEffectsFactory(const char* name);
diff --git a/audio/effect/2.0/default/EnvironmentalReverbEffect.cpp b/audio/effect/2.0/default/EnvironmentalReverbEffect.cpp
index 86ff368..a10ad0e 100644
--- a/audio/effect/2.0/default/EnvironmentalReverbEffect.cpp
+++ b/audio/effect/2.0/default/EnvironmentalReverbEffect.cpp
@@ -27,14 +27,12 @@
namespace implementation {
EnvironmentalReverbEffect::EnvironmentalReverbEffect(effect_handle_t handle)
- : mEffect(new Effect(handle)) {
-}
+ : mEffect(new Effect(handle)) {}
EnvironmentalReverbEffect::~EnvironmentalReverbEffect() {}
void EnvironmentalReverbEffect::propertiesFromHal(
- const t_reverb_settings& halProperties,
- IEnvironmentalReverbEffect::AllProperties* properties) {
+ const t_reverb_settings& halProperties, IEnvironmentalReverbEffect::AllProperties* properties) {
properties->roomLevel = halProperties.roomLevel;
properties->roomHfLevel = halProperties.roomHFLevel;
properties->decayTime = halProperties.decayTime;
@@ -48,8 +46,7 @@
}
void EnvironmentalReverbEffect::propertiesToHal(
- const IEnvironmentalReverbEffect::AllProperties& properties,
- t_reverb_settings* halProperties) {
+ const IEnvironmentalReverbEffect::AllProperties& properties, t_reverb_settings* halProperties) {
halProperties->roomLevel = properties.roomLevel;
halProperties->roomHFLevel = properties.roomHfLevel;
halProperties->decayTime = properties.decayTime;
@@ -68,9 +65,8 @@
}
Return<Result> EnvironmentalReverbEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -90,13 +86,13 @@
return mEffect->setDevice(device);
}
-Return<void> EnvironmentalReverbEffect::setAndGetVolume(
- const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
+ setAndGetVolume_cb _hidl_cb) {
return mEffect->setAndGetVolume(volumes, _hidl_cb);
}
Return<Result> EnvironmentalReverbEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+ const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -105,9 +101,8 @@
}
Return<Result> EnvironmentalReverbEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -124,7 +119,7 @@
}
Return<void> EnvironmentalReverbEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -133,7 +128,7 @@
}
Return<Result> EnvironmentalReverbEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+ const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -149,53 +144,44 @@
return mEffect->getDescriptor(_hidl_cb);
}
-Return<void> EnvironmentalReverbEffect::prepareForProcessing(
- prepareForProcessing_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
return mEffect->prepareForProcessing(_hidl_cb);
}
-Return<Result> EnvironmentalReverbEffect::setProcessBuffers(
- const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {
+Return<Result> EnvironmentalReverbEffect::setProcessBuffers(const AudioBuffer& inBuffer,
+ const AudioBuffer& outBuffer) {
return mEffect->setProcessBuffers(inBuffer, outBuffer);
}
-Return<void> EnvironmentalReverbEffect::command(
- uint32_t commandId,
- const hidl_vec<uint8_t>& data,
- uint32_t resultMaxSize,
- command_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::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> EnvironmentalReverbEffect::setParameter(
- const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {
+Return<Result> EnvironmentalReverbEffect::setParameter(const hidl_vec<uint8_t>& parameter,
+ const hidl_vec<uint8_t>& value) {
return mEffect->setParameter(parameter, value);
}
-Return<void> EnvironmentalReverbEffect::getParameter(
- const hidl_vec<uint8_t>& parameter,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getParameter(const hidl_vec<uint8_t>& parameter,
+ uint32_t valueMaxSize,
+ getParameter_cb _hidl_cb) {
return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);
}
Return<void> EnvironmentalReverbEffect::getSupportedConfigsForFeature(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ getSupportedConfigsForFeature_cb _hidl_cb) {
return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);
}
Return<void> EnvironmentalReverbEffect::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);
}
Return<Result> EnvironmentalReverbEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+ uint32_t featureId, const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -204,67 +190,67 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::IEnvironmentalReverbEffect follow.
-Return<Result> EnvironmentalReverbEffect::setBypass(bool bypass) {
+Return<Result> EnvironmentalReverbEffect::setBypass(bool bypass) {
return mEffect->setParam(REVERB_PARAM_BYPASS, bypass);
}
-Return<void> EnvironmentalReverbEffect::getBypass(getBypass_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getBypass(getBypass_cb _hidl_cb) {
return mEffect->getIntegerParam(REVERB_PARAM_BYPASS, _hidl_cb);
}
-Return<Result> EnvironmentalReverbEffect::setRoomLevel(int16_t roomLevel) {
+Return<Result> EnvironmentalReverbEffect::setRoomLevel(int16_t roomLevel) {
return mEffect->setParam(REVERB_PARAM_ROOM_LEVEL, roomLevel);
}
-Return<void> EnvironmentalReverbEffect::getRoomLevel(getRoomLevel_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getRoomLevel(getRoomLevel_cb _hidl_cb) {
return mEffect->getIntegerParam(REVERB_PARAM_ROOM_LEVEL, _hidl_cb);
}
-Return<Result> EnvironmentalReverbEffect::setRoomHfLevel(int16_t roomHfLevel) {
+Return<Result> EnvironmentalReverbEffect::setRoomHfLevel(int16_t roomHfLevel) {
return mEffect->setParam(REVERB_PARAM_ROOM_HF_LEVEL, roomHfLevel);
}
-Return<void> EnvironmentalReverbEffect::getRoomHfLevel(getRoomHfLevel_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getRoomHfLevel(getRoomHfLevel_cb _hidl_cb) {
return mEffect->getIntegerParam(REVERB_PARAM_ROOM_HF_LEVEL, _hidl_cb);
}
-Return<Result> EnvironmentalReverbEffect::setDecayTime(uint32_t decayTime) {
+Return<Result> EnvironmentalReverbEffect::setDecayTime(uint32_t decayTime) {
return mEffect->setParam(REVERB_PARAM_DECAY_TIME, decayTime);
}
-Return<void> EnvironmentalReverbEffect::getDecayTime(getDecayTime_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getDecayTime(getDecayTime_cb _hidl_cb) {
return mEffect->getIntegerParam(REVERB_PARAM_DECAY_TIME, _hidl_cb);
}
-Return<Result> EnvironmentalReverbEffect::setDecayHfRatio(int16_t decayHfRatio) {
+Return<Result> EnvironmentalReverbEffect::setDecayHfRatio(int16_t decayHfRatio) {
return mEffect->setParam(REVERB_PARAM_DECAY_HF_RATIO, decayHfRatio);
}
-Return<void> EnvironmentalReverbEffect::getDecayHfRatio(getDecayHfRatio_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getDecayHfRatio(getDecayHfRatio_cb _hidl_cb) {
return mEffect->getIntegerParam(REVERB_PARAM_DECAY_HF_RATIO, _hidl_cb);
}
-Return<Result> EnvironmentalReverbEffect::setReflectionsLevel(int16_t reflectionsLevel) {
+Return<Result> EnvironmentalReverbEffect::setReflectionsLevel(int16_t reflectionsLevel) {
return mEffect->setParam(REVERB_PARAM_REFLECTIONS_LEVEL, reflectionsLevel);
}
-Return<void> EnvironmentalReverbEffect::getReflectionsLevel(getReflectionsLevel_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getReflectionsLevel(getReflectionsLevel_cb _hidl_cb) {
return mEffect->getIntegerParam(REVERB_PARAM_REFLECTIONS_LEVEL, _hidl_cb);
}
-Return<Result> EnvironmentalReverbEffect::setReflectionsDelay(uint32_t reflectionsDelay) {
+Return<Result> EnvironmentalReverbEffect::setReflectionsDelay(uint32_t reflectionsDelay) {
return mEffect->setParam(REVERB_PARAM_REFLECTIONS_DELAY, reflectionsDelay);
}
-Return<void> EnvironmentalReverbEffect::getReflectionsDelay(getReflectionsDelay_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getReflectionsDelay(getReflectionsDelay_cb _hidl_cb) {
return mEffect->getIntegerParam(REVERB_PARAM_REFLECTIONS_DELAY, _hidl_cb);
}
-Return<Result> EnvironmentalReverbEffect::setReverbLevel(int16_t reverbLevel) {
+Return<Result> EnvironmentalReverbEffect::setReverbLevel(int16_t reverbLevel) {
return mEffect->setParam(REVERB_PARAM_REVERB_LEVEL, reverbLevel);
}
-Return<void> EnvironmentalReverbEffect::getReverbLevel(getReverbLevel_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getReverbLevel(getReverbLevel_cb _hidl_cb) {
return mEffect->getIntegerParam(REVERB_PARAM_REVERB_LEVEL, _hidl_cb);
}
@@ -276,30 +262,30 @@
return mEffect->getIntegerParam(REVERB_PARAM_REVERB_DELAY, _hidl_cb);
}
-Return<Result> EnvironmentalReverbEffect::setDiffusion(int16_t diffusion) {
+Return<Result> EnvironmentalReverbEffect::setDiffusion(int16_t diffusion) {
return mEffect->setParam(REVERB_PARAM_DIFFUSION, diffusion);
}
-Return<void> EnvironmentalReverbEffect::getDiffusion(getDiffusion_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getDiffusion(getDiffusion_cb _hidl_cb) {
return mEffect->getIntegerParam(REVERB_PARAM_DIFFUSION, _hidl_cb);
}
-Return<Result> EnvironmentalReverbEffect::setDensity(int16_t density) {
+Return<Result> EnvironmentalReverbEffect::setDensity(int16_t density) {
return mEffect->setParam(REVERB_PARAM_DENSITY, density);
}
-Return<void> EnvironmentalReverbEffect::getDensity(getDensity_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getDensity(getDensity_cb _hidl_cb) {
return mEffect->getIntegerParam(REVERB_PARAM_DENSITY, _hidl_cb);
}
Return<Result> EnvironmentalReverbEffect::setAllProperties(
- const IEnvironmentalReverbEffect::AllProperties& properties) {
+ const IEnvironmentalReverbEffect::AllProperties& properties) {
t_reverb_settings halProperties;
propertiesToHal(properties, &halProperties);
return mEffect->setParam(REVERB_PARAM_PROPERTIES, halProperties);
}
-Return<void> EnvironmentalReverbEffect::getAllProperties(getAllProperties_cb _hidl_cb) {
+Return<void> EnvironmentalReverbEffect::getAllProperties(getAllProperties_cb _hidl_cb) {
t_reverb_settings halProperties;
Result retval = mEffect->getParam(REVERB_PARAM_PROPERTIES, halProperties);
AllProperties properties;
@@ -308,7 +294,7 @@
return Void();
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/EnvironmentalReverbEffect.h b/audio/effect/2.0/default/EnvironmentalReverbEffect.h
index 794caac..a0ae546 100644
--- a/audio/effect/2.0/default/EnvironmentalReverbEffect.h
+++ b/audio/effect/2.0/default/EnvironmentalReverbEffect.h
@@ -55,98 +55,85 @@
explicit EnvironmentalReverbEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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::IEnvironmentalReverbEffect follow.
- Return<Result> setBypass(bool bypass) override;
- Return<void> getBypass(getBypass_cb _hidl_cb) override;
- Return<Result> setRoomLevel(int16_t roomLevel) override;
- Return<void> getRoomLevel(getRoomLevel_cb _hidl_cb) override;
- Return<Result> setRoomHfLevel(int16_t roomHfLevel) override;
- Return<void> getRoomHfLevel(getRoomHfLevel_cb _hidl_cb) override;
- Return<Result> setDecayTime(uint32_t decayTime) override;
- Return<void> getDecayTime(getDecayTime_cb _hidl_cb) override;
- Return<Result> setDecayHfRatio(int16_t decayHfRatio) override;
- Return<void> getDecayHfRatio(getDecayHfRatio_cb _hidl_cb) override;
- Return<Result> setReflectionsLevel(int16_t reflectionsLevel) override;
- Return<void> getReflectionsLevel(getReflectionsLevel_cb _hidl_cb) override;
- Return<Result> setReflectionsDelay(uint32_t reflectionsDelay) override;
- Return<void> getReflectionsDelay(getReflectionsDelay_cb _hidl_cb) override;
- Return<Result> setReverbLevel(int16_t reverbLevel) override;
- Return<void> getReverbLevel(getReverbLevel_cb _hidl_cb) override;
- Return<Result> setReverbDelay(uint32_t reverbDelay) override;
- Return<void> getReverbDelay(getReverbDelay_cb _hidl_cb) override;
- Return<Result> setDiffusion(int16_t diffusion) override;
- Return<void> getDiffusion(getDiffusion_cb _hidl_cb) override;
- Return<Result> setDensity(int16_t density) override;
- Return<void> getDensity(getDensity_cb _hidl_cb) override;
+ Return<Result> setBypass(bool bypass) override;
+ Return<void> getBypass(getBypass_cb _hidl_cb) override;
+ Return<Result> setRoomLevel(int16_t roomLevel) override;
+ Return<void> getRoomLevel(getRoomLevel_cb _hidl_cb) override;
+ Return<Result> setRoomHfLevel(int16_t roomHfLevel) override;
+ Return<void> getRoomHfLevel(getRoomHfLevel_cb _hidl_cb) override;
+ Return<Result> setDecayTime(uint32_t decayTime) override;
+ Return<void> getDecayTime(getDecayTime_cb _hidl_cb) override;
+ Return<Result> setDecayHfRatio(int16_t decayHfRatio) override;
+ Return<void> getDecayHfRatio(getDecayHfRatio_cb _hidl_cb) override;
+ Return<Result> setReflectionsLevel(int16_t reflectionsLevel) override;
+ Return<void> getReflectionsLevel(getReflectionsLevel_cb _hidl_cb) override;
+ Return<Result> setReflectionsDelay(uint32_t reflectionsDelay) override;
+ Return<void> getReflectionsDelay(getReflectionsDelay_cb _hidl_cb) override;
+ Return<Result> setReverbLevel(int16_t reverbLevel) override;
+ Return<void> getReverbLevel(getReverbLevel_cb _hidl_cb) override;
+ Return<Result> setReverbDelay(uint32_t reverbDelay) override;
+ Return<void> getReverbDelay(getReverbDelay_cb _hidl_cb) override;
+ Return<Result> setDiffusion(int16_t diffusion) override;
+ Return<void> getDiffusion(getDiffusion_cb _hidl_cb) override;
+ Return<Result> setDensity(int16_t density) override;
+ Return<void> getDensity(getDensity_cb _hidl_cb) override;
Return<Result> setAllProperties(
- const IEnvironmentalReverbEffect::AllProperties& properties) override;
- Return<void> getAllProperties(getAllProperties_cb _hidl_cb) override;
+ const IEnvironmentalReverbEffect::AllProperties& properties) override;
+ Return<void> getAllProperties(getAllProperties_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
virtual ~EnvironmentalReverbEffect();
- void propertiesFromHal(
- const t_reverb_settings& halProperties,
- IEnvironmentalReverbEffect::AllProperties* properties);
- void propertiesToHal(
- const IEnvironmentalReverbEffect::AllProperties& properties,
- t_reverb_settings* halProperties);
+ void propertiesFromHal(const t_reverb_settings& halProperties,
+ IEnvironmentalReverbEffect::AllProperties* properties);
+ void propertiesToHal(const IEnvironmentalReverbEffect::AllProperties& properties,
+ t_reverb_settings* halProperties);
};
} // namespace implementation
diff --git a/audio/effect/2.0/default/EqualizerEffect.cpp b/audio/effect/2.0/default/EqualizerEffect.cpp
index 808d8eb..d587c93 100644
--- a/audio/effect/2.0/default/EqualizerEffect.cpp
+++ b/audio/effect/2.0/default/EqualizerEffect.cpp
@@ -28,27 +28,23 @@
namespace V2_0 {
namespace implementation {
-EqualizerEffect::EqualizerEffect(effect_handle_t handle)
- : mEffect(new Effect(handle)) {
-}
+EqualizerEffect::EqualizerEffect(effect_handle_t handle) : mEffect(new Effect(handle)) {}
EqualizerEffect::~EqualizerEffect() {}
-void EqualizerEffect::propertiesFromHal(
- const t_equalizer_settings& halProperties,
- IEqualizerEffect::AllProperties* properties) {
+void EqualizerEffect::propertiesFromHal(const t_equalizer_settings& halProperties,
+ IEqualizerEffect::AllProperties* properties) {
properties->curPreset = halProperties.curPreset;
// t_equalizer_settings incorrectly defines bandLevels as uint16_t,
// whereas the actual type of values used by effects is int16_t.
const int16_t* signedBandLevels =
- reinterpret_cast<const int16_t*>(&halProperties.bandLevels[0]);
- properties->bandLevels.setToExternal(
- const_cast<int16_t*>(signedBandLevels), halProperties.numBands);
+ reinterpret_cast<const int16_t*>(&halProperties.bandLevels[0]);
+ properties->bandLevels.setToExternal(const_cast<int16_t*>(signedBandLevels),
+ halProperties.numBands);
}
std::vector<uint8_t> EqualizerEffect::propertiesToHal(
- const IEqualizerEffect::AllProperties& properties,
- t_equalizer_settings** halProperties) {
+ const IEqualizerEffect::AllProperties& properties, t_equalizer_settings** halProperties) {
size_t bandsSize = properties.bandLevels.size() * sizeof(uint16_t);
std::vector<uint8_t> halBuffer(sizeof(t_equalizer_settings) + bandsSize, 0);
*halProperties = reinterpret_cast<t_equalizer_settings*>(&halBuffer[0]);
@@ -64,9 +60,8 @@
}
Return<Result> EqualizerEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -86,13 +81,12 @@
return mEffect->setDevice(device);
}
-Return<void> EqualizerEffect::setAndGetVolume(
- const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {
+Return<void> EqualizerEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
+ setAndGetVolume_cb _hidl_cb) {
return mEffect->setAndGetVolume(volumes, _hidl_cb);
}
-Return<Result> EqualizerEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+Return<Result> EqualizerEffect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -101,9 +95,8 @@
}
Return<Result> EqualizerEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -120,7 +113,7 @@
}
Return<void> EqualizerEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -128,8 +121,7 @@
return mEffect->getAuxChannelsConfig(_hidl_cb);
}
-Return<Result> EqualizerEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+Return<Result> EqualizerEffect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -145,53 +137,43 @@
return mEffect->getDescriptor(_hidl_cb);
}
-Return<void> EqualizerEffect::prepareForProcessing(
- prepareForProcessing_cb _hidl_cb) {
+Return<void> EqualizerEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
return mEffect->prepareForProcessing(_hidl_cb);
}
-Return<Result> EqualizerEffect::setProcessBuffers(
- const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {
+Return<Result> EqualizerEffect::setProcessBuffers(const AudioBuffer& inBuffer,
+ const AudioBuffer& outBuffer) {
return mEffect->setProcessBuffers(inBuffer, outBuffer);
}
-Return<void> EqualizerEffect::command(
- uint32_t commandId,
- const hidl_vec<uint8_t>& data,
- uint32_t resultMaxSize,
- command_cb _hidl_cb) {
+Return<void> EqualizerEffect::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> EqualizerEffect::setParameter(
- const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {
+Return<Result> EqualizerEffect::setParameter(const hidl_vec<uint8_t>& parameter,
+ const hidl_vec<uint8_t>& value) {
return mEffect->setParameter(parameter, value);
}
-Return<void> EqualizerEffect::getParameter(
- const hidl_vec<uint8_t>& parameter,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+Return<void> EqualizerEffect::getParameter(const hidl_vec<uint8_t>& parameter,
+ uint32_t valueMaxSize, getParameter_cb _hidl_cb) {
return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);
}
Return<void> EqualizerEffect::getSupportedConfigsForFeature(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ getSupportedConfigsForFeature_cb _hidl_cb) {
return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);
}
-Return<void> EqualizerEffect::getCurrentConfigForFeature(
- uint32_t featureId,
- uint32_t configSize,
- getCurrentConfigForFeature_cb _hidl_cb) {
+Return<void> EqualizerEffect::getCurrentConfigForFeature(uint32_t featureId, uint32_t configSize,
+ getCurrentConfigForFeature_cb _hidl_cb) {
return mEffect->getCurrentConfigForFeature(featureId, configSize, _hidl_cb);
}
-Return<Result> EqualizerEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+Return<Result> EqualizerEffect::setCurrentConfigForFeature(uint32_t featureId,
+ const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -200,52 +182,52 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::IEqualizerEffect follow.
-Return<void> EqualizerEffect::getNumBands(getNumBands_cb _hidl_cb) {
+Return<void> EqualizerEffect::getNumBands(getNumBands_cb _hidl_cb) {
return mEffect->getIntegerParam(EQ_PARAM_NUM_BANDS, _hidl_cb);
}
-Return<void> EqualizerEffect::getLevelRange(getLevelRange_cb _hidl_cb) {
- int16_t halLevels[2] = { 0, 0 };
+Return<void> EqualizerEffect::getLevelRange(getLevelRange_cb _hidl_cb) {
+ int16_t halLevels[2] = {0, 0};
Result retval = mEffect->getParam(EQ_PARAM_LEVEL_RANGE, halLevels);
_hidl_cb(retval, halLevels[0], halLevels[1]);
return Void();
}
-Return<Result> EqualizerEffect::setBandLevel(uint16_t band, int16_t level) {
+Return<Result> EqualizerEffect::setBandLevel(uint16_t band, int16_t level) {
return mEffect->setParam(EQ_PARAM_BAND_LEVEL, band, level);
}
-Return<void> EqualizerEffect::getBandLevel(uint16_t band, getBandLevel_cb _hidl_cb) {
+Return<void> EqualizerEffect::getBandLevel(uint16_t band, getBandLevel_cb _hidl_cb) {
int16_t halLevel = 0;
Result retval = mEffect->getParam(EQ_PARAM_BAND_LEVEL, band, halLevel);
_hidl_cb(retval, halLevel);
return Void();
}
-Return<void> EqualizerEffect::getBandCenterFrequency(
- uint16_t band, getBandCenterFrequency_cb _hidl_cb) {
+Return<void> EqualizerEffect::getBandCenterFrequency(uint16_t band,
+ getBandCenterFrequency_cb _hidl_cb) {
uint32_t halFreq = 0;
Result retval = mEffect->getParam(EQ_PARAM_CENTER_FREQ, band, halFreq);
_hidl_cb(retval, halFreq);
return Void();
}
-Return<void> EqualizerEffect::getBandFrequencyRange(
- uint16_t band, getBandFrequencyRange_cb _hidl_cb) {
- uint32_t halFreqs[2] = { 0, 0 };
+Return<void> EqualizerEffect::getBandFrequencyRange(uint16_t band,
+ getBandFrequencyRange_cb _hidl_cb) {
+ uint32_t halFreqs[2] = {0, 0};
Result retval = mEffect->getParam(EQ_PARAM_BAND_FREQ_RANGE, band, halFreqs);
_hidl_cb(retval, halFreqs[0], halFreqs[1]);
return Void();
}
-Return<void> EqualizerEffect::getBandForFrequency(uint32_t freq, getBandForFrequency_cb _hidl_cb) {
+Return<void> EqualizerEffect::getBandForFrequency(uint32_t freq, getBandForFrequency_cb _hidl_cb) {
uint16_t halBand = 0;
Result retval = mEffect->getParam(EQ_PARAM_GET_BAND, freq, halBand);
_hidl_cb(retval, halBand);
return Void();
}
-Return<void> EqualizerEffect::getPresetNames(getPresetNames_cb _hidl_cb) {
+Return<void> EqualizerEffect::getPresetNames(getPresetNames_cb _hidl_cb) {
uint16_t halPresetCount = 0;
Result retval = mEffect->getParam(EQ_PARAM_GET_NUM_OF_PRESETS, halPresetCount);
hidl_vec<hidl_string> presetNames;
@@ -265,24 +247,23 @@
return Void();
}
-Return<Result> EqualizerEffect::setCurrentPreset(uint16_t preset) {
+Return<Result> EqualizerEffect::setCurrentPreset(uint16_t preset) {
return mEffect->setParam(EQ_PARAM_CUR_PRESET, preset);
}
-Return<void> EqualizerEffect::getCurrentPreset(getCurrentPreset_cb _hidl_cb) {
+Return<void> EqualizerEffect::getCurrentPreset(getCurrentPreset_cb _hidl_cb) {
return mEffect->getIntegerParam(EQ_PARAM_CUR_PRESET, _hidl_cb);
}
Return<Result> EqualizerEffect::setAllProperties(
- const IEqualizerEffect::AllProperties& properties) {
- t_equalizer_settings *halPropertiesPtr = nullptr;
+ const IEqualizerEffect::AllProperties& properties) {
+ t_equalizer_settings* halPropertiesPtr = nullptr;
std::vector<uint8_t> halBuffer = propertiesToHal(properties, &halPropertiesPtr);
uint32_t paramId = EQ_PARAM_PROPERTIES;
- return mEffect->setParameterImpl(
- sizeof(paramId), ¶mId, halBuffer.size(), halPropertiesPtr);
+ return mEffect->setParameterImpl(sizeof(paramId), ¶mId, halBuffer.size(), halPropertiesPtr);
}
-Return<void> EqualizerEffect::getAllProperties(getAllProperties_cb _hidl_cb) {
+Return<void> EqualizerEffect::getAllProperties(getAllProperties_cb _hidl_cb) {
uint16_t numBands = 0;
Result retval = mEffect->getParam(EQ_PARAM_NUM_BANDS, numBands);
AllProperties properties;
@@ -293,17 +274,16 @@
size_t valueSize = sizeof(t_equalizer_settings) + sizeof(int16_t) * numBands;
uint32_t paramId = EQ_PARAM_PROPERTIES;
retval = mEffect->getParameterImpl(
- sizeof(paramId), ¶mId, valueSize,
- [&] (uint32_t, const void* valueData) {
- const t_equalizer_settings* halProperties =
- reinterpret_cast<const t_equalizer_settings*>(valueData);
- propertiesFromHal(*halProperties, &properties);
- });
+ sizeof(paramId), ¶mId, valueSize, [&](uint32_t, const void* valueData) {
+ const t_equalizer_settings* halProperties =
+ reinterpret_cast<const t_equalizer_settings*>(valueData);
+ propertiesFromHal(*halProperties, &properties);
+ });
_hidl_cb(retval, properties);
return Void();
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/EqualizerEffect.h b/audio/effect/2.0/default/EqualizerEffect.h
index 9e8d75b..4f73f8e 100644
--- a/audio/effect/2.0/default/EqualizerEffect.h
+++ b/audio/effect/2.0/default/EqualizerEffect.h
@@ -57,86 +57,72 @@
explicit EqualizerEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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::IEqualizerEffect follow.
- Return<void> getNumBands(getNumBands_cb _hidl_cb) override;
- Return<void> getLevelRange(getLevelRange_cb _hidl_cb) override;
- Return<Result> setBandLevel(uint16_t band, int16_t level) override;
- Return<void> getBandLevel(uint16_t band, getBandLevel_cb _hidl_cb) override;
- Return<void> getBandCenterFrequency(
- uint16_t band, getBandCenterFrequency_cb _hidl_cb) override;
- Return<void> getBandFrequencyRange(uint16_t band, getBandFrequencyRange_cb _hidl_cb) override;
- Return<void> getBandForFrequency(uint32_t freq, getBandForFrequency_cb _hidl_cb) override;
- Return<void> getPresetNames(getPresetNames_cb _hidl_cb) override;
- Return<Result> setCurrentPreset(uint16_t preset) override;
- Return<void> getCurrentPreset(getCurrentPreset_cb _hidl_cb) override;
- Return<Result> setAllProperties(const IEqualizerEffect::AllProperties& properties) override;
- Return<void> getAllProperties(getAllProperties_cb _hidl_cb) override;
+ Return<void> getNumBands(getNumBands_cb _hidl_cb) override;
+ Return<void> getLevelRange(getLevelRange_cb _hidl_cb) override;
+ Return<Result> setBandLevel(uint16_t band, int16_t level) override;
+ Return<void> getBandLevel(uint16_t band, getBandLevel_cb _hidl_cb) override;
+ Return<void> getBandCenterFrequency(uint16_t band, getBandCenterFrequency_cb _hidl_cb) override;
+ Return<void> getBandFrequencyRange(uint16_t band, getBandFrequencyRange_cb _hidl_cb) override;
+ Return<void> getBandForFrequency(uint32_t freq, getBandForFrequency_cb _hidl_cb) override;
+ Return<void> getPresetNames(getPresetNames_cb _hidl_cb) override;
+ Return<Result> setCurrentPreset(uint16_t preset) override;
+ Return<void> getCurrentPreset(getCurrentPreset_cb _hidl_cb) override;
+ Return<Result> setAllProperties(const IEqualizerEffect::AllProperties& properties) override;
+ Return<void> getAllProperties(getAllProperties_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
virtual ~EqualizerEffect();
- void propertiesFromHal(
- const t_equalizer_settings& halProperties,
- IEqualizerEffect::AllProperties* properties);
- std::vector<uint8_t> propertiesToHal(
- const IEqualizerEffect::AllProperties& properties,
- t_equalizer_settings** halProperties);
+ void propertiesFromHal(const t_equalizer_settings& halProperties,
+ IEqualizerEffect::AllProperties* properties);
+ std::vector<uint8_t> propertiesToHal(const IEqualizerEffect::AllProperties& properties,
+ t_equalizer_settings** halProperties);
};
} // namespace implementation
diff --git a/audio/effect/2.0/default/LoudnessEnhancerEffect.cpp b/audio/effect/2.0/default/LoudnessEnhancerEffect.cpp
index fda5eb0..7c25579 100644
--- a/audio/effect/2.0/default/LoudnessEnhancerEffect.cpp
+++ b/audio/effect/2.0/default/LoudnessEnhancerEffect.cpp
@@ -17,8 +17,8 @@
#include <system/audio_effects/effect_loudnessenhancer.h>
#define LOG_TAG "LoudnessEnhancer_HAL"
-#include <system/audio_effects/effect_aec.h>
#include <android/log.h>
+#include <system/audio_effects/effect_aec.h>
#include "LoudnessEnhancerEffect.h"
@@ -30,8 +30,7 @@
namespace implementation {
LoudnessEnhancerEffect::LoudnessEnhancerEffect(effect_handle_t handle)
- : mEffect(new Effect(handle)) {
-}
+ : mEffect(new Effect(handle)) {}
LoudnessEnhancerEffect::~LoudnessEnhancerEffect() {}
@@ -41,9 +40,8 @@
}
Return<Result> LoudnessEnhancerEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -63,13 +61,12 @@
return mEffect->setDevice(device);
}
-Return<void> LoudnessEnhancerEffect::setAndGetVolume(
- const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {
+Return<void> LoudnessEnhancerEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
+ setAndGetVolume_cb _hidl_cb) {
return mEffect->setAndGetVolume(volumes, _hidl_cb);
}
-Return<Result> LoudnessEnhancerEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+Return<Result> LoudnessEnhancerEffect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -78,9 +75,8 @@
}
Return<Result> LoudnessEnhancerEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -97,7 +93,7 @@
}
Return<void> LoudnessEnhancerEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -105,8 +101,7 @@
return mEffect->getAuxChannelsConfig(_hidl_cb);
}
-Return<Result> LoudnessEnhancerEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+Return<Result> LoudnessEnhancerEffect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -122,53 +117,43 @@
return mEffect->getDescriptor(_hidl_cb);
}
-Return<void> LoudnessEnhancerEffect::prepareForProcessing(
- prepareForProcessing_cb _hidl_cb) {
+Return<void> LoudnessEnhancerEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
return mEffect->prepareForProcessing(_hidl_cb);
}
-Return<Result> LoudnessEnhancerEffect::setProcessBuffers(
- const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {
+Return<Result> LoudnessEnhancerEffect::setProcessBuffers(const AudioBuffer& inBuffer,
+ const AudioBuffer& outBuffer) {
return mEffect->setProcessBuffers(inBuffer, outBuffer);
}
-Return<void> LoudnessEnhancerEffect::command(
- uint32_t commandId,
- const hidl_vec<uint8_t>& data,
- uint32_t resultMaxSize,
- command_cb _hidl_cb) {
+Return<void> LoudnessEnhancerEffect::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> LoudnessEnhancerEffect::setParameter(
- const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {
+Return<Result> LoudnessEnhancerEffect::setParameter(const hidl_vec<uint8_t>& parameter,
+ const hidl_vec<uint8_t>& value) {
return mEffect->setParameter(parameter, value);
}
-Return<void> LoudnessEnhancerEffect::getParameter(
- const hidl_vec<uint8_t>& parameter,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+Return<void> LoudnessEnhancerEffect::getParameter(const hidl_vec<uint8_t>& parameter,
+ uint32_t valueMaxSize, getParameter_cb _hidl_cb) {
return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);
}
Return<void> LoudnessEnhancerEffect::getSupportedConfigsForFeature(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ getSupportedConfigsForFeature_cb _hidl_cb) {
return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);
}
Return<void> LoudnessEnhancerEffect::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);
}
Return<Result> LoudnessEnhancerEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+ uint32_t featureId, const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -177,26 +162,24 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::ILoudnessEnhancerEffect follow.
-Return<Result> LoudnessEnhancerEffect::setTargetGain(int32_t targetGainMb) {
+Return<Result> LoudnessEnhancerEffect::setTargetGain(int32_t targetGainMb) {
return mEffect->setParam(LOUDNESS_ENHANCER_DEFAULT_TARGET_GAIN_MB, targetGainMb);
}
-Return<void> LoudnessEnhancerEffect::getTargetGain(getTargetGain_cb _hidl_cb) {
+Return<void> LoudnessEnhancerEffect::getTargetGain(getTargetGain_cb _hidl_cb) {
// AOSP Loudness Enhancer expects the size of the request to not include the
// size of the parameter.
uint32_t paramId = LOUDNESS_ENHANCER_DEFAULT_TARGET_GAIN_MB;
uint32_t targetGainMb = 0;
Result retval = mEffect->getParameterImpl(
- sizeof(paramId), ¶mId,
- 0, sizeof(targetGainMb),
- [&] (uint32_t, const void* valueData) {
- memcpy(&targetGainMb, valueData, sizeof(targetGainMb));
- });
+ sizeof(paramId), ¶mId, 0, sizeof(targetGainMb), [&](uint32_t, const void* valueData) {
+ memcpy(&targetGainMb, valueData, sizeof(targetGainMb));
+ });
_hidl_cb(retval, targetGainMb);
return Void();
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/LoudnessEnhancerEffect.h b/audio/effect/2.0/default/LoudnessEnhancerEffect.h
index 039b8d6..73d45e3 100644
--- a/audio/effect/2.0/default/LoudnessEnhancerEffect.h
+++ b/audio/effect/2.0/default/LoudnessEnhancerEffect.h
@@ -53,65 +53,54 @@
explicit LoudnessEnhancerEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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::ILoudnessEnhancerEffect follow.
- Return<Result> setTargetGain(int32_t targetGainMb) override;
- Return<void> getTargetGain(getTargetGain_cb _hidl_cb) override;
+ Return<Result> setTargetGain(int32_t targetGainMb) override;
+ Return<void> getTargetGain(getTargetGain_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
virtual ~LoudnessEnhancerEffect();
diff --git a/audio/effect/2.0/default/NoiseSuppressionEffect.cpp b/audio/effect/2.0/default/NoiseSuppressionEffect.cpp
index 7c4e06d..fe30421 100644
--- a/audio/effect/2.0/default/NoiseSuppressionEffect.cpp
+++ b/audio/effect/2.0/default/NoiseSuppressionEffect.cpp
@@ -27,21 +27,18 @@
namespace implementation {
NoiseSuppressionEffect::NoiseSuppressionEffect(effect_handle_t handle)
- : mEffect(new Effect(handle)) {
-}
+ : mEffect(new Effect(handle)) {}
NoiseSuppressionEffect::~NoiseSuppressionEffect() {}
-void NoiseSuppressionEffect::propertiesFromHal(
- const t_ns_settings& halProperties,
- INoiseSuppressionEffect::AllProperties* properties) {
+void NoiseSuppressionEffect::propertiesFromHal(const t_ns_settings& halProperties,
+ INoiseSuppressionEffect::AllProperties* properties) {
properties->level = Level(halProperties.level);
properties->type = Type(halProperties.type);
}
void NoiseSuppressionEffect::propertiesToHal(
- const INoiseSuppressionEffect::AllProperties& properties,
- t_ns_settings* halProperties) {
+ const INoiseSuppressionEffect::AllProperties& properties, t_ns_settings* halProperties) {
halProperties->level = static_cast<uint32_t>(properties.level);
halProperties->type = static_cast<uint32_t>(properties.type);
}
@@ -52,9 +49,8 @@
}
Return<Result> NoiseSuppressionEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -74,13 +70,12 @@
return mEffect->setDevice(device);
}
-Return<void> NoiseSuppressionEffect::setAndGetVolume(
- const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {
+Return<void> NoiseSuppressionEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
+ setAndGetVolume_cb _hidl_cb) {
return mEffect->setAndGetVolume(volumes, _hidl_cb);
}
-Return<Result> NoiseSuppressionEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+Return<Result> NoiseSuppressionEffect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -89,9 +84,8 @@
}
Return<Result> NoiseSuppressionEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -108,7 +102,7 @@
}
Return<void> NoiseSuppressionEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -116,8 +110,7 @@
return mEffect->getAuxChannelsConfig(_hidl_cb);
}
-Return<Result> NoiseSuppressionEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+Return<Result> NoiseSuppressionEffect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -133,53 +126,43 @@
return mEffect->getDescriptor(_hidl_cb);
}
-Return<void> NoiseSuppressionEffect::prepareForProcessing(
- prepareForProcessing_cb _hidl_cb) {
+Return<void> NoiseSuppressionEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
return mEffect->prepareForProcessing(_hidl_cb);
}
-Return<Result> NoiseSuppressionEffect::setProcessBuffers(
- const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {
+Return<Result> NoiseSuppressionEffect::setProcessBuffers(const AudioBuffer& inBuffer,
+ const AudioBuffer& outBuffer) {
return mEffect->setProcessBuffers(inBuffer, outBuffer);
}
-Return<void> NoiseSuppressionEffect::command(
- uint32_t commandId,
- const hidl_vec<uint8_t>& data,
- uint32_t resultMaxSize,
- command_cb _hidl_cb) {
+Return<void> NoiseSuppressionEffect::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> NoiseSuppressionEffect::setParameter(
- const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {
+Return<Result> NoiseSuppressionEffect::setParameter(const hidl_vec<uint8_t>& parameter,
+ const hidl_vec<uint8_t>& value) {
return mEffect->setParameter(parameter, value);
}
-Return<void> NoiseSuppressionEffect::getParameter(
- const hidl_vec<uint8_t>& parameter,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+Return<void> NoiseSuppressionEffect::getParameter(const hidl_vec<uint8_t>& parameter,
+ uint32_t valueMaxSize, getParameter_cb _hidl_cb) {
return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);
}
Return<void> NoiseSuppressionEffect::getSupportedConfigsForFeature(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ getSupportedConfigsForFeature_cb _hidl_cb) {
return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);
}
Return<void> NoiseSuppressionEffect::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);
}
Return<Result> NoiseSuppressionEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+ uint32_t featureId, const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -188,22 +171,22 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::INoiseSuppressionEffect follow.
-Return<Result> NoiseSuppressionEffect::setSuppressionLevel(INoiseSuppressionEffect::Level level) {
+Return<Result> NoiseSuppressionEffect::setSuppressionLevel(INoiseSuppressionEffect::Level level) {
return mEffect->setParam(NS_PARAM_LEVEL, static_cast<int32_t>(level));
}
-Return<void> NoiseSuppressionEffect::getSuppressionLevel(getSuppressionLevel_cb _hidl_cb) {
+Return<void> NoiseSuppressionEffect::getSuppressionLevel(getSuppressionLevel_cb _hidl_cb) {
int32_t halLevel = 0;
Result retval = mEffect->getParam(NS_PARAM_LEVEL, halLevel);
_hidl_cb(retval, Level(halLevel));
return Void();
}
-Return<Result> NoiseSuppressionEffect::setSuppressionType(INoiseSuppressionEffect::Type type) {
+Return<Result> NoiseSuppressionEffect::setSuppressionType(INoiseSuppressionEffect::Type type) {
return mEffect->setParam(NS_PARAM_TYPE, static_cast<int32_t>(type));
}
-Return<void> NoiseSuppressionEffect::getSuppressionType(getSuppressionType_cb _hidl_cb) {
+Return<void> NoiseSuppressionEffect::getSuppressionType(getSuppressionType_cb _hidl_cb) {
int32_t halType = 0;
Result retval = mEffect->getParam(NS_PARAM_TYPE, halType);
_hidl_cb(retval, Type(halType));
@@ -211,13 +194,13 @@
}
Return<Result> NoiseSuppressionEffect::setAllProperties(
- const INoiseSuppressionEffect::AllProperties& properties) {
+ const INoiseSuppressionEffect::AllProperties& properties) {
t_ns_settings halProperties;
propertiesToHal(properties, &halProperties);
return mEffect->setParam(NS_PARAM_PROPERTIES, halProperties);
}
-Return<void> NoiseSuppressionEffect::getAllProperties(getAllProperties_cb _hidl_cb) {
+Return<void> NoiseSuppressionEffect::getAllProperties(getAllProperties_cb _hidl_cb) {
t_ns_settings halProperties;
Result retval = mEffect->getParam(NS_PARAM_PROPERTIES, halProperties);
AllProperties properties;
@@ -226,7 +209,7 @@
return Void();
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/NoiseSuppressionEffect.h b/audio/effect/2.0/default/NoiseSuppressionEffect.h
index 5491201..d833441 100644
--- a/audio/effect/2.0/default/NoiseSuppressionEffect.h
+++ b/audio/effect/2.0/default/NoiseSuppressionEffect.h
@@ -55,80 +55,67 @@
explicit NoiseSuppressionEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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::INoiseSuppressionEffect follow.
- Return<Result> setSuppressionLevel(INoiseSuppressionEffect::Level level) override;
- Return<void> getSuppressionLevel(getSuppressionLevel_cb _hidl_cb) override;
- Return<Result> setSuppressionType(INoiseSuppressionEffect::Type type) override;
- Return<void> getSuppressionType(getSuppressionType_cb _hidl_cb) override;
+ Return<Result> setSuppressionLevel(INoiseSuppressionEffect::Level level) override;
+ Return<void> getSuppressionLevel(getSuppressionLevel_cb _hidl_cb) override;
+ Return<Result> setSuppressionType(INoiseSuppressionEffect::Type type) override;
+ Return<void> getSuppressionType(getSuppressionType_cb _hidl_cb) override;
Return<Result> setAllProperties(
- const INoiseSuppressionEffect::AllProperties& properties) override;
- Return<void> getAllProperties(getAllProperties_cb _hidl_cb) override;
+ const INoiseSuppressionEffect::AllProperties& properties) override;
+ Return<void> getAllProperties(getAllProperties_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
virtual ~NoiseSuppressionEffect();
- void propertiesFromHal(
- const t_ns_settings& halProperties,
- INoiseSuppressionEffect::AllProperties* properties);
- void propertiesToHal(
- const INoiseSuppressionEffect::AllProperties& properties,
- t_ns_settings* halProperties);
+ void propertiesFromHal(const t_ns_settings& halProperties,
+ INoiseSuppressionEffect::AllProperties* properties);
+ void propertiesToHal(const INoiseSuppressionEffect::AllProperties& properties,
+ t_ns_settings* halProperties);
};
} // namespace implementation
diff --git a/audio/effect/2.0/default/PresetReverbEffect.cpp b/audio/effect/2.0/default/PresetReverbEffect.cpp
index 5f17791..4f1ccd3 100644
--- a/audio/effect/2.0/default/PresetReverbEffect.cpp
+++ b/audio/effect/2.0/default/PresetReverbEffect.cpp
@@ -15,8 +15,8 @@
*/
#define LOG_TAG "PresetReverb_HAL"
-#include <system/audio_effects/effect_presetreverb.h>
#include <android/log.h>
+#include <system/audio_effects/effect_presetreverb.h>
#include "PresetReverbEffect.h"
@@ -27,9 +27,7 @@
namespace V2_0 {
namespace implementation {
-PresetReverbEffect::PresetReverbEffect(effect_handle_t handle)
- : mEffect(new Effect(handle)) {
-}
+PresetReverbEffect::PresetReverbEffect(effect_handle_t handle) : mEffect(new Effect(handle)) {}
PresetReverbEffect::~PresetReverbEffect() {}
@@ -39,9 +37,8 @@
}
Return<Result> PresetReverbEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -61,13 +58,12 @@
return mEffect->setDevice(device);
}
-Return<void> PresetReverbEffect::setAndGetVolume(
- const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {
+Return<void> PresetReverbEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
+ setAndGetVolume_cb _hidl_cb) {
return mEffect->setAndGetVolume(volumes, _hidl_cb);
}
-Return<Result> PresetReverbEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+Return<Result> PresetReverbEffect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -76,9 +72,8 @@
}
Return<Result> PresetReverbEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -95,7 +90,7 @@
}
Return<void> PresetReverbEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -103,8 +98,7 @@
return mEffect->getAuxChannelsConfig(_hidl_cb);
}
-Return<Result> PresetReverbEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+Return<Result> PresetReverbEffect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -120,53 +114,43 @@
return mEffect->getDescriptor(_hidl_cb);
}
-Return<void> PresetReverbEffect::prepareForProcessing(
- prepareForProcessing_cb _hidl_cb) {
+Return<void> PresetReverbEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
return mEffect->prepareForProcessing(_hidl_cb);
}
-Return<Result> PresetReverbEffect::setProcessBuffers(
- const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {
+Return<Result> PresetReverbEffect::setProcessBuffers(const AudioBuffer& inBuffer,
+ const AudioBuffer& outBuffer) {
return mEffect->setProcessBuffers(inBuffer, outBuffer);
}
-Return<void> PresetReverbEffect::command(
- uint32_t commandId,
- const hidl_vec<uint8_t>& data,
- uint32_t resultMaxSize,
- command_cb _hidl_cb) {
+Return<void> PresetReverbEffect::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> PresetReverbEffect::setParameter(
- const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {
+Return<Result> PresetReverbEffect::setParameter(const hidl_vec<uint8_t>& parameter,
+ const hidl_vec<uint8_t>& value) {
return mEffect->setParameter(parameter, value);
}
-Return<void> PresetReverbEffect::getParameter(
- const hidl_vec<uint8_t>& parameter,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+Return<void> PresetReverbEffect::getParameter(const hidl_vec<uint8_t>& parameter,
+ uint32_t valueMaxSize, getParameter_cb _hidl_cb) {
return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);
}
Return<void> PresetReverbEffect::getSupportedConfigsForFeature(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ getSupportedConfigsForFeature_cb _hidl_cb) {
return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);
}
Return<void> PresetReverbEffect::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);
}
-Return<Result> PresetReverbEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+Return<Result> PresetReverbEffect::setCurrentConfigForFeature(uint32_t featureId,
+ const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -175,18 +159,18 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::IPresetReverbEffect follow.
-Return<Result> PresetReverbEffect::setPreset(IPresetReverbEffect::Preset preset) {
+Return<Result> PresetReverbEffect::setPreset(IPresetReverbEffect::Preset preset) {
return mEffect->setParam(REVERB_PARAM_PRESET, static_cast<t_reverb_presets>(preset));
}
-Return<void> PresetReverbEffect::getPreset(getPreset_cb _hidl_cb) {
+Return<void> PresetReverbEffect::getPreset(getPreset_cb _hidl_cb) {
t_reverb_presets halPreset = REVERB_PRESET_NONE;
Result retval = mEffect->getParam(REVERB_PARAM_PRESET, halPreset);
_hidl_cb(retval, Preset(halPreset));
return Void();
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/PresetReverbEffect.h b/audio/effect/2.0/default/PresetReverbEffect.h
index 4eb074a..fc83651 100644
--- a/audio/effect/2.0/default/PresetReverbEffect.h
+++ b/audio/effect/2.0/default/PresetReverbEffect.h
@@ -53,65 +53,54 @@
explicit PresetReverbEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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::IPresetReverbEffect follow.
- Return<Result> setPreset(IPresetReverbEffect::Preset preset) override;
- Return<void> getPreset(getPreset_cb _hidl_cb) override;
+ Return<Result> setPreset(IPresetReverbEffect::Preset preset) override;
+ Return<void> getPreset(getPreset_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
virtual ~PresetReverbEffect();
diff --git a/audio/effect/2.0/default/VirtualizerEffect.cpp b/audio/effect/2.0/default/VirtualizerEffect.cpp
index c1fe52f..bb96855 100644
--- a/audio/effect/2.0/default/VirtualizerEffect.cpp
+++ b/audio/effect/2.0/default/VirtualizerEffect.cpp
@@ -17,8 +17,8 @@
#include <memory.h>
#define LOG_TAG "Virtualizer_HAL"
-#include <system/audio_effects/effect_virtualizer.h>
#include <android/log.h>
+#include <system/audio_effects/effect_virtualizer.h>
#include "VirtualizerEffect.h"
@@ -29,14 +29,12 @@
namespace V2_0 {
namespace implementation {
-VirtualizerEffect::VirtualizerEffect(effect_handle_t handle)
- : mEffect(new Effect(handle)) {
-}
+VirtualizerEffect::VirtualizerEffect(effect_handle_t handle) : mEffect(new Effect(handle)) {}
VirtualizerEffect::~VirtualizerEffect() {}
-void VirtualizerEffect::speakerAnglesFromHal(
- const int32_t* halAngles, uint32_t channelCount, hidl_vec<SpeakerAngle>& speakerAngles) {
+void VirtualizerEffect::speakerAnglesFromHal(const int32_t* halAngles, uint32_t channelCount,
+ hidl_vec<SpeakerAngle>& speakerAngles) {
speakerAngles.resize(channelCount);
for (uint32_t i = 0; i < channelCount; ++i) {
speakerAngles[i].mask = AudioChannelMask(*halAngles++);
@@ -51,9 +49,8 @@
}
Return<Result> VirtualizerEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -73,13 +70,12 @@
return mEffect->setDevice(device);
}
-Return<void> VirtualizerEffect::setAndGetVolume(
- const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {
+Return<void> VirtualizerEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
+ setAndGetVolume_cb _hidl_cb) {
return mEffect->setAndGetVolume(volumes, _hidl_cb);
}
-Return<Result> VirtualizerEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+Return<Result> VirtualizerEffect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -88,9 +84,8 @@
}
Return<Result> VirtualizerEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -107,7 +102,7 @@
}
Return<void> VirtualizerEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -115,8 +110,7 @@
return mEffect->getAuxChannelsConfig(_hidl_cb);
}
-Return<Result> VirtualizerEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+Return<Result> VirtualizerEffect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -132,53 +126,43 @@
return mEffect->getDescriptor(_hidl_cb);
}
-Return<void> VirtualizerEffect::prepareForProcessing(
- prepareForProcessing_cb _hidl_cb) {
+Return<void> VirtualizerEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
return mEffect->prepareForProcessing(_hidl_cb);
}
-Return<Result> VirtualizerEffect::setProcessBuffers(
- const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {
+Return<Result> VirtualizerEffect::setProcessBuffers(const AudioBuffer& inBuffer,
+ const AudioBuffer& outBuffer) {
return mEffect->setProcessBuffers(inBuffer, outBuffer);
}
-Return<void> VirtualizerEffect::command(
- uint32_t commandId,
- const hidl_vec<uint8_t>& data,
- uint32_t resultMaxSize,
- command_cb _hidl_cb) {
+Return<void> VirtualizerEffect::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> VirtualizerEffect::setParameter(
- const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {
+Return<Result> VirtualizerEffect::setParameter(const hidl_vec<uint8_t>& parameter,
+ const hidl_vec<uint8_t>& value) {
return mEffect->setParameter(parameter, value);
}
-Return<void> VirtualizerEffect::getParameter(
- const hidl_vec<uint8_t>& parameter,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+Return<void> VirtualizerEffect::getParameter(const hidl_vec<uint8_t>& parameter,
+ uint32_t valueMaxSize, getParameter_cb _hidl_cb) {
return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);
}
Return<void> VirtualizerEffect::getSupportedConfigsForFeature(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ getSupportedConfigsForFeature_cb _hidl_cb) {
return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);
}
-Return<void> VirtualizerEffect::getCurrentConfigForFeature(
- uint32_t featureId,
- uint32_t configSize,
- getCurrentConfigForFeature_cb _hidl_cb) {
+Return<void> VirtualizerEffect::getCurrentConfigForFeature(uint32_t featureId, uint32_t configSize,
+ getCurrentConfigForFeature_cb _hidl_cb) {
return mEffect->getCurrentConfigForFeature(featureId, configSize, _hidl_cb);
}
-Return<Result> VirtualizerEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+Return<Result> VirtualizerEffect::setCurrentConfigForFeature(uint32_t featureId,
+ const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -187,60 +171,57 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::IVirtualizerEffect follow.
-Return<bool> VirtualizerEffect::isStrengthSupported() {
+Return<bool> VirtualizerEffect::isStrengthSupported() {
bool halSupported = false;
mEffect->getParam(VIRTUALIZER_PARAM_STRENGTH_SUPPORTED, halSupported);
return halSupported;
}
-Return<Result> VirtualizerEffect::setStrength(uint16_t strength) {
+Return<Result> VirtualizerEffect::setStrength(uint16_t strength) {
return mEffect->setParam(VIRTUALIZER_PARAM_STRENGTH, strength);
}
-Return<void> VirtualizerEffect::getStrength(getStrength_cb _hidl_cb) {
+Return<void> VirtualizerEffect::getStrength(getStrength_cb _hidl_cb) {
return mEffect->getIntegerParam(VIRTUALIZER_PARAM_STRENGTH, _hidl_cb);
}
-Return<void> VirtualizerEffect::getVirtualSpeakerAngles(
- AudioChannelMask mask, AudioDevice device, getVirtualSpeakerAngles_cb _hidl_cb) {
- uint32_t channelCount = audio_channel_count_from_out_mask(
- static_cast<audio_channel_mask_t>(mask));
+Return<void> VirtualizerEffect::getVirtualSpeakerAngles(AudioChannelMask mask, AudioDevice device,
+ getVirtualSpeakerAngles_cb _hidl_cb) {
+ uint32_t channelCount =
+ audio_channel_count_from_out_mask(static_cast<audio_channel_mask_t>(mask));
size_t halSpeakerAnglesSize = sizeof(int32_t) * 3 * channelCount;
- uint32_t halParam[3] = {
- VIRTUALIZER_PARAM_VIRTUAL_SPEAKER_ANGLES,
- static_cast<audio_channel_mask_t>(mask),
- static_cast<audio_devices_t>(device)
- };
+ uint32_t halParam[3] = {VIRTUALIZER_PARAM_VIRTUAL_SPEAKER_ANGLES,
+ static_cast<audio_channel_mask_t>(mask),
+ static_cast<audio_devices_t>(device)};
hidl_vec<SpeakerAngle> speakerAngles;
Result retval = mEffect->getParameterImpl(
- sizeof(halParam), halParam,
- halSpeakerAnglesSize,
- [&] (uint32_t valueSize, const void* valueData) {
- if (valueSize > halSpeakerAnglesSize) {
- valueSize = halSpeakerAnglesSize;
- } else if (valueSize < halSpeakerAnglesSize) {
- channelCount = valueSize / (sizeof(int32_t) * 3);
- }
- speakerAnglesFromHal(
- reinterpret_cast<const int32_t*>(valueData), channelCount, speakerAngles);
- });
+ sizeof(halParam), halParam, halSpeakerAnglesSize,
+ [&](uint32_t valueSize, const void* valueData) {
+ if (valueSize > halSpeakerAnglesSize) {
+ valueSize = halSpeakerAnglesSize;
+ } else if (valueSize < halSpeakerAnglesSize) {
+ channelCount = valueSize / (sizeof(int32_t) * 3);
+ }
+ speakerAnglesFromHal(reinterpret_cast<const int32_t*>(valueData), channelCount,
+ speakerAngles);
+ });
_hidl_cb(retval, speakerAngles);
return Void();
}
-Return<Result> VirtualizerEffect::forceVirtualizationMode(AudioDevice device) {
- return mEffect->setParam(
- VIRTUALIZER_PARAM_FORCE_VIRTUALIZATION_MODE, static_cast<audio_devices_t>(device));
+Return<Result> VirtualizerEffect::forceVirtualizationMode(AudioDevice device) {
+ return mEffect->setParam(VIRTUALIZER_PARAM_FORCE_VIRTUALIZATION_MODE,
+ static_cast<audio_devices_t>(device));
}
-Return<void> VirtualizerEffect::getVirtualizationMode(getVirtualizationMode_cb _hidl_cb) {
+Return<void> VirtualizerEffect::getVirtualizationMode(getVirtualizationMode_cb _hidl_cb) {
uint32_t halMode = 0;
Result retval = mEffect->getParam(VIRTUALIZER_PARAM_FORCE_VIRTUALIZATION_MODE, halMode);
_hidl_cb(retval, AudioDevice(halMode));
return Void();
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/VirtualizerEffect.h b/audio/effect/2.0/default/VirtualizerEffect.h
index 536775f..911ceca 100644
--- a/audio/effect/2.0/default/VirtualizerEffect.h
+++ b/audio/effect/2.0/default/VirtualizerEffect.h
@@ -54,78 +54,65 @@
explicit VirtualizerEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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::IVirtualizerEffect follow.
- Return<bool> isStrengthSupported() override;
- Return<Result> setStrength(uint16_t strength) override;
- Return<void> getStrength(getStrength_cb _hidl_cb) override;
- Return<void> getVirtualSpeakerAngles(
- AudioChannelMask mask,
- AudioDevice device,
- getVirtualSpeakerAngles_cb _hidl_cb) override;
- Return<Result> forceVirtualizationMode(AudioDevice device) override;
- Return<void> getVirtualizationMode(getVirtualizationMode_cb _hidl_cb) override;
+ Return<bool> isStrengthSupported() override;
+ Return<Result> setStrength(uint16_t strength) override;
+ Return<void> getStrength(getStrength_cb _hidl_cb) override;
+ Return<void> getVirtualSpeakerAngles(AudioChannelMask mask, AudioDevice device,
+ getVirtualSpeakerAngles_cb _hidl_cb) override;
+ Return<Result> forceVirtualizationMode(AudioDevice device) override;
+ Return<void> getVirtualizationMode(getVirtualizationMode_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
virtual ~VirtualizerEffect();
- void speakerAnglesFromHal(
- const int32_t* halAngles, uint32_t channelCount, hidl_vec<SpeakerAngle>& speakerAngles);
+ void speakerAnglesFromHal(const int32_t* halAngles, uint32_t channelCount,
+ hidl_vec<SpeakerAngle>& speakerAngles);
};
} // namespace implementation
diff --git a/audio/effect/2.0/default/VisualizerEffect.cpp b/audio/effect/2.0/default/VisualizerEffect.cpp
index 2cd3240..bac3a03 100644
--- a/audio/effect/2.0/default/VisualizerEffect.cpp
+++ b/audio/effect/2.0/default/VisualizerEffect.cpp
@@ -15,8 +15,8 @@
*/
#define LOG_TAG "Visualizer_HAL"
-#include <system/audio_effects/effect_visualizer.h>
#include <android/log.h>
+#include <system/audio_effects/effect_visualizer.h>
#include "VisualizerEffect.h"
@@ -28,8 +28,7 @@
namespace implementation {
VisualizerEffect::VisualizerEffect(effect_handle_t handle)
- : mEffect(new Effect(handle)), mCaptureSize(0), mMeasurementMode(MeasurementMode::NONE) {
-}
+ : mEffect(new Effect(handle)), mCaptureSize(0), mMeasurementMode(MeasurementMode::NONE) {}
VisualizerEffect::~VisualizerEffect() {}
@@ -39,9 +38,8 @@
}
Return<Result> VisualizerEffect::setConfig(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfig(config, inputBufferProvider, outputBufferProvider);
}
@@ -61,13 +59,12 @@
return mEffect->setDevice(device);
}
-Return<void> VisualizerEffect::setAndGetVolume(
- const hidl_vec<uint32_t>& volumes, setAndGetVolume_cb _hidl_cb) {
+Return<void> VisualizerEffect::setAndGetVolume(const hidl_vec<uint32_t>& volumes,
+ setAndGetVolume_cb _hidl_cb) {
return mEffect->setAndGetVolume(volumes, _hidl_cb);
}
-Return<Result> VisualizerEffect::volumeChangeNotification(
- const hidl_vec<uint32_t>& volumes) {
+Return<Result> VisualizerEffect::volumeChangeNotification(const hidl_vec<uint32_t>& volumes) {
return mEffect->volumeChangeNotification(volumes);
}
@@ -76,9 +73,8 @@
}
Return<Result> VisualizerEffect::setConfigReverse(
- const EffectConfig& config,
- const sp<IEffectBufferProviderCallback>& inputBufferProvider,
- const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
+ const EffectConfig& config, const sp<IEffectBufferProviderCallback>& inputBufferProvider,
+ const sp<IEffectBufferProviderCallback>& outputBufferProvider) {
return mEffect->setConfigReverse(config, inputBufferProvider, outputBufferProvider);
}
@@ -95,7 +91,7 @@
}
Return<void> VisualizerEffect::getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) {
return mEffect->getSupportedAuxChannelsConfigs(maxConfigs, _hidl_cb);
}
@@ -103,8 +99,7 @@
return mEffect->getAuxChannelsConfig(_hidl_cb);
}
-Return<Result> VisualizerEffect::setAuxChannelsConfig(
- const EffectAuxChannelsConfig& config) {
+Return<Result> VisualizerEffect::setAuxChannelsConfig(const EffectAuxChannelsConfig& config) {
return mEffect->setAuxChannelsConfig(config);
}
@@ -120,53 +115,43 @@
return mEffect->getDescriptor(_hidl_cb);
}
-Return<void> VisualizerEffect::prepareForProcessing(
- prepareForProcessing_cb _hidl_cb) {
+Return<void> VisualizerEffect::prepareForProcessing(prepareForProcessing_cb _hidl_cb) {
return mEffect->prepareForProcessing(_hidl_cb);
}
-Return<Result> VisualizerEffect::setProcessBuffers(
- const AudioBuffer& inBuffer, const AudioBuffer& outBuffer) {
+Return<Result> VisualizerEffect::setProcessBuffers(const AudioBuffer& inBuffer,
+ const AudioBuffer& outBuffer) {
return mEffect->setProcessBuffers(inBuffer, outBuffer);
}
-Return<void> VisualizerEffect::command(
- uint32_t commandId,
- const hidl_vec<uint8_t>& data,
- uint32_t resultMaxSize,
- command_cb _hidl_cb) {
+Return<void> VisualizerEffect::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> VisualizerEffect::setParameter(
- const hidl_vec<uint8_t>& parameter, const hidl_vec<uint8_t>& value) {
+Return<Result> VisualizerEffect::setParameter(const hidl_vec<uint8_t>& parameter,
+ const hidl_vec<uint8_t>& value) {
return mEffect->setParameter(parameter, value);
}
-Return<void> VisualizerEffect::getParameter(
- const hidl_vec<uint8_t>& parameter,
- uint32_t valueMaxSize,
- getParameter_cb _hidl_cb) {
+Return<void> VisualizerEffect::getParameter(const hidl_vec<uint8_t>& parameter,
+ uint32_t valueMaxSize, getParameter_cb _hidl_cb) {
return mEffect->getParameter(parameter, valueMaxSize, _hidl_cb);
}
Return<void> VisualizerEffect::getSupportedConfigsForFeature(
- uint32_t featureId,
- uint32_t maxConfigs,
- uint32_t configSize,
- getSupportedConfigsForFeature_cb _hidl_cb) {
+ uint32_t featureId, uint32_t maxConfigs, uint32_t configSize,
+ getSupportedConfigsForFeature_cb _hidl_cb) {
return mEffect->getSupportedConfigsForFeature(featureId, maxConfigs, configSize, _hidl_cb);
}
-Return<void> VisualizerEffect::getCurrentConfigForFeature(
- uint32_t featureId,
- uint32_t configSize,
- getCurrentConfigForFeature_cb _hidl_cb) {
+Return<void> VisualizerEffect::getCurrentConfigForFeature(uint32_t featureId, uint32_t configSize,
+ getCurrentConfigForFeature_cb _hidl_cb) {
return mEffect->getCurrentConfigForFeature(featureId, configSize, _hidl_cb);
}
-Return<Result> VisualizerEffect::setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) {
+Return<Result> VisualizerEffect::setCurrentConfigForFeature(uint32_t featureId,
+ const hidl_vec<uint8_t>& configData) {
return mEffect->setCurrentConfigForFeature(featureId, configData);
}
@@ -175,7 +160,7 @@
}
// Methods from ::android::hardware::audio::effect::V2_0::IVisualizerEffect follow.
-Return<Result> VisualizerEffect::setCaptureSize(uint16_t captureSize) {
+Return<Result> VisualizerEffect::setCaptureSize(uint16_t captureSize) {
Result retval = mEffect->setParam(VISUALIZER_PARAM_CAPTURE_SIZE, captureSize);
if (retval == Result::OK) {
mCaptureSize = captureSize;
@@ -183,55 +168,55 @@
return retval;
}
-Return<void> VisualizerEffect::getCaptureSize(getCaptureSize_cb _hidl_cb) {
+Return<void> VisualizerEffect::getCaptureSize(getCaptureSize_cb _hidl_cb) {
return mEffect->getIntegerParam(VISUALIZER_PARAM_CAPTURE_SIZE, _hidl_cb);
}
-Return<Result> VisualizerEffect::setScalingMode(IVisualizerEffect::ScalingMode scalingMode) {
+Return<Result> VisualizerEffect::setScalingMode(IVisualizerEffect::ScalingMode scalingMode) {
return mEffect->setParam(VISUALIZER_PARAM_SCALING_MODE, static_cast<int32_t>(scalingMode));
}
-Return<void> VisualizerEffect::getScalingMode(getScalingMode_cb _hidl_cb) {
+Return<void> VisualizerEffect::getScalingMode(getScalingMode_cb _hidl_cb) {
int32_t halMode;
Result retval = mEffect->getParam(VISUALIZER_PARAM_SCALING_MODE, halMode);
_hidl_cb(retval, ScalingMode(halMode));
return Void();
}
-Return<Result> VisualizerEffect::setLatency(uint32_t latencyMs) {
+Return<Result> VisualizerEffect::setLatency(uint32_t latencyMs) {
return mEffect->setParam(VISUALIZER_PARAM_LATENCY, latencyMs);
}
-Return<void> VisualizerEffect::getLatency(getLatency_cb _hidl_cb) {
+Return<void> VisualizerEffect::getLatency(getLatency_cb _hidl_cb) {
return mEffect->getIntegerParam(VISUALIZER_PARAM_LATENCY, _hidl_cb);
}
Return<Result> VisualizerEffect::setMeasurementMode(
- IVisualizerEffect::MeasurementMode measurementMode) {
- Result retval = mEffect->setParam(
- VISUALIZER_PARAM_MEASUREMENT_MODE, static_cast<int32_t>(measurementMode));
+ IVisualizerEffect::MeasurementMode measurementMode) {
+ Result retval =
+ mEffect->setParam(VISUALIZER_PARAM_MEASUREMENT_MODE, static_cast<int32_t>(measurementMode));
if (retval == Result::OK) {
mMeasurementMode = measurementMode;
}
return retval;
}
-Return<void> VisualizerEffect::getMeasurementMode(getMeasurementMode_cb _hidl_cb) {
+Return<void> VisualizerEffect::getMeasurementMode(getMeasurementMode_cb _hidl_cb) {
int32_t halMode;
Result retval = mEffect->getParam(VISUALIZER_PARAM_MEASUREMENT_MODE, halMode);
_hidl_cb(retval, MeasurementMode(halMode));
return Void();
}
-Return<void> VisualizerEffect::capture(capture_cb _hidl_cb) {
+Return<void> VisualizerEffect::capture(capture_cb _hidl_cb) {
if (mCaptureSize == 0) {
_hidl_cb(Result::NOT_INITIALIZED, hidl_vec<uint8_t>());
return Void();
}
uint32_t halCaptureSize = mCaptureSize;
uint8_t halCapture[mCaptureSize];
- Result retval = mEffect->sendCommandReturningData(
- VISUALIZER_CMD_CAPTURE, "VISUALIZER_CAPTURE", &halCaptureSize, halCapture);
+ Result retval = mEffect->sendCommandReturningData(VISUALIZER_CMD_CAPTURE, "VISUALIZER_CAPTURE",
+ &halCaptureSize, halCapture);
hidl_vec<uint8_t> capture;
if (retval == Result::OK) {
capture.setToExternal(&halCapture[0], halCaptureSize);
@@ -240,16 +225,16 @@
return Void();
}
-Return<void> VisualizerEffect::measure(measure_cb _hidl_cb) {
+Return<void> VisualizerEffect::measure(measure_cb _hidl_cb) {
if (mMeasurementMode == MeasurementMode::NONE) {
_hidl_cb(Result::NOT_INITIALIZED, Measurement());
return Void();
}
int32_t halMeasurement[MEASUREMENT_COUNT];
uint32_t halMeasurementSize = sizeof(halMeasurement);
- Result retval = mEffect->sendCommandReturningData(
- VISUALIZER_CMD_MEASURE, "VISUALIZER_MEASURE", &halMeasurementSize, halMeasurement);
- Measurement measurement = { .mode = MeasurementMode::PEAK_RMS };
+ Result retval = mEffect->sendCommandReturningData(VISUALIZER_CMD_MEASURE, "VISUALIZER_MEASURE",
+ &halMeasurementSize, halMeasurement);
+ Measurement measurement = {.mode = MeasurementMode::PEAK_RMS};
measurement.value.peakAndRms.peakMb = 0;
measurement.value.peakAndRms.rmsMb = 0;
if (retval == Result::OK) {
@@ -260,7 +245,7 @@
return Void();
}
-} // namespace implementation
+} // namespace implementation
} // namespace V2_0
} // namespace effect
} // namespace audio
diff --git a/audio/effect/2.0/default/VisualizerEffect.h b/audio/effect/2.0/default/VisualizerEffect.h
index fd40ca8..58a3dbf 100644
--- a/audio/effect/2.0/default/VisualizerEffect.h
+++ b/audio/effect/2.0/default/VisualizerEffect.h
@@ -53,73 +53,62 @@
explicit VisualizerEffect(effect_handle_t handle);
// Methods from ::android::hardware::audio::effect::V2_0::IEffect follow.
- Return<Result> init() override;
+ Return<Result> init() override;
Return<Result> setConfig(
- 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<Result> volumeChangeNotification(const hidl_vec<uint32_t>& volumes) override;
- Return<Result> setAudioMode(AudioMode mode) override;
+ 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<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 sp<IEffectBufferProviderCallback>& outputBufferProvider) override;
- Return<Result> setInputDevice(AudioDevice device) override;
- Return<void> getConfig(getConfig_cb _hidl_cb) override;
- Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
+ 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;
+ Return<void> getConfigReverse(getConfigReverse_cb _hidl_cb) override;
Return<void> getSupportedAuxChannelsConfigs(
- uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
- Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
- Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
- Return<Result> setAudioSource(AudioSource source) override;
- 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,
- 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,
- getParameter_cb _hidl_cb) override;
- 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,
- getCurrentConfigForFeature_cb _hidl_cb) override;
- Return<Result> setCurrentConfigForFeature(
- uint32_t featureId, const hidl_vec<uint8_t>& configData) override;
- Return<Result> close() override;
+ uint32_t maxConfigs, getSupportedAuxChannelsConfigs_cb _hidl_cb) override;
+ Return<void> getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) override;
+ Return<Result> setAuxChannelsConfig(const EffectAuxChannelsConfig& config) override;
+ Return<Result> setAudioSource(AudioSource source) override;
+ 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,
+ 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,
+ getParameter_cb _hidl_cb) override;
+ 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,
+ getCurrentConfigForFeature_cb _hidl_cb) 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::IVisualizerEffect follow.
- Return<Result> setCaptureSize(uint16_t captureSize) override;
- Return<void> getCaptureSize(getCaptureSize_cb _hidl_cb) override;
- Return<Result> setScalingMode(IVisualizerEffect::ScalingMode scalingMode) override;
- Return<void> getScalingMode(getScalingMode_cb _hidl_cb) override;
- Return<Result> setLatency(uint32_t latencyMs) override;
- Return<void> getLatency(getLatency_cb _hidl_cb) override;
- Return<Result> setMeasurementMode(IVisualizerEffect::MeasurementMode measurementMode) override;
- Return<void> getMeasurementMode(getMeasurementMode_cb _hidl_cb) override;
- Return<void> capture(capture_cb _hidl_cb) override;
- Return<void> measure(measure_cb _hidl_cb) override;
+ Return<Result> setCaptureSize(uint16_t captureSize) override;
+ Return<void> getCaptureSize(getCaptureSize_cb _hidl_cb) override;
+ Return<Result> setScalingMode(IVisualizerEffect::ScalingMode scalingMode) override;
+ Return<void> getScalingMode(getScalingMode_cb _hidl_cb) override;
+ Return<Result> setLatency(uint32_t latencyMs) override;
+ Return<void> getLatency(getLatency_cb _hidl_cb) override;
+ Return<Result> setMeasurementMode(IVisualizerEffect::MeasurementMode measurementMode) override;
+ Return<void> getMeasurementMode(getMeasurementMode_cb _hidl_cb) override;
+ Return<void> capture(capture_cb _hidl_cb) override;
+ Return<void> measure(measure_cb _hidl_cb) override;
- private:
+ private:
sp<Effect> mEffect;
uint16_t mCaptureSize;
MeasurementMode mMeasurementMode;