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/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