From 6cc3a9948b51193dfdcb0c3527d7f3d1ca38aa3c Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Tue, 10 Sep 2013 09:15:18 -0700 Subject: LoudnessEnhancer audio effect implementation Implementation based on DRC effect, controlled by a target gain. The target gain is used to amplify the signal at the input of the DRC, and to compute the knee of the DRC. Bug 8413913 Change-Id: I386d64793a9fa3f7218e053d6f0a99f6836c02bd --- .../dsp/core/dynamic_range_compression-inl.h | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h (limited to 'media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h') diff --git a/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h b/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h new file mode 100644 index 0000000..fed8c2a --- /dev/null +++ b/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef LE_FX_ENGINE_DSP_CORE_DYNAMIC_RANGE_COMPRESSION_INL_H_ +#define LE_FX_ENGINE_DSP_CORE_DYNAMIC_RANGE_COMPRESSION_INL_H_ + +//#define LOG_NDEBUG 0 +#include + + +namespace le_fx { + + +inline void AdaptiveDynamicRangeCompression::set_knee_threshold(float decibel) { + // Converts to 1og-base + knee_threshold_in_decibel_ = decibel; + knee_threshold_ = 0.1151292546497023061569109358970308676362037658691406250f * + decibel + 10.39717719035538401328722102334722876548767089843750f; +} + + +inline void AdaptiveDynamicRangeCompression::set_knee_threshold_via_target_gain( + float target_gain) { + const float decibel = target_gain_to_knee_threshold_.Interpolate( + target_gain); + ALOGE("set_knee_threshold_via_target_gain: decibel =%.3f", decibel); + set_knee_threshold(decibel); +} + +} // namespace le_fx + + +#endif // LE_FX_ENGINE_DSP_CORE_DYNAMIC_RANGE_COMPRESSION_INL_H_ -- cgit v1.1 From cd0c4683947231a7d3dc7811bedb75c5a965103c Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Wed, 25 Sep 2013 18:43:55 -0700 Subject: LoudnessEnhancer compatible with stereo imaging Use a single compressor for both channels. Envelope of signal is determined by looking at both channels. Bug 8413913 Change-Id: Ia9b6f34923d2977c60a3352500b858dfa1fab33c --- media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h') diff --git a/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h b/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h index fed8c2a..da75ceb 100644 --- a/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h +++ b/media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h @@ -35,7 +35,7 @@ inline void AdaptiveDynamicRangeCompression::set_knee_threshold_via_target_gain( float target_gain) { const float decibel = target_gain_to_knee_threshold_.Interpolate( target_gain); - ALOGE("set_knee_threshold_via_target_gain: decibel =%.3f", decibel); + ALOGV("set_knee_threshold_via_target_gain: decibel =%.3fdB", decibel); set_knee_threshold(decibel); } -- cgit v1.1