mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/qtdemux/qtdemux.c: Use duration as segment stop position if none is explicitly configured.

Browse source 
Original commit message from CVS:
* gst/qtdemux/qtdemux.c: (gst_qtdemux_perform_seek),
(gst_qtdemux_do_seek), (gst_qtdemux_loop_state_movie),
(gst_qtdemux_loop):
Use duration as segment stop position if none is
explicitly configured.
Also perform EOS when we run past the segment stop.
This commit is contained in:
Wim Taymans 2006-04-05 08:36:55 +00:00
parent 378bcc051d
commit 227563fe37
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 6f7101e2227975fa8a134358362dd4b55e326b4c Subproject commit cbedff4d5f090d43fdeaa189748a6651f2c6a07f

34
gst/qtdemux/qtdemux.c
View file

@ -581,6 +581,11 @@ gst_qtdemux_perform_seek (GstQTDemux * qtdemux, GstSegment * segment)
segment->last_stop = min; segment->last_stop = min;
segment->time = min; segment->time = min;
} }
/* and we stop at the end */
if (segment->stop == -1)
segment->stop = segment->duration;
return TRUE; return TRUE;
} }
@ -687,8 +692,9 @@ gst_qtdemux_do_seek (GstQTDemux * qtdemux, GstPad * pad, GstEvent * event)
} }
/* send the newsegment */ /* send the newsegment */
GST_DEBUG_OBJECT (qtdemux, "Sending newsegment from %" G_GINT64_FORMAT GST_DEBUG_OBJECT (qtdemux, "Sending newsegment from %" GST_TIME_FORMAT
" to %" G_GINT64_FORMAT, qtdemux->segment.start, stop); " to %" GST_TIME_FORMAT, GST_TIME_ARGS (qtdemux->segment.start),
GST_TIME_ARGS (qtdemux->segment.stop));
newsegment = newsegment =
gst_event_new_new_segment (FALSE, qtdemux->segment.rate, gst_event_new_new_segment (FALSE, qtdemux->segment.rate,
@ -952,12 +958,12 @@ gst_qtdemux_loop_state_movie (GstQTDemux * qtdemux)
} }
} }
} }
if (index == -1) { if (index == -1)
GST_DEBUG_OBJECT (qtdemux, "No samples left for any streams - EOS"); goto eos;
gst_pad_event_default (qtdemux->sinkpad, gst_event_new_eos ());
ret = GST_FLOW_UNEXPECTED; /* check for segment end */
goto beach; if (qtdemux->segment.stop != -1 && qtdemux->segment.stop < min_time)
} goto eos;
stream = qtdemux->streams[index]; stream = qtdemux->streams[index];
@ -1036,6 +1042,14 @@ gst_qtdemux_loop_state_movie (GstQTDemux * qtdemux)
beach: beach:
return ret; return ret;
/* special cases */
eos:
{
GST_DEBUG_OBJECT (qtdemux, "No samples left for any streams - EOS");
ret = GST_FLOW_UNEXPECTED;
goto beach;
}
} }
static void static void
@ -1076,7 +1090,7 @@ gst_qtdemux_loop (GstPad * pad)
GST_LOG_OBJECT (qtdemux, "pausing task, reason %s", gst_flow_get_name (ret)); GST_LOG_OBJECT (qtdemux, "pausing task, reason %s", gst_flow_get_name (ret));
qtdemux->segment_running = FALSE; qtdemux->segment_running = FALSE;
gst_pad_pause_task (qtdemux->sinkpad); gst_pad_pause_task (pad);
/* fatal errors need special actions */ /* fatal errors need special actions */
if (GST_FLOW_IS_FATAL (ret)) { if (GST_FLOW_IS_FATAL (ret)) {
@ -1108,7 +1122,7 @@ invalid_state:
GST_ELEMENT_ERROR (qtdemux, STREAM, FAILED, GST_ELEMENT_ERROR (qtdemux, STREAM, FAILED,
(NULL), ("streaming stopped, invalid state")); (NULL), ("streaming stopped, invalid state"));
qtdemux->segment_running = FALSE; qtdemux->segment_running = FALSE;
gst_pad_pause_task (qtdemux->sinkpad); gst_pad_pause_task (pad);
gst_qtdemux_push_event (qtdemux, gst_event_new_eos ()); gst_qtdemux_push_event (qtdemux, gst_event_new_eos ());
goto done; goto done;
} }