mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/base/gstbasesink.c: Add fixme regarding EOS in pull mode.

Browse source 
Original commit message from CVS:
* libs/gst/base/gstbasesink.c: (gst_base_sink_loop),
(gst_base_sink_get_position_paused):
Add fixme regarding EOS in pull mode.
Fix position reporting in PAUSED for negative rates.
This commit is contained in:
Wim Taymans 2008-02-01 10:27:10 +00:00
parent 6f0a59aa13
commit ba976a1864
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-02-01 Wim Taymans <wim.taymans@collabora.co.uk>
* libs/gst/base/gstbasesink.c: (gst_base_sink_loop),
(gst_base_sink_get_position_paused):
Add fixme regarding EOS in pull mode.
Fix position reporting in PAUSED for negative rates.
2008-02-01 Wim Taymans <wim.taymans@collabora.co.uk> 2008-02-01 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/gstminiobject.c: (gst_mini_object_replace): * gst/gstminiobject.c: (gst_mini_object_replace):

31
libs/gst/base/gstbasesink.c
View file

@ -2653,6 +2653,7 @@ paused:
gst_pad_pause_task (pad); gst_pad_pause_task (pad);
/* fatal errors and NOT_LINKED cause EOS */ /* fatal errors and NOT_LINKED cause EOS */
if (GST_FLOW_IS_FATAL (result) || result == GST_FLOW_NOT_LINKED) { if (GST_FLOW_IS_FATAL (result) || result == GST_FLOW_NOT_LINKED) {
/* FIXME, we shouldn't post EOS when we are operating in segment mode */
gst_base_sink_event (pad, gst_event_new_eos ()); gst_base_sink_event (pad, gst_event_new_eos ());
/* EOS does not cause an ERROR message */ /* EOS does not cause an ERROR message */
if (result != GST_FLOW_UNEXPECTED) { if (result != GST_FLOW_UNEXPECTED) {
@ -2995,17 +2996,35 @@ static gboolean
gst_base_sink_get_position_paused (GstBaseSink * basesink, gint64 * cur) gst_base_sink_get_position_paused (GstBaseSink * basesink, gint64 * cur)
{ {
gboolean res; gboolean res;
gint64 time;
GstSegment *segment;
*cur = basesink->priv->current_sstart; *cur = basesink->priv->current_sstart;
segment = basesink->abidata.ABI.clip_segment;
if (*cur != -1) time = segment->time;
*cur = MAX (*cur, basesink->abidata.ABI.clip_segment->time);
else
*cur = basesink->abidata.ABI.clip_segment->time;
if (*cur != -1) {
*cur = MAX (*cur, time);
GST_DEBUG_OBJECT (basesink, "POSITION as max: %" GST_TIME_FORMAT
", time %" GST_TIME_FORMAT, GST_TIME_ARGS (*cur), GST_TIME_ARGS (time));
} else {
/* we have no buffer, use the segment times. */
if (segment->rate >= 0.0) {
/* forward, next position is always the time of the segment */
*cur = time;
GST_DEBUG_OBJECT (basesink, "POSITION as time: %" GST_TIME_FORMAT,
GST_TIME_ARGS (*cur));
} else {
/* reverse, next expected timestamp is segment->stop. We use the function
* to get things right for negative applied_rates. */
*cur =
gst_segment_to_stream_time (segment, GST_FORMAT_TIME, segment->stop);
GST_DEBUG_OBJECT (basesink, "reverse POSITION: %" GST_TIME_FORMAT,
GST_TIME_ARGS (*cur));
}
}
res = (*cur != -1); res = (*cur != -1);
GST_DEBUG_OBJECT (basesink, "POSITION: %" GST_TIME_FORMAT,
GST_TIME_ARGS (*cur));
return res; return res;
} }