diff options
author | Ricardo Garcia <rago@google.com> | 2014-12-16 17:27:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 17:27:40 +0000 |
commit | d11d1be13a6391290fb1dbc572292973dae59909 (patch) | |
tree | 049146db61c1de50e6b1d91d87ec51543e8ede72 /media/libeffects/lvm/wrapper/Bundle/EffectBundle.h | |
parent | 045513fc55cd500225071c11b06e1f4bb133681f (diff) | |
parent | 7ebc167072be27f42b7c58bd7f9378c8311533ab (diff) | |
download | frameworks_av-d11d1be13a6391290fb1dbc572292973dae59909.zip frameworks_av-d11d1be13a6391290fb1dbc572292973dae59909.tar.gz frameworks_av-d11d1be13a6391290fb1dbc572292973dae59909.tar.bz2 |
am 7ebc1670: am 8975220e: Merge "Fix for Bundled Effects level compensation" into lmp-mr1-dev
* commit '7ebc167072be27f42b7c58bd7f9378c8311533ab':
Fix for Bundled Effects level compensation
Diffstat (limited to 'media/libeffects/lvm/wrapper/Bundle/EffectBundle.h')
-rw-r--r-- | media/libeffects/lvm/wrapper/Bundle/EffectBundle.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h index 420f973..b3071f4 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.h @@ -142,6 +142,7 @@ static const uint32_t bandFreqRange[FIVEBAND_NUMBANDS][2] = { {1800001, 7000000}, {7000001, 1}}; +//Note: If these frequencies change, please update LimitLevel values accordingly. static const LVM_UINT16 EQNB_5BandPresetsFrequencies[] = { 60, /* Frequencies in Hz */ 230, @@ -192,6 +193,20 @@ static const PresetConfig gEqualizerPresets[] = { {"Pop"}, {"Rock"}}; +/* The following tables have been computed using the actual levels measured by the output of + * white noise or pink noise (IEC268-1) for the EQ and BassBoost Effects. These are estimates of + * the actual energy that 'could' be present in the given band. + * If the frequency values in EQNB_5BandPresetsFrequencies change, these values might need to be + * updated. + */ + +static const float LimitLevel_bandEnergyContribution[FIVEBAND_NUMBANDS] = { + 5.0, 6.5, 6.45, 4.8, 1.7 }; + +static const float LimitLevel_bassBoostEnergyContribution = 6.7; + +static const float LimitLevel_virtualizerContribution = 1.9; + #if __cplusplus } // extern "C" #endif |