mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 21:48:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtmpsrc: Implement basesrc->unlock()

Browse source 
This fixes ->NULL transition problems if librtmp is stuck in a
recv or send call that never returns.
This commit is contained in:
David Schleef 2013-04-01 19:49:00 -07:00
parent 79af542fc6
commit 94ed6caec4
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ext/rtmp/gstrtmpsrc.c
View file

@ -86,6 +86,7 @@ static void gst_rtmp_src_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static void gst_rtmp_src_finalize (GObject * object); static void gst_rtmp_src_finalize (GObject * object);
static gboolean gst_rtmp_src_unlock (GstBaseSrc * src);
static gboolean gst_rtmp_src_stop (GstBaseSrc * src); static gboolean gst_rtmp_src_stop (GstBaseSrc * src);
static gboolean gst_rtmp_src_start (GstBaseSrc * src); static gboolean gst_rtmp_src_start (GstBaseSrc * src);
static gboolean gst_rtmp_src_is_seekable (GstBaseSrc * src); static gboolean gst_rtmp_src_is_seekable (GstBaseSrc * src);
@ -136,6 +137,7 @@ gst_rtmp_src_class_init (GstRTMPSrcClass * klass)
gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_rtmp_src_start); gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_rtmp_src_start);
gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_rtmp_src_stop); gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_rtmp_src_stop);
gstbasesrc_class->unlock = GST_DEBUG_FUNCPTR (gst_rtmp_src_unlock);
gstbasesrc_class->is_seekable = GST_DEBUG_FUNCPTR (gst_rtmp_src_is_seekable); gstbasesrc_class->is_seekable = GST_DEBUG_FUNCPTR (gst_rtmp_src_is_seekable);
gstbasesrc_class->prepare_seek_segment = gstbasesrc_class->prepare_seek_segment =
GST_DEBUG_FUNCPTR (gst_rtmp_src_prepare_seek_segment); GST_DEBUG_FUNCPTR (gst_rtmp_src_prepare_seek_segment);
@ -585,6 +587,23 @@ gst_rtmp_src_start (GstBaseSrc * basesrc)
#undef STR2AVAL #undef STR2AVAL
static gboolean
gst_rtmp_src_unlock (GstBaseSrc * basesrc)
{
GstRTMPSrc *rtmpsrc = GST_RTMP_SRC (basesrc);
GST_DEBUG_OBJECT (rtmpsrc, "unlock");
/* This closes the socket, which means that any pending socket calls
* error out. */
if (rtmpsrc->rtmp) {
RTMP_Close (rtmpsrc->rtmp);
}
return TRUE;
}
static gboolean static gboolean
gst_rtmp_src_stop (GstBaseSrc * basesrc) gst_rtmp_src_stop (GstBaseSrc * basesrc)
{ {
@ -593,7 +612,6 @@ gst_rtmp_src_stop (GstBaseSrc * basesrc)
src = GST_RTMP_SRC (basesrc); src = GST_RTMP_SRC (basesrc);
if (src->rtmp) { if (src->rtmp) {
RTMP_Close (src->rtmp);
RTMP_Free (src->rtmp); RTMP_Free (src->rtmp);
src->rtmp = NULL; src->rtmp = NULL;
} }