Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-18 17:10:05 +02:00
Code Issues Releases Wiki Activity

Correct "Hanning window" to "Hann window"

Browse Source 
Updated in user facing text and comments. Variable names left as is.
This commit is contained in:
Steve Daulton 2019-03-14 10:10:20 +00:00
parent 2991928437
commit 2673e28f4a
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/FFT.cpp
View File

@ -343,7 +343,7 @@ const wxChar *WindowFuncName(int whichFunction)
case eWinFuncHamming: case eWinFuncHamming:
return wxT("Hamming"); return wxT("Hamming");
case eWinFuncHanning: case eWinFuncHanning:
return wxT("Hanning"); return wxT("Hann");
case eWinFuncBlackman: case eWinFuncBlackman:
return wxT("Blackman"); return wxT("Blackman");
case eWinFuncBlackmanHarris: case eWinFuncBlackmanHarris:
@ -404,7 +404,7 @@ void NewWindowFunc(int whichFunction, size_t NumSamplesIn, bool extraSample, flo
break; break;
case eWinFuncHanning: case eWinFuncHanning:
{ {
// Hanning // Hann
const double multiplier = 2 * M_PI / NumSamples; const double multiplier = 2 * M_PI / NumSamples;
static const double coeff0 = 0.5, coeff1 = -0.5; static const double coeff0 = 0.5, coeff1 = -0.5;
for (int ii = 0; ii < NumSamples; ++ii) for (int ii = 0; ii < NumSamples; ++ii)
@ -601,7 +601,7 @@ void DerivativeOfWindowFunc(int whichFunction, size_t NumSamples, bool extraSamp
break; break;
case eWinFuncHanning: case eWinFuncHanning:
{ {
// Hanning // Hann
const double multiplier = 2 * M_PI / NumSamples; const double multiplier = 2 * M_PI / NumSamples;
const double coeff1 = -0.5 * multiplier; const double coeff1 = -0.5 * multiplier;
for (int ii = 0; ii < (int)NumSamples; ++ii) for (int ii = 0; ii < (int)NumSamples; ++ii)

2
src/effects/Equalization.cpp
View File

@ -28,7 +28,7 @@
Also allows the curve to be specified with a series of 'graphic EQ' Also allows the curve to be specified with a series of 'graphic EQ'
sliders. sliders.
The filter is applied using overlap/add of Hanning windows. The filter is applied using overlap/add of Hann windows.
Clone of the FFT Filter effect, no longer part of Audacity. Clone of the FFT Filter effect, no longer part of Audacity.

2
src/effects/NoiseReduction.cpp
View File

@ -29,7 +29,7 @@
but if it were, there would be a significant delay. but if it were, there would be a significant delay.
The gain controls are applied to the complex FFT of the signal, The gain controls are applied to the complex FFT of the signal,
and then the inverse FFT is applied. A Hanning window may be and then the inverse FFT is applied. A Hann window may be
applied (depending on the advanced window types setting), and then applied (depending on the advanced window types setting), and then
the output signal is then pieced together using overlap/add. the output signal is then pieced together using overlap/add.

4
src/effects/NoiseRemoval.cpp
View File

@ -27,7 +27,7 @@
but if it were, there would be a significant delay. but if it were, there would be a significant delay.
The gain controls are applied to the complex FFT of the signal, The gain controls are applied to the complex FFT of the signal,
and then the inverse FFT is applied, followed by a Hanning window; and then the inverse FFT is applied, followed by a Hann window;
the output signal is then pieced together using overlap/add of the output signal is then pieced together using overlap/add of
half the window size. half the window size.
@ -288,7 +288,7 @@ void EffectNoiseRemoval::Initialize()
mWindow.reinit(mWindowSize); mWindow.reinit(mWindowSize);
mOutOverlapBuffer.reinit(mWindowSize); mOutOverlapBuffer.reinit(mWindowSize);
// Create a Hanning window function // Create a Hann window function
for(size_t i=0; i<mWindowSize; i++) for(size_t i=0; i<mWindowSize; i++)
mWindow[i] = 0.5 - 0.5 * cos((2.0*M_PI*i) / mWindowSize); mWindow[i] = 0.5 - 0.5 * cos((2.0*M_PI*i) / mWindowSize);

2
src/effects/ToneGen.cpp
View File

@ -217,7 +217,7 @@ size_t EffectToneGen::ProcessBlock(float **WXUNUSED(inBlock), float **outBlock,
f = pre4divPI * sin(pre2PI * mPositionInCycles / mSampleRate); f = pre4divPI * sin(pre2PI * mPositionInCycles / mSampleRate);
for (k = 3; (k < 200) && (k * BlendedFrequency < mSampleRate / 2.0); k += 2) for (k = 3; (k < 200) && (k * BlendedFrequency < mSampleRate / 2.0); k += 2)
{ {
//Hanning Window in freq domain //Hann Window in freq domain
a = 1.0 + cos((pre2PI * k * BlendedFrequency) / mSampleRate); a = 1.0 + cos((pre2PI * k * BlendedFrequency) / mSampleRate);
//calc harmonic, apply window, scale to amplitude of fundamental //calc harmonic, apply window, scale to amplitude of fundamental
f += a * sin(pre2PI * mPositionInCycles / mSampleRate * k) / (b * k); f += a * sin(pre2PI * mPositionInCycles / mSampleRate * k) / (b * k);