Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Try fixing race condition in fftw by adding mutex for fftw_* function calls suggested here: http://www.fftw.org/fftw3_doc/Thread-safety.html. Updates #4643.

This commit is contained in:
Andreas 2014-12-07 14:07:53 +01:00
parent 0f1b29a523
commit b5567a7b27
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gst/moodbar/gstfastspectrum.cpp
View File

@ -19,6 +19,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include <QMutex>
#include <cstring> #include <cstring>
#include <cmath> #include <cmath>
#include "gstfastspectrum.h" #include "gstfastspectrum.h"
@ -48,6 +50,8 @@ enum {
PROP_BANDS PROP_BANDS
}; };
static QMutex fftw_mutex;
#define gst_fastspectrum_parent_class parent_class #define gst_fastspectrum_parent_class parent_class
G_DEFINE_TYPE (GstFastSpectrum, gst_fastspectrum, GST_TYPE_AUDIO_FILTER); G_DEFINE_TYPE (GstFastSpectrum, gst_fastspectrum, GST_TYPE_AUDIO_FILTER);
@ -123,6 +127,8 @@ gst_fastspectrum_init (GstFastSpectrum * spectrum)
static void static void
gst_fastspectrum_alloc_channel_data (GstFastSpectrum * spectrum) gst_fastspectrum_alloc_channel_data (GstFastSpectrum * spectrum)
{ {
fftw_mutex.lock();
guint bands = spectrum->bands; guint bands = spectrum->bands;
guint nfft = 2 * bands - 2; guint nfft = 2 * bands - 2;
@ -139,12 +145,16 @@ gst_fastspectrum_alloc_channel_data (GstFastSpectrum * spectrum)
spectrum->fft_output, spectrum->fft_output,
FFTW_ESTIMATE); FFTW_ESTIMATE);
spectrum->channel_data_initialised = true; spectrum->channel_data_initialised = true;
fftw_mutex.unlock();
} }
static void static void
gst_fastspectrum_free_channel_data (GstFastSpectrum * spectrum) gst_fastspectrum_free_channel_data (GstFastSpectrum * spectrum)
{ {
if (spectrum->channel_data_initialised) { if (spectrum->channel_data_initialised) {
fftw_mutex.lock();
fftw_destroy_plan(spectrum->plan); fftw_destroy_plan(spectrum->plan);
fftw_free(spectrum->fft_input); fftw_free(spectrum->fft_input);
fftw_free(spectrum->fft_output); fftw_free(spectrum->fft_output);
@ -152,6 +162,8 @@ gst_fastspectrum_free_channel_data (GstFastSpectrum * spectrum)
delete[] spectrum->spect_magnitude; delete[] spectrum->spect_magnitude;
spectrum->channel_data_initialised = false; spectrum->channel_data_initialised = false;
fftw_mutex.unlock();
} }
} }
@ -373,6 +385,8 @@ gst_fastspectrum_run_fft (GstFastSpectrum * spectrum, guint input_pos)
guint bands = spectrum->bands; guint bands = spectrum->bands;
guint nfft = 2 * bands - 2; guint nfft = 2 * bands - 2;
fftw_mutex.lock();
for (i = 0; i < nfft; i++) for (i = 0; i < nfft; i++)
spectrum->fft_input[i] = spectrum->fft_input[i] =
spectrum->input_ring_buffer[(input_pos + i) % nfft]; spectrum->input_ring_buffer[(input_pos + i) % nfft];
@ -387,6 +401,8 @@ gst_fastspectrum_run_fft (GstFastSpectrum * spectrum, guint input_pos)
val /= nfft * nfft; val /= nfft * nfft;
spectrum->spect_magnitude[i] += val; spectrum->spect_magnitude[i] += val;
} }
fftw_mutex.unlock();
} }
static GstFlowReturn static GstFlowReturn