mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

alsasrc: lock calls to snd_pcm_delay() with mutex as in alsasink

Browse source 
Alsasrc introduced delay_lock in commit 519f85a43e73efb8f3fb2c7be45226e
because alsa-lib is not thread safe for the same handle.
Alsasrc uses the same threading pattern, it should be locked too.

https://bugzilla.gnome.org/show_bug.cgi?id=746015
This commit is contained in:
Branislav Katreniak 2015-03-20 09:41:05 +01:00 committed by Tim-Philipp Müller
parent a1af74feda
commit 4f88125b3d
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/alsa/gstalsasrc.c
View file

@ -118,6 +118,7 @@ gst_alsasrc_finalize (GObject * object)
g_free (src->device);
g_mutex_clear (&src->alsa_lock);
g_mutex_clear (&src->delay_lock);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@ -275,6 +276,7 @@ gst_alsasrc_init (GstAlsaSrc * alsasrc)
alsasrc->driver_timestamps = FALSE;
g_mutex_init (&alsasrc->alsa_lock);
g_mutex_init (&alsasrc->delay_lock);
}
#define CHECK(call, error) \
@ -958,7 +960,11 @@ gst_alsasrc_read (GstAudioSrc * asrc, gpointer data, guint length,
GST_ALSA_SRC_LOCK (asrc);
while (cptr > 0) {
if ((err = snd_pcm_readi (alsa->handle, ptr, cptr)) < 0) {
GST_DELAY_SRC_LOCK (asrc);
err = snd_pcm_readi (alsa->handle, ptr, cptr);
GST_DELAY_SRC_UNLOCK (asrc);
if (err < 0) {
if (err == -EAGAIN) {
GST_DEBUG_OBJECT (asrc, "Read error: %s", snd_strerror (err));
continue;
@ -1005,7 +1011,9 @@ gst_alsasrc_delay (GstAudioSrc * asrc)
alsa = GST_ALSA_SRC (asrc);
GST_DELAY_SRC_LOCK (asrc);
res = snd_pcm_delay (alsa->handle, &delay);
GST_DELAY_SRC_UNLOCK (asrc);
if (G_UNLIKELY (res < 0)) {
GST_DEBUG_OBJECT (alsa, "snd_pcm_delay returned %d", res);
delay = 0;

5
ext/alsa/gstalsasrc.h
View file

@ -39,6 +39,10 @@ G_BEGIN_DECLS
#define GST_ALSA_SRC_LOCK(obj) (g_mutex_lock (GST_ALSA_SRC_GET_LOCK (obj)))
#define GST_ALSA_SRC_UNLOCK(obj) (g_mutex_unlock (GST_ALSA_SRC_GET_LOCK (obj)))
#define GST_DELAY_SRC_GET_LOCK(obj) (&GST_ALSA_SRC_CAST (obj)->delay_lock)
#define GST_DELAY_SRC_LOCK(obj) (g_mutex_lock (GST_DELAY_SRC_GET_LOCK (obj)))
#define GST_DELAY_SRC_UNLOCK(obj) (g_mutex_unlock (GST_DELAY_SRC_GET_LOCK (obj)))
typedef struct _GstAlsaSrc GstAlsaSrc;
typedef struct _GstAlsaSrcClass GstAlsaSrcClass;
@ -71,6 +75,7 @@ struct _GstAlsaSrc {
snd_pcm_uframes_t period_size;
GMutex alsa_lock;
GMutex delay_lock;
};
struct _GstAlsaSrcClass {