From 7f0e16e391b0bd243005cc1049d3b6799f0692ec Mon Sep 17 00:00:00 2001 From: Ricardo Garcia Date: Thu, 21 May 2015 19:55:31 -0700 Subject: 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 --- media/libeffects/lvm/wrapper/Bundle/EffectBundle.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'media/libeffects/lvm/wrapper/Bundle/EffectBundle.h') 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; -- cgit v1.1