summaryrefslogtreecommitdiffstats
path: root/audio/effect/2.0/default/VirtualizerEffect.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'audio/effect/2.0/default/VirtualizerEffect.cpp')
-rw-r--r--audio/effect/2.0/default/VirtualizerEffect.cpp125
1 files changed, 53 insertions, 72 deletions
diff --git a/audio/effect/2.0/default/VirtualizerEffect.cpp b/audio/effect/2.0/default/VirtualizerEffect.cpp
index c1fe52fbe..bb96855be 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 effect {
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::init() {
}
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<Result> VirtualizerEffect::setDevice(AudioDevice device) {
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::setAudioMode(AudioMode mode) {
}
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::getConfigReverse(getConfigReverse_cb _hidl_cb) {
}
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<void> VirtualizerEffect::getAuxChannelsConfig(getAuxChannelsConfig_cb _hi
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<void> VirtualizerEffect::getDescriptor(getDescriptor_cb _hidl_cb) {
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 @@ Return<Result> VirtualizerEffect::close() {
}
// 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
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-06 12:14:31 +0000