mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

rmdemux: Don't use GST_FLOW_IS_FATAL() and GST_FLOW_IS_SUCCESS()

Browse source
This commit is contained in:
Sebastian Dröge 2010-08-27 18:22:45 +02:00
parent 704b371944
commit f3fa6f6de0
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gst/realmedia/rmdemux.c
View file

@ -918,31 +918,29 @@ need_pause:
rmdemux->segment_running = FALSE; rmdemux->segment_running = FALSE;
gst_pad_pause_task (rmdemux->sinkpad); gst_pad_pause_task (rmdemux->sinkpad);
if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) { if (ret == GST_FLOW_UNEXPECTED) {
if (ret == GST_FLOW_UNEXPECTED) { /* perform EOS logic */
/* perform EOS logic */ if (rmdemux->segment.flags & GST_SEEK_FLAG_SEGMENT) {
if (rmdemux->segment.flags & GST_SEEK_FLAG_SEGMENT) { gint64 stop;
gint64 stop;
/* for segment playback we need to post when (in stream time) /* for segment playback we need to post when (in stream time)
* we stopped, this is either stop (when set) or the duration. */ * we stopped, this is either stop (when set) or the duration. */
if ((stop = rmdemux->segment.stop) == -1) if ((stop = rmdemux->segment.stop) == -1)
stop = rmdemux->segment.duration; stop = rmdemux->segment.duration;
GST_LOG_OBJECT (rmdemux, "Sending segment done, at end of segment"); GST_LOG_OBJECT (rmdemux, "Sending segment done, at end of segment");
gst_element_post_message (GST_ELEMENT (rmdemux), gst_element_post_message (GST_ELEMENT (rmdemux),
gst_message_new_segment_done (GST_OBJECT (rmdemux), gst_message_new_segment_done (GST_OBJECT (rmdemux),
GST_FORMAT_TIME, stop)); GST_FORMAT_TIME, stop));
} else {
/* normal playback, send EOS to all linked pads */
GST_LOG_OBJECT (rmdemux, "Sending EOS, at end of stream");
gst_rmdemux_send_event (rmdemux, gst_event_new_eos ());
}
} else { } else {
GST_ELEMENT_ERROR (rmdemux, STREAM, FAILED, /* normal playback, send EOS to all linked pads */
(NULL), ("stream stopped, reason %s", reason)); GST_LOG_OBJECT (rmdemux, "Sending EOS, at end of stream");
gst_rmdemux_send_event (rmdemux, gst_event_new_eos ()); gst_rmdemux_send_event (rmdemux, gst_event_new_eos ());
} }
} else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) {
GST_ELEMENT_ERROR (rmdemux, STREAM, FAILED,
(NULL), ("stream stopped, reason %s", reason));
gst_rmdemux_send_event (rmdemux, gst_event_new_eos ());
} }
return; return;
} }
@ -1890,7 +1888,7 @@ gst_rmdemux_combine_flows (GstRMDemux * rmdemux, GstRMDemuxStream * stream,
stream->last_flow = ret; stream->last_flow = ret;
/* if it's success we can return the value right away */ /* if it's success we can return the value right away */
if (GST_FLOW_IS_SUCCESS (ret)) if (ret == GST_FLOW_OK)
goto done; goto done;
/* any other error that is not-linked can be returned right /* any other error that is not-linked can be returned right