mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-05 10:12:20 +00:00
qtdemux: Don't use GST_FLOW_IS_FATAL()
This commit is contained in:
parent
e8743b3789
commit
7fe34f3889
1 changed files with 32 additions and 35 deletions
|
@ -2934,7 +2934,6 @@ pause:
|
||||||
gst_pad_pause_task (pad);
|
gst_pad_pause_task (pad);
|
||||||
|
|
||||||
/* fatal errors need special actions */
|
/* fatal errors need special actions */
|
||||||
if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) {
|
|
||||||
/* check EOS */
|
/* check EOS */
|
||||||
if (ret == GST_FLOW_UNEXPECTED) {
|
if (ret == GST_FLOW_UNEXPECTED) {
|
||||||
if (qtdemux->n_streams == 0) {
|
if (qtdemux->n_streams == 0) {
|
||||||
|
@ -2959,8 +2958,7 @@ pause:
|
||||||
GST_FORMAT_TIME, stop));
|
GST_FORMAT_TIME, stop));
|
||||||
} else {
|
} else {
|
||||||
/* For Reverse Playback */
|
/* For Reverse Playback */
|
||||||
GST_LOG_OBJECT (qtdemux,
|
GST_LOG_OBJECT (qtdemux, "Sending segment done, at start of segment");
|
||||||
"Sending segment done, at start of segment");
|
|
||||||
gst_element_post_message (GST_ELEMENT_CAST (qtdemux),
|
gst_element_post_message (GST_ELEMENT_CAST (qtdemux),
|
||||||
gst_message_new_segment_done (GST_OBJECT_CAST (qtdemux),
|
gst_message_new_segment_done (GST_OBJECT_CAST (qtdemux),
|
||||||
GST_FORMAT_TIME, qtdemux->segment.start));
|
GST_FORMAT_TIME, qtdemux->segment.start));
|
||||||
|
@ -2969,12 +2967,11 @@ pause:
|
||||||
GST_LOG_OBJECT (qtdemux, "Sending EOS at end of segment");
|
GST_LOG_OBJECT (qtdemux, "Sending EOS at end of segment");
|
||||||
gst_qtdemux_push_event (qtdemux, gst_event_new_eos ());
|
gst_qtdemux_push_event (qtdemux, gst_event_new_eos ());
|
||||||
}
|
}
|
||||||
} else {
|
} else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) {
|
||||||
GST_ELEMENT_ERROR (qtdemux, STREAM, FAILED,
|
GST_ELEMENT_ERROR (qtdemux, STREAM, FAILED,
|
||||||
(NULL), ("streaming stopped, reason %s", reason));
|
(NULL), ("streaming stopped, reason %s", reason));
|
||||||
gst_qtdemux_push_event (qtdemux, gst_event_new_eos ());
|
gst_qtdemux_push_event (qtdemux, gst_event_new_eos ());
|
||||||
}
|
}
|
||||||
}
|
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4151,7 +4148,7 @@ qtdemux_stbl_init (GstQTDemux * qtdemux, QtDemuxStream * stream, GNode * stbl)
|
||||||
/* sync sample atom */
|
/* sync sample atom */
|
||||||
stream->stps_present = FALSE;
|
stream->stps_present = FALSE;
|
||||||
if ((stream->stss_present =
|
if ((stream->stss_present =
|
||||||
!!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stss,
|
! !qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stss,
|
||||||
&stream->stss) ? TRUE : FALSE) == TRUE) {
|
&stream->stss) ? TRUE : FALSE) == TRUE) {
|
||||||
/* copy atom data into a new buffer for later use */
|
/* copy atom data into a new buffer for later use */
|
||||||
stream->stss.data = g_memdup (stream->stss.data, stream->stss.size);
|
stream->stss.data = g_memdup (stream->stss.data, stream->stss.size);
|
||||||
|
@ -4169,7 +4166,7 @@ qtdemux_stbl_init (GstQTDemux * qtdemux, QtDemuxStream * stream, GNode * stbl)
|
||||||
|
|
||||||
/* partial sync sample atom */
|
/* partial sync sample atom */
|
||||||
if ((stream->stps_present =
|
if ((stream->stps_present =
|
||||||
!!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stps,
|
! !qtdemux_tree_get_child_by_type_full (stbl, FOURCC_stps,
|
||||||
&stream->stps) ? TRUE : FALSE) == TRUE) {
|
&stream->stps) ? TRUE : FALSE) == TRUE) {
|
||||||
/* copy atom data into a new buffer for later use */
|
/* copy atom data into a new buffer for later use */
|
||||||
stream->stps.data = g_memdup (stream->stps.data, stream->stps.size);
|
stream->stps.data = g_memdup (stream->stps.data, stream->stps.size);
|
||||||
|
@ -4293,7 +4290,7 @@ qtdemux_stbl_init (GstQTDemux * qtdemux, QtDemuxStream * stream, GNode * stbl)
|
||||||
|
|
||||||
/* composition time-to-sample */
|
/* composition time-to-sample */
|
||||||
if ((stream->ctts_present =
|
if ((stream->ctts_present =
|
||||||
!!qtdemux_tree_get_child_by_type_full (stbl, FOURCC_ctts,
|
! !qtdemux_tree_get_child_by_type_full (stbl, FOURCC_ctts,
|
||||||
&stream->ctts) ? TRUE : FALSE) == TRUE) {
|
&stream->ctts) ? TRUE : FALSE) == TRUE) {
|
||||||
/* copy atom data into a new buffer for later use */
|
/* copy atom data into a new buffer for later use */
|
||||||
stream->ctts.data = g_memdup (stream->ctts.data, stream->ctts.size);
|
stream->ctts.data = g_memdup (stream->ctts.data, stream->ctts.size);
|
||||||
|
|
Loading…
Reference in a new issue