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

Define and use SpectrogramSettings::GetFFTLength()

Browse Source
This commit is contained in:
Paul Licameli 2015-06-20 12:39:14 -04:00
parent 778e7726df
commit a1621f7d1b
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/TrackArtist.cpp
View File

@ -2104,7 +2104,7 @@ void TrackArtist::DrawClipSpectrum(WaveTrackCache &waveTrackCache,
return; return;
unsigned char *data = image->GetData(); unsigned char *data = image->GetData();
const int half = GetSpectrumWindowSize(!autocorrelation) / 2; const int half = settings.GetFFTLength(autocorrelation) / 2;
const double binUnit = rate / (2 * half); const double binUnit = rate / (2 * half);
const float *freq = 0; const float *freq = 0;
const sampleCount *where = 0; const sampleCount *where = 0;

9
src/prefs/SpectrogramSettings.cpp
View File

@ -253,3 +253,12 @@ void SpectrogramSettings::CacheWindows() const
} }
#endif // EXPERIMENTAL_USE_REALFFTF #endif // EXPERIMENTAL_USE_REALFFTF
} }
int SpectrogramSettings::GetFFTLength(bool autocorrelation) const
{
return windowSize
#ifdef EXPERIMENTAL_ZERO_PADDED_SPECTROGRAMS
* (!autocorrelation ? zeroPaddingFactor : 1);
#endif
;
}

2
src/prefs/SpectrogramSettings.h
View File

@ -44,6 +44,8 @@ public:
int zeroPaddingFactor; int zeroPaddingFactor;
#endif #endif
int GetFFTLength(bool autocorrelation) const; // window size (times zero padding, if STFT)
bool isGrayscale; bool isGrayscale;
#ifdef EXPERIMENTAL_FFT_Y_GRID #ifdef EXPERIMENTAL_FFT_Y_GRID