FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages 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

6
gst/realmedia/rmdemux.c
View File

@ -918,7 +918,6 @@ 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) {
@ -938,12 +937,11 @@ need_pause:
GST_LOG_OBJECT (rmdemux, "Sending EOS, at end of stream"); 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 { } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) {
GST_ELEMENT_ERROR (rmdemux, STREAM, FAILED, GST_ELEMENT_ERROR (rmdemux, STREAM, FAILED,
(NULL), ("stream stopped, reason %s", reason)); (NULL), ("stream stopped, reason %s", reason));
gst_rmdemux_send_event (rmdemux, gst_event_new_eos ()); 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