summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d690fce)
raw | patch | inline | side by side (parent: d690fce)
author | Havard Graff <havard.graff@tandberg.com> | |
Tue, 29 Nov 2011 13:22:44 +0000 (14:22 +0100) | ||
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | |
Thu, 5 Jan 2012 18:15:57 +0000 (18:15 +0000) |
https://bugzilla.gnome.org/show_bug.cgi?id=667298
libs/gst/base/gstbasesink.c | patch | blob | history |
index 338eeb52b98d45aa9cdf0e4dd1c0c62d9c0ae935..a610e2eb91def25e50abd446042686dc97c470a9 100644 (file)
GST_DEBUG_OBJECT (sink, "possibly waiting for clock to reach %"
GST_TIME_FORMAT, GST_TIME_ARGS (time));
- /* compensate for latency and ts_offset. We don't adjust for render delay
- * because we don't interact with the device on EOS normally. */
+ /* compensate for latency, ts_offset and render delay */
stime = gst_base_sink_adjust_time (sink, time);
/* wait for the clock, this can be interrupted because we got shut down or
/* adjust for latency */
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. */
GST_DEBUG_OBJECT (basesink, "possibly waiting for clock to reach %"
GST_TIME_FORMAT ", adjusted %" GST_TIME_FORMAT,