mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 05:31:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

basesink: don't compensate for render-delay twice

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=667298
This commit is contained in:
Havard Graff 2011-11-29 14:22:44 +01:00 committed by Tim-Philipp Müller
parent 17d5f4dc31
commit bea0ed2fc1
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2411,8 +2411,7 @@ gst_base_sink_wait_eos (GstBaseSink * sink, GstClockTime time,
GST_DEBUG_OBJECT (sink, "possibly waiting for clock to reach %" GST_DEBUG_OBJECT (sink, "possibly waiting for clock to reach %"
GST_TIME_FORMAT, GST_TIME_ARGS (time)); GST_TIME_FORMAT, GST_TIME_ARGS (time));
/* compensate for latency and ts_offset. We don't adjust for render delay /* compensate for latency, ts_offset and render delay */
* because we don't interact with the device on EOS normally. */
stime = gst_base_sink_adjust_time (sink, time); stime = gst_base_sink_adjust_time (sink, time);
/* wait for the clock, this can be interrupted because we got shut down or /* wait for the clock, this can be interrupted because we got shut down or
@ -2563,14 +2562,6 @@ again:
/* adjust for latency */ /* adjust for latency */
stime = gst_base_sink_adjust_time (basesink, rstart); stime = gst_base_sink_adjust_time (basesink, rstart);
/* adjust for render-delay, avoid underflows */
if (GST_CLOCK_TIME_IS_VALID (stime)) {
if (stime > priv->render_delay)
stime -= priv->render_delay;
else
stime = 0;
}
/* preroll done, we can sync since we are in PLAYING now. */ /* preroll done, we can sync since we are in PLAYING now. */
GST_DEBUG_OBJECT (basesink, "possibly waiting for clock to reach %" GST_DEBUG_OBJECT (basesink, "possibly waiting for clock to reach %"
GST_TIME_FORMAT ", adjusted %" GST_TIME_FORMAT, GST_TIME_FORMAT ", adjusted %" GST_TIME_FORMAT,