Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-09 17:07:43 +02:00
Code Issues Releases Wiki Activity

Steve's patch for better headroom control + a few more comments

Browse Source
This commit is contained in:
martynshaw99 2013-05-02 22:39:43 +00:00
parent 1ddee72498
commit 829b6839db
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/effects/BassTreble.cpp
View File

@ -36,7 +36,6 @@
#include <wx/slider.h> #include <wx/slider.h>
#include <wx/sizer.h> #include <wx/sizer.h>
// Used to communicate the type of the filter. // Used to communicate the type of the filter.
static const int bassType = 0; //Low Shelf static const int bassType = 0; //Low Shelf
static const int trebleType = 1; // High Shelf static const int trebleType = 1; // High Shelf
@ -117,13 +116,24 @@ bool EffectBassTreble::InitPass1()
{ {
mMax=0.0; mMax=0.0;
// Allow headroom for integer format samples // Integer format tracks require headroom to avoid clipping
mPreGain = (dB_treble > 0)? (1.4 * dB_treble) : fabs(dB_treble); // when saved between passes (bug 619)
if (dB_bass > 0)
mPreGain = (mPreGain > (1.4 * dB_bass))? mPreGain : (1.4 * dB_bass); if (mbNormalize) // don't need to calculate this if only doing one pass.
else {
mPreGain = (mPreGain > fabs(dB_bass))? mPreGain : fabs(dB_bass); // Up to (gain + 6dB) headroom required for treble boost (experimental).
mPreGain = (mbNormalize)? (exp(log(10.0) * mPreGain / 20)) : 1.0; mPreGain = (dB_treble > 0)? (dB_treble + 6.0) : 0.0;
if (dB_bass >= 0)
{
mPreGain = (mPreGain > dB_bass)? mPreGain : dB_bass;
} else {
// Up to 6 dB headroom reaquired for bass cut (experimental)
mPreGain = (mPreGain > 6.0)? mPreGain : 6.0;
}
mPreGain = (exp (log(10.0) * mPreGain / 20)); // to linear
} else {
mPreGain = 1.0; // Unity gain
}
if (!mbNormalize) if (!mbNormalize)
DisableSecondPass(); DisableSecondPass();
@ -248,13 +258,15 @@ float EffectBassTreble::DoFilter(float in)
#define ID_NORMALIZE 10007 #define ID_NORMALIZE 10007
// Declare ranges // Declare ranges
// Sliders are integer, so range is x 10
// to allow 1 decimal place resolution
#define BASS_MIN -150 #define BASS_MIN -150 // Corresponds to -15 db
#define BASS_MAX 150 #define BASS_MAX 150 // Corresponds to +15 dB
#define TREBLE_MIN -150 #define TREBLE_MIN -150 // Corresponds to -15 dB
#define TREBLE_MAX 150 #define TREBLE_MAX 150 // Corresponds to +15 dB
#define LEVEL_MIN -300 #define LEVEL_MIN -300 // Corresponds to -30 dN
#define LEVEL_MAX 0 #define LEVEL_MAX 0 // Corresponds to 0 dB
BEGIN_EVENT_TABLE(BassTrebleDialog, EffectDialog) BEGIN_EVENT_TABLE(BassTrebleDialog, EffectDialog)
EVT_SLIDER(ID_BASS_SLIDER, BassTrebleDialog::OnBassSlider) EVT_SLIDER(ID_BASS_SLIDER, BassTrebleDialog::OnBassSlider)