From 10f9331125cdc41a78cc8aa2bc08a5c2122b3b90 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 9 Jan 2009 15:43:17 +0000 Subject: [PATCH] libs/gst/base/gstbasesink.*: Fix documentation for the wait_clock method, rename basesink -> sink for consistency. Original commit message from CVS: * libs/gst/base/gstbasesink.c: (gst_base_sink_commit_state), (gst_base_sink_wait_clock): * libs/gst/base/gstbasesink.h: Fix documentation for the wait_clock method, rename basesink -> sink for consistency. --- ChangeLog | 8 ++++++++ libs/gst/base/gstbasesink.c | 31 ++++++++++++++++--------------- libs/gst/base/gstbasesink.h | 2 +- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7673049..dd3072e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-01-09 Wim Taymans + + * libs/gst/base/gstbasesink.c: (gst_base_sink_commit_state), + (gst_base_sink_wait_clock): + * libs/gst/base/gstbasesink.h: + Fix documentation for the wait_clock method, rename basesink -> sink + for consistency. + 2009-01-08 Stefan Kost * gst/gst.c: diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index c229b73..a142f5c 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -1346,6 +1346,7 @@ gst_base_sink_commit_state (GstBaseSink * basesink) /* make sure we notify the subclass of async playing */ if (bclass->async_play) { + GST_WARNING_OBJECT (basesink, "deprecated async_play"); ret = bclass->async_play (basesink); if (ret == GST_STATE_CHANGE_FAILURE) goto async_failed; @@ -1644,7 +1645,7 @@ gst_base_sink_adjust_time (GstBaseSink * basesink, GstClockTime time) * Returns: #GstClockReturn */ GstClockReturn -gst_base_sink_wait_clock (GstBaseSink * basesink, GstClockTime time, +gst_base_sink_wait_clock (GstBaseSink * sink, GstClockTime time, GstClockTimeDiff * jitter) { GstClockID id; @@ -1654,51 +1655,51 @@ gst_base_sink_wait_clock (GstBaseSink * basesink, GstClockTime time, if (G_UNLIKELY (!GST_CLOCK_TIME_IS_VALID (time))) goto invalid_time; - GST_OBJECT_LOCK (basesink); - if (G_UNLIKELY (!basesink->sync)) + GST_OBJECT_LOCK (sink); + if (G_UNLIKELY (!sink->sync)) goto no_sync; - if (G_UNLIKELY ((clock = GST_ELEMENT_CLOCK (basesink)) == NULL)) + if (G_UNLIKELY ((clock = GST_ELEMENT_CLOCK (sink)) == NULL)) goto no_clock; /* add base_time to running_time to get the time against the clock */ - time += GST_ELEMENT_CAST (basesink)->base_time; + time += GST_ELEMENT_CAST (sink)->base_time; id = gst_clock_new_single_shot_id (clock, time); - GST_OBJECT_UNLOCK (basesink); + GST_OBJECT_UNLOCK (sink); /* A blocking wait is performed on the clock. We save the ClockID * so we can unlock the entry at any time. While we are blocking, we * release the PREROLL_LOCK so that other threads can interrupt the * entry. */ - basesink->clock_id = id; + sink->clock_id = id; /* release the preroll lock while waiting */ - GST_PAD_PREROLL_UNLOCK (basesink->sinkpad); + GST_PAD_PREROLL_UNLOCK (sink->sinkpad); ret = gst_clock_id_wait (id, jitter); - GST_PAD_PREROLL_LOCK (basesink->sinkpad); + GST_PAD_PREROLL_LOCK (sink->sinkpad); gst_clock_id_unref (id); - basesink->clock_id = NULL; + sink->clock_id = NULL; return ret; /* no syncing needed */ invalid_time: { - GST_DEBUG_OBJECT (basesink, "time not valid, no sync needed"); + GST_DEBUG_OBJECT (sink, "time not valid, no sync needed"); return GST_CLOCK_BADTIME; } no_sync: { - GST_DEBUG_OBJECT (basesink, "sync disabled"); - GST_OBJECT_UNLOCK (basesink); + GST_DEBUG_OBJECT (sink, "sync disabled"); + GST_OBJECT_UNLOCK (sink); return GST_CLOCK_BADTIME; } no_clock: { - GST_DEBUG_OBJECT (basesink, "no clock, can't sync"); - GST_OBJECT_UNLOCK (basesink); + GST_DEBUG_OBJECT (sink, "no clock, can't sync"); + GST_OBJECT_UNLOCK (sink); return GST_CLOCK_BADTIME; } } diff --git a/libs/gst/base/gstbasesink.h b/libs/gst/base/gstbasesink.h index b084237..d9b26fb 100644 --- a/libs/gst/base/gstbasesink.h +++ b/libs/gst/base/gstbasesink.h @@ -227,7 +227,7 @@ GstClockTime gst_base_sink_get_render_delay (GstBaseSink *sink); void gst_base_sink_set_blocksize (GstBaseSink *sink, guint blocksize); guint gst_base_sink_get_blocksize (GstBaseSink *sink); -GstClockReturn gst_base_sink_wait_clock (GstBaseSink * basesink, GstClockTime time, +GstClockReturn gst_base_sink_wait_clock (GstBaseSink *sink, GstClockTime time, GstClockTimeDiff * jitter); GstFlowReturn gst_base_sink_wait_eos (GstBaseSink *sink, GstClockTime time, GstClockTimeDiff *jitter); -- 2.7.4