mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-15 02:38:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

shmsrc: Keep GstPoll for whole src lifetime

Browse source
This commit is contained in:
Olivier Crête 2011-03-09 19:34:25 -05:00 committed by Sjoerd Simons
parent fbe4f5f610
commit a2b6dfa37e
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sys/shm/gstshmsrc.c
View file

@ -64,6 +64,7 @@ static void gst_shm_src_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_shm_src_get_property (GObject * object, guint prop_id, static void gst_shm_src_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static void gst_shm_src_finalize (GObject * object);
static gboolean gst_shm_src_start (GstBaseSrc * bsrc); static gboolean gst_shm_src_start (GstBaseSrc * bsrc);
static gboolean gst_shm_src_stop (GstBaseSrc * bsrc); static gboolean gst_shm_src_stop (GstBaseSrc * bsrc);
static GstFlowReturn gst_shm_src_create (GstPushSrc * psrc, static GstFlowReturn gst_shm_src_create (GstPushSrc * psrc,
@ -105,6 +106,7 @@ gst_shm_src_class_init (GstShmSrcClass * klass)
gobject_class->set_property = gst_shm_src_set_property; gobject_class->set_property = gst_shm_src_set_property;
gobject_class->get_property = gst_shm_src_get_property; gobject_class->get_property = gst_shm_src_get_property;
gobject_class->finalize = gst_shm_src_finalize;
gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_shm_src_start); gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_shm_src_start);
gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_shm_src_stop); gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_shm_src_stop);
@ -130,6 +132,18 @@ gst_shm_src_class_init (GstShmSrcClass * klass)
static void static void
gst_shm_src_init (GstShmSrc * self, GstShmSrcClass * g_class) gst_shm_src_init (GstShmSrc * self, GstShmSrcClass * g_class)
{ {
self->poll = gst_poll_new (TRUE);
gst_poll_fd_init (&self->pollfd);
}
static void
gst_shm_src_finalize (GObject * object)
{
GstShmSrc *self = GST_SHM_SRC (object);
gst_poll_free (self->poll);
G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -213,7 +227,8 @@ gst_shm_src_start (GstBaseSrc * bsrc)
self->pipe = gstpipe; self->pipe = gstpipe;
self->poll = gst_poll_new (TRUE); gst_poll_set_flushing (self->poll, FALSE);
gst_poll_fd_init (&self->pollfd); gst_poll_fd_init (&self->pollfd);
self->pollfd.fd = sp_get_fd (self->pipe->pipe); self->pollfd.fd = sp_get_fd (self->pipe->pipe);
gst_poll_add_fd (self->poll, &self->pollfd); gst_poll_add_fd (self->poll, &self->pollfd);
@ -234,8 +249,10 @@ gst_shm_src_stop (GstBaseSrc * bsrc)
self->pipe = NULL; self->pipe = NULL;
} }
gst_poll_free (self->poll); gst_poll_remove_fd (self->poll, &self->pollfd);
self->poll = NULL; gst_poll_fd_init (&self->pollfd);
gst_poll_set_flushing (self->poll, TRUE);
return TRUE; return TRUE;
} }
@ -328,9 +345,7 @@ gst_shm_src_unlock (GstBaseSrc * bsrc)
GstShmSrc *self = GST_SHM_SRC (bsrc); GstShmSrc *self = GST_SHM_SRC (bsrc);
self->unlocked = TRUE; self->unlocked = TRUE;
gst_poll_set_flushing (self->poll, TRUE);
if (self->poll)
gst_poll_set_flushing (self->poll, TRUE);
return TRUE; return TRUE;
} }
@ -341,9 +356,7 @@ gst_shm_src_unlock_stop (GstBaseSrc * bsrc)
GstShmSrc *self = GST_SHM_SRC (bsrc); GstShmSrc *self = GST_SHM_SRC (bsrc);
self->unlocked = FALSE; self->unlocked = FALSE;
gst_poll_set_flushing (self->poll, FALSE);
if (self->poll)
gst_poll_set_flushing (self->poll, FALSE);
return TRUE; return TRUE;
} }