Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-30 15:49:41 +02:00
Code Issues Releases Wiki Activity

Tweaks to Noise Reduction, by Paul Licameli.

Browse Source 
1. Put the new files at the proper level of the Solution Explorer tree. 
2. Fix a tiny tiny inefficiency in RotateHistoryWindows(). 
3. Do not use leading zero-padded windows when gathering statistics. 
4. Hamming windows are in the advanced menu of choices, following Federico Miyara's suggestion.
This commit is contained in:
james.k.crook@gmail.com 2014-11-29 17:03:57 +00:00
parent 2131568876
commit fe722df653
2 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/effects/NoiseReduction.cpp
View File

@ -98,6 +98,9 @@ enum WindowTypes {
WT_HANN_RECTANGULAR, // requires 1/2 step
WT_HANN_HANN, // requires 1/4 step
WT_BLACKMAN_HANN, // requires 1/4 step
WT_HAMMING_RECTANGULAR, // requires 1/2 step
WT_HAMMING_HANN, // requires 1/4 step
WT_HAMMING_INV_HAMMING, // requires 1/2 step
WT_N_WINDOW_TYPES,
WT_DEFAULT_WINDOW_TYPES = WT_HANN_HANN
@ -110,7 +113,7 @@ const struct WindowTypesInfo {
double outCoefficients[3];
double productConstantTerm;
} windowTypesInfo [WT_N_WINDOW_TYPES] = {
// In all of these cases, the constant term of the product of windows
// In all of these cases (but the last), the constant term of the product of windows
// is the product of the windows' two constant terms,
// plus one half the product of the first cosine coefficients.
@ -118,6 +121,9 @@ const struct WindowTypesInfo {
{ _("Hann, none"), 2, { 0.5, -0.5, 0 }, { 1, 0, 0 }, 0.5 },
{ _("Hann, Hann (default)"), 4, { 0.5, -0.5, 0 }, { 0.5, -0.5, 0 }, 0.375 },
{ _("Blackman, Hann"), 4, { 0.42, -0.5, 0.08 }, { 0.5, -0.5, 0 }, 0.335 },
{ _("Hamming, none"), 2, { 0.54, -0.46, 0.0 }, { 1, 0, 0 }, 0.54 },
{ _("Hamming, Hann"), 4, { 0.54, -0.46, 0.0 }, { 0.5, -0.5, 0 }, 0.385 },
{ _("Hamming, Reciprocal Hamming"), 2, { 0.54, -0.46, 0.0 }, { 1, 0, 0 }, 1.0 }, // output window is special
};
enum {
@ -807,8 +813,11 @@ EffectNoiseReduction::Worker::Worker
break;
default:
{
const bool rectangularOut =
settings.mWindowTypes == WT_HAMMING_RECTANGULAR ||
settings.mWindowTypes == WT_HANN_RECTANGULAR;
const double m =
settings.mWindowTypes == WT_HANN_RECTANGULAR ? multiplier : 1;
rectangularOut ? multiplier : 1;
const double *const coefficients =
windowTypesInfo[settings.mWindowTypes].inCoefficients;
const double c0 = coefficients[0];
@ -827,6 +836,14 @@ EffectNoiseReduction::Worker::Worker
// Create the synthesis window
switch (settings.mWindowTypes) {
case WT_HANN_RECTANGULAR:
case WT_HAMMING_RECTANGULAR:
break;
case WT_HAMMING_INV_HAMMING:
{
mOutWindow.resize(mWindowSize);
for (int ii = 0; ii < mWindowSize; ++ii)
mOutWindow[ii] = multiplier / mInWindow[ii];
}
break;
default:
{
@ -871,18 +888,26 @@ void EffectNoiseReduction::Worker::StartNewTrack()
pFill = &mInWaveBuffer[0];
std::fill(pFill, pFill + mWindowSize, 0.0f);
// So that the queue gets primed with some windows,
// zero-padded in front, the first having mStepSize
// samples of wave data:
mInWavePos = mWindowSize - mStepSize;
if (mDoProfile)
{
// We do not want leading zero padded windows
mInWavePos = 0;
mOutStepCount = -(mHistoryLen - 1);
}
else
{
// So that the queue gets primed with some windows,
// zero-padded in front, the first having mStepSize
// samples of wave data:
mInWavePos = mWindowSize - mStepSize;
// This starts negative, to count up until the queue fills:
mOutStepCount = -(mHistoryLen - 1)
// ... and then must pass over the padded windows,
// before the first full window:
- (mStepsPerWindow - 1);
}
mInSampleCount = 0;
// This starts negative, to count up until the queue fills:
mOutStepCount = - (mHistoryLen - 1)
// ... and then must pass over the padded windows,
// before the first full window:
- (mStepsPerWindow - 1);
}
void EffectNoiseReduction::Worker::ProcessSamples
@ -961,8 +986,8 @@ void EffectNoiseReduction::Worker::FillFirstHistoryWindow()
void EffectNoiseReduction::Worker::RotateHistoryWindows()
{
Record *save = mQueue[mHistoryLen - 1];
mQueue.insert(mQueue.begin(), save);
mQueue.pop_back();
mQueue.insert(mQueue.begin(), save);
}
void EffectNoiseReduction::Worker::FinishTrackStatistics(Statistics &statistics)

8
win/Projects/Audacity/Audacity.vcxproj.filters
View File

@ -828,10 +828,12 @@
<ClCompile Include="..\..\..\src\widgets\NumericTextCtrl.cpp">
<Filter>src/widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\effects\NoiseReduction.cpp" />
<ClCompile Include="..\..\..\src\effects\Phaser.cpp">
<Filter>src/effects</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\effects\NoiseReduction.cpp">
<Filter>src/effects</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\AboutDialog.h">
@ -1650,13 +1652,15 @@
<ClInclude Include="..\..\..\src\widgets\NumericTextCtrl.h">
<Filter>src/widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\effects\NoiseReduction.h" />
<ClInclude Include="..\..\..\include\audacity\EffectAutomationParameters.h">
<Filter>includes\audacity</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\effects\Phaser.h">
<Filter>src/effects</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\effects\NoiseReduction.h">
<Filter>src/effects</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\audacity.ico">