mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

avidemux: Don't use GST_FLOW_IS_FATAL()

Browse source 
And document why wrong-state doesn't need an error message.
This commit is contained in:
Sebastian Dröge 2010-08-27 17:32:09 +02:00
parent 37ee281d13
commit 1ce0b2dfc7
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/avi/gstavidemux.c
View file

@ -5109,13 +5109,13 @@ gst_avi_demux_loop (GstPad * pad)
return; return;
/* ERRORS */ /* ERRORS */
pause: pause:{
GST_LOG_OBJECT (avi, "pausing task, reason %s", gst_flow_get_name (res));
avi->segment_running = FALSE; gboolean push_eos = FALSE;
gst_pad_pause_task (avi->sinkpad); GST_LOG_OBJECT (avi, "pausing task, reason %s", gst_flow_get_name (res));
avi->segment_running = FALSE;
gst_pad_pause_task (avi->sinkpad);
if (GST_FLOW_IS_FATAL (res) || (res == GST_FLOW_NOT_LINKED)) {
gboolean push_eos = TRUE;
if (res == GST_FLOW_UNEXPECTED) { if (res == GST_FLOW_UNEXPECTED) {
/* handle end-of-stream/segment */ /* handle end-of-stream/segment */
@ -5131,13 +5131,17 @@ pause:
(GST_ELEMENT_CAST (avi), (GST_ELEMENT_CAST (avi),
gst_message_new_segment_done (GST_OBJECT_CAST (avi), gst_message_new_segment_done (GST_OBJECT_CAST (avi),
GST_FORMAT_TIME, stop)); GST_FORMAT_TIME, stop));
push_eos = FALSE; } else {
push_eos = TRUE;
} }
} else { } else if (res == GST_FLOW_NOT_LINKED || res < GST_FLOW_UNEXPECTED) {
/* for fatal errors we post an error message */ /* for fatal errors we post an error message, wrong-state is
* not fatal because it happens due to flushes and only means
* that we should stop now. */
GST_ELEMENT_ERROR (avi, STREAM, FAILED, GST_ELEMENT_ERROR (avi, STREAM, FAILED,
(_("Internal data stream error.")), (_("Internal data stream error.")),
("streaming stopped, reason %s", gst_flow_get_name (res))); ("streaming stopped, reason %s", gst_flow_get_name (res)));
push_eos = TRUE;
} }
if (push_eos) { if (push_eos) {
GST_INFO_OBJECT (avi, "sending eos"); GST_INFO_OBJECT (avi, "sending eos");