mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 13:45:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtmpsink: Do not crash when receiving buffers after GST_FLOW_ERROR

Browse source 
If the RTMP URI is invalid, the rtmpsink will return GST_FLOW_ERROR.
If it still receives buffers after that, it shouldn't crash.

https://bugzilla.gnome.org/show_bug.cgi?id=750104
This commit is contained in:
Vivia Nikolaidou 2015-05-29 16:02:31 +03:00 committed by Jan Schmidt
parent 53451500ee
commit fba7c97135
2 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ext/rtmp/gstrtmpsink.c
View file

@ -75,6 +75,7 @@ static void gst_rtmp_sink_get_property (GObject * object, guint prop_id,
static void gst_rtmp_sink_finalize (GObject * object);
static gboolean gst_rtmp_sink_stop (GstBaseSink * sink);
static gboolean gst_rtmp_sink_start (GstBaseSink * sink);
static gboolean gst_rtmp_sink_event (GstBaseSink * sink, GstEvent * event);
static GstFlowReturn gst_rtmp_sink_render (GstBaseSink * sink, GstBuffer * buf);
#define gst_rtmp_sink_parent_class parent_class
@ -113,6 +114,7 @@ gst_rtmp_sink_class_init (GstRTMPSinkClass * klass)
gstbasesink_class->start = GST_DEBUG_FUNCPTR (gst_rtmp_sink_start);
gstbasesink_class->stop = GST_DEBUG_FUNCPTR (gst_rtmp_sink_stop);
gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_rtmp_sink_render);
gstbasesink_class->event = gst_rtmp_sink_event;
GST_DEBUG_CATEGORY_INIT (gst_rtmp_sink_debug, "rtmpsink", 0,
"RTMP server element");
@ -177,6 +179,7 @@ gst_rtmp_sink_start (GstBaseSink * basesink)
RTMP_EnableWrite (sink->rtmp);
sink->first = TRUE;
sink->have_write_error = FALSE;
return TRUE;
}
@ -208,6 +211,12 @@ gst_rtmp_sink_render (GstBaseSink * bsink, GstBuffer * buf)
GstBuffer *reffed_buf = NULL;
GstMapInfo map;
if (sink->rtmp == NULL) {
/* Do not crash */
GST_ELEMENT_ERROR (sink, RESOURCE, WRITE, (NULL), ("Failed to write data"));
return GST_FLOW_ERROR;
}
if (sink->first) {
/* open the connection */
if (!RTMP_IsConnected (sink->rtmp)) {
@ -219,6 +228,7 @@ gst_rtmp_sink_render (GstBaseSink * bsink, GstBuffer * buf)
sink->rtmp = NULL;
g_free (sink->rtmp_uri);
sink->rtmp_uri = NULL;
sink->have_write_error = TRUE;
return GST_FLOW_ERROR;
}
GST_DEBUG_OBJECT (sink, "Opened connection to %s", sink->rtmp_uri);
@ -241,6 +251,9 @@ gst_rtmp_sink_render (GstBaseSink * bsink, GstBuffer * buf)
sink->cache = NULL;
}
if (sink->have_write_error)
goto write_failed;
GST_LOG_OBJECT (sink, "Sending %" G_GSIZE_FORMAT " bytes to RTMP server",
gst_buffer_get_size (buf));
@ -262,6 +275,7 @@ write_failed:
gst_buffer_unmap (buf, &map);
if (reffed_buf)
gst_buffer_unref (reffed_buf);
sink->have_write_error = TRUE;
return GST_FLOW_ERROR;
}
}
@ -330,8 +344,10 @@ gst_rtmp_sink_uri_set_uri (GstURIHandler * handler, const gchar * uri,
free (playpath.av_val);
}
if (ret)
if (ret) {
sink->have_write_error = FALSE;
GST_DEBUG_OBJECT (sink, "Changed URI to %s", GST_STR_NULL (uri));
}
return ret;
}
@ -364,6 +380,22 @@ gst_rtmp_sink_set_property (GObject * object, guint prop_id,
}
}
static gboolean
gst_rtmp_sink_event (GstBaseSink * sink, GstEvent * event)
{
GstRTMPSink *rtmpsink = GST_RTMP_SINK (sink);
switch (event->type) {
case GST_EVENT_FLUSH_STOP:
rtmpsink->have_write_error = FALSE;
break;
default:
break;
}
return GST_BASE_SINK_CLASS (parent_class)->event (sink, event);
}
static void
gst_rtmp_sink_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)

1
ext/rtmp/gstrtmpsink.h
View file

@ -55,6 +55,7 @@ struct _GstRTMPSink {
GstBuffer *cache; /* Cached buffer */
gboolean first;
gboolean have_write_error;
};
struct _GstRTMPSinkClass {