mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

shmsrc: Lock uses of shmpipe

Browse source
This commit is contained in:
Olivier Crête 2010-01-27 11:49:34 +02:00
parent 92dccdd170
commit 4f4ba5981b
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/shm/gstshmsrc.c
View file

@ -218,8 +218,10 @@ gst_shm_src_stop (GstBaseSrc * bsrc)
GST_DEBUG_OBJECT (self, "Stopping %p", self); GST_DEBUG_OBJECT (self, "Stopping %p", self);
GST_OBJECT_LOCK (self);
sp_close (self->pipe); sp_close (self->pipe);
self->pipe = NULL; self->pipe = NULL;
GST_OBJECT_UNLOCK (self);
gst_poll_free (self->poll); gst_poll_free (self->poll);
self->poll = NULL; self->poll = NULL;
@ -236,7 +238,9 @@ free_buffer (gpointer data)
GST_LOG ("Freeing buffer %p", gsb->buf); GST_LOG ("Freeing buffer %p", gsb->buf);
GST_OBJECT_LOCK (gsb->src);
sp_client_recv_finish (gsb->src->pipe, gsb->buf); sp_client_recv_finish (gsb->src->pipe, gsb->buf);
GST_OBJECT_UNLOCK (gsb->src);
gst_object_unref (gsb->src); gst_object_unref (gsb->src);
g_slice_free (struct GstShmBuffer, gsb); g_slice_free (struct GstShmBuffer, gsb);
@ -277,7 +281,9 @@ gst_shm_src_create (GstPushSrc * psrc, GstBuffer ** outbuf)
if (gst_poll_fd_can_read (self->poll, &self->pollfd)) { if (gst_poll_fd_can_read (self->poll, &self->pollfd)) {
buf = NULL; buf = NULL;
GST_LOG_OBJECT (self, "Reading from pipe"); GST_LOG_OBJECT (self, "Reading from pipe");
GST_OBJECT_LOCK (self);
rv = sp_client_recv (self->pipe, &buf); rv = sp_client_recv (self->pipe, &buf);
GST_OBJECT_UNLOCK (self);
if (rv < 0) { if (rv < 0) {
GST_ELEMENT_ERROR (self, RESOURCE, READ, ("Failed to read from shmsrc"), GST_ELEMENT_ERROR (self, RESOURCE, READ, ("Failed to read from shmsrc"),
("Error reading control data: %d", rv)); ("Error reading control data: %d", rv));