mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 01:45:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

basesink: more stepping in reverse

Browse source 
Fix stepping and position reporting in reverse playback.
This commit is contained in:
Wim Taymans 2009-05-31 19:10:02 +02:00 committed by Wim Taymans
parent 8c54c70d9c
commit 5479772bec
1 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1575,32 +1575,45 @@ handle_stepping (GstBaseSink * sink, GstSegment * segment,
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
{ {
guint64 end; guint64 end;
gint64 last; gint64 first, last;
end = current->start + current->amount;
if (segment->rate > 0.0) { if (segment->rate > 0.0) {
current->position = *rstart - current->start; first = *rstart;
last = *rstop; last = *rstop;
} else { } else {
current->position = *rstop - current->start; first = *rstop;
last = *rstart; last = *rstart;
} }
end = current->start + current->amount;
current->position = first - current->start;
GST_DEBUG_OBJECT (sink, GST_DEBUG_OBJECT (sink,
"got time step %" GST_TIME_FORMAT "/%" GST_TIME_FORMAT, "buffer: %" GST_TIME_FORMAT "-%" GST_TIME_FORMAT,
GST_TIME_ARGS (current->position), GST_TIME_ARGS (current->amount)); GST_TIME_ARGS (first), GST_TIME_ARGS (last));
GST_DEBUG_OBJECT (sink,
"got time step %" GST_TIME_FORMAT "-%" GST_TIME_FORMAT "/%"
GST_TIME_FORMAT, GST_TIME_ARGS (current->position),
GST_TIME_ARGS (last - current->start),
GST_TIME_ARGS (current->amount));
if (current->position >= current->amount || last >= end) { if (current->position >= current->amount || last >= end) {
GST_DEBUG_OBJECT (sink, "step ended, we need clipping");
step_end = TRUE; step_end = TRUE;
if (segment->rate > 0.0) { if (segment->rate > 0.0) {
*cstart += end - *rstart; *cstart += end - *rstart;
*rstart = end; *rstart = end;
} else { } else {
*cstop += end - *rstop; *cstop += *rstop - end;
*rstop = end; *rstop = end;
} }
} }
GST_DEBUG_OBJECT (sink,
"cstart %" GST_TIME_FORMAT ", rstart %" GST_TIME_FORMAT,
GST_TIME_ARGS (*cstart), GST_TIME_ARGS (*rstart));
GST_DEBUG_OBJECT (sink,
"cstop %" GST_TIME_FORMAT ", rstop %" GST_TIME_FORMAT,
GST_TIME_ARGS (*cstop), GST_TIME_ARGS (*rstop));
break; break;
} }
case GST_FORMAT_BUFFERS: case GST_FORMAT_BUFFERS:
@ -1751,10 +1764,6 @@ gst_base_sink_get_sync_times (GstBaseSink * basesink, GstMiniObject * obj,
gst_segment_set_last_stop (segment, GST_FORMAT_TIME, cstart); gst_segment_set_last_stop (segment, GST_FORMAT_TIME, cstart);
do_times: do_times:
/* this can produce wrong values if we accumulated non-TIME segments. If this happens,
* upstream is behaving very badly */
sstart = gst_segment_to_stream_time (segment, format, cstart);
sstop = gst_segment_to_stream_time (segment, format, cstop);
rstart = gst_segment_to_running_time (segment, format, cstart); rstart = gst_segment_to_running_time (segment, format, cstart);
rstop = gst_segment_to_running_time (segment, format, cstop); rstop = gst_segment_to_running_time (segment, format, cstop);
@ -1763,6 +1772,10 @@ do_times:
&rstart, &rstop))) &rstart, &rstop)))
*stepped = TRUE; *stepped = TRUE;
} }
/* this can produce wrong values if we accumulated non-TIME segments. If this happens,
* upstream is behaving very badly */
sstart = gst_segment_to_stream_time (segment, format, cstart);
sstop = gst_segment_to_stream_time (segment, format, cstop);
eos_done: eos_done:
/* done label only called when doing EOS, we also stop stepping then */ /* done label only called when doing EOS, we also stop stepping then */
@ -2156,6 +2169,13 @@ do_step:
priv->eos_rtime = (do_sync ? priv->current_rstop : -1); priv->eos_rtime = (do_sync ? priv->current_rstop : -1);
again: again:
/* Before preroll we store the position of the last buffer so that we can use
* it to report the position. We need to take the lock here. */
GST_OBJECT_LOCK (basesink);
priv->current_sstart = sstart;
priv->current_sstop = (sstop != -1 ? sstop : sstart);
GST_OBJECT_UNLOCK (basesink);
/* first do preroll, this makes sure we commit our state /* first do preroll, this makes sure we commit our state
* to PAUSED and can continue to PLAYING. We cannot perform * to PAUSED and can continue to PLAYING. We cannot perform
* any clock sync in PAUSED because there is no clock. */ * any clock sync in PAUSED because there is no clock. */
@ -2170,13 +2190,6 @@ again:
goto do_step; goto do_step;
} }
/* After rendering we store the position of the last buffer so that we can use
* it to report the position. We need to take the lock here. */
GST_OBJECT_LOCK (basesink);
priv->current_sstart = sstart;
priv->current_sstop = (sstop != -1 ? sstop : sstart);
GST_OBJECT_UNLOCK (basesink);
if (!do_sync) if (!do_sync)
goto done; goto done;
@ -3999,6 +4012,11 @@ gst_base_sink_get_position_paused (GstBaseSink * basesink, GstFormat format,
if (oformat == GST_FORMAT_TIME) { if (oformat == GST_FORMAT_TIME) {
*cur = basesink->priv->current_sstart; *cur = basesink->priv->current_sstart;
if (segment->rate < 0.0 && basesink->priv->current_sstop != -1) {
/* for reverse playback we prefer the stream time stop position if we have
* one */
*cur = basesink->priv->current_sstop;
}
} else { } else {
*cur = gst_segment_to_stream_time (segment, oformat, segment->last_stop); *cur = gst_segment_to_stream_time (segment, oformat, segment->last_stop);
} }