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

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Sebastian Dröge 2011-05-20 13:06:57 +02:00
commit ce216c1406
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2064,14 +2064,21 @@ gst_base_sink_wait_clock (GstBaseSink * sink, GstClockTime time,
time += base_time;
/* Re-use existing clockid if available */
if (G_LIKELY (sink->priv->cached_clock_id != NULL)) {
/* FIXME: Casting to GstClockEntry only works because the types
* are the same */
if (G_LIKELY (sink->priv->cached_clock_id != NULL
&& GST_CLOCK_ENTRY_CLOCK ((GstClockEntry *) sink->
priv->cached_clock_id) == clock)) {
if (!gst_clock_single_shot_id_reinit (clock, sink->priv->cached_clock_id,
time)) {
gst_clock_id_unref (sink->priv->cached_clock_id);
sink->priv->cached_clock_id = gst_clock_new_single_shot_id (clock, time);
}
} else
} else {
if (sink->priv->cached_clock_id != NULL)
gst_clock_id_unref (sink->priv->cached_clock_id);
sink->priv->cached_clock_id = gst_clock_new_single_shot_id (clock, time);
}
GST_OBJECT_UNLOCK (sink);
/* A blocking wait is performed on the clock. We save the ClockID