summaryrefslogtreecommitdiffstats
path: root/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h
diff options
context:
space:
mode:
authorRicardo Garcia <rago@google.com>2015-05-21 19:55:31 -0700
committerRicardo Garcia <rago@google.com>2015-05-22 09:58:07 -0700
commit7f0e16e391b0bd243005cc1049d3b6799f0692ec (patch)
tree40b05b33af85672992eacb83f7da7bfc04a605e9 /media/libeffects/lvm/wrapper/Bundle/EffectBundle.h
parent70b2313318aaf245d185b6ddb188606608bdf7c9 (diff)
downloadframeworks_av-7f0e16e391b0bd243005cc1049d3b6799f0692ec.zip
frameworks_av-7f0e16e391b0bd243005cc1049d3b6799f0692ec.tar.gz
frameworks_av-7f0e16e391b0bd243005cc1049d3b6799f0692ec.tar.bz2
Level adjustment for Bundled Effect Fix
Fixed automatic level compensation for bundled effects. Fixed algorithm now works even in corner cases previously reported. Cross band coefficients and cross interaction of BassBoost fixed. bug: 18769691 Change-Id: I51570836bdbff37e7c4b26f2b4282e4ded7fa56d
Diffstat (limited to 'media/libeffects/lvm/wrapper/Bundle/EffectBundle.h')
-rw-r--r--media/libeffects/lvm/wrapper/Bundle/EffectBundle.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h
index b3071f4..9459b87 100644
--- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h
+++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h
@@ -200,10 +200,16 @@ static const PresetConfig gEqualizerPresets[] = {
* updated.
*/
-static const float LimitLevel_bandEnergyContribution[FIVEBAND_NUMBANDS] = {
- 5.0, 6.5, 6.45, 4.8, 1.7 };
+static const float LimitLevel_bandEnergyCoefficient[FIVEBAND_NUMBANDS] = {
+ 7.56, 9.69, 9.59, 7.37, 2.88};
-static const float LimitLevel_bassBoostEnergyContribution = 6.7;
+static const float LimitLevel_bandEnergyCrossCoefficient[FIVEBAND_NUMBANDS-1] = {
+ 126.0, 115.0, 125.0, 104.0 };
+
+static const float LimitLevel_bassBoostEnergyCrossCoefficient[FIVEBAND_NUMBANDS] = {
+ 221.21, 208.10, 28.16, 0.0, 0.0 };
+
+static const float LimitLevel_bassBoostEnergyCoefficient = 7.12;
static const float LimitLevel_virtualizerContribution = 1.9;