mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 02:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst-libs/gst/audio/gstbaseaudiosink.c: Don't try to provide a clock when we are not negotiated since we might not be ...

Browse source 
Original commit message from CVS:
* gst-libs/gst/audio/gstbaseaudiosink.c:
(gst_base_audio_sink_provide_clock),
(gst_base_audio_sink_set_property),
(gst_base_audio_sink_get_property), (gst_base_audio_sink_render):
Don't try to provide a clock when we are not negotiated since
we might not be able to make it run.
This commit is contained in:
Wim Taymans 2006-02-02 18:13:26 +00:00
parent 12e851ba38
commit c78a5d7e1e
2 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2006-02-02 Wim Taymans <wim@fluendo.com>
* gst-libs/gst/audio/gstbaseaudiosink.c:
(gst_base_audio_sink_provide_clock),
(gst_base_audio_sink_set_property),
(gst_base_audio_sink_get_property), (gst_base_audio_sink_render):
Don't try to provide a clock when we are not negotiated since
we might not be able to make it run.
2006-02-02 Tim-Philipp Müller <tim at centricular dot net> 2006-02-02 Tim-Philipp Müller <tim at centricular dot net>
* gst/playback/gstdecodebin.c: (try_to_link_1): * gst/playback/gstdecodebin.c: (try_to_link_1):

29
gst-libs/gst/audio/gstbaseaudiosink.c
View file

@ -181,12 +181,29 @@ gst_base_audio_sink_provide_clock (GstElement * elem)
sink = GST_BASE_AUDIO_SINK (elem); sink = GST_BASE_AUDIO_SINK (elem);
if (!gst_ring_buffer_is_acquired (sink->ringbuffer))
goto wrong_state;
GST_OBJECT_LOCK (sink);
if (sink->provide_clock) if (sink->provide_clock)
clock = GST_CLOCK_CAST (gst_object_ref (sink->provided_clock)); goto clock_disabled;
else
clock = NULL; clock = GST_CLOCK_CAST (gst_object_ref (sink->provided_clock));
GST_OBJECT_UNLOCK (sink);
return clock; return clock;
wrong_state:
{
GST_DEBUG_OBJECT (sink, "ringbuffer not acquired");
return NULL;
}
clock_disabled:
{
GST_DEBUG_OBJECT (sink, "clock provide disabled");
GST_OBJECT_UNLOCK (sink);
return NULL;
}
} }
static GstClockTime static GstClockTime
@ -222,7 +239,9 @@ gst_base_audio_sink_set_property (GObject * object, guint prop_id,
sink->latency_time = g_value_get_int64 (value); sink->latency_time = g_value_get_int64 (value);
break; break;
case PROP_PROVIDE_CLOCK: case PROP_PROVIDE_CLOCK:
GST_OBJECT_LOCK (sink);
sink->provide_clock = g_value_get_boolean (value); sink->provide_clock = g_value_get_boolean (value);
GST_OBJECT_UNLOCK (sink);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -246,7 +265,9 @@ gst_base_audio_sink_get_property (GObject * object, guint prop_id,
g_value_set_int64 (value, sink->latency_time); g_value_set_int64 (value, sink->latency_time);
break; break;
case PROP_PROVIDE_CLOCK: case PROP_PROVIDE_CLOCK:
GST_OBJECT_LOCK (sink);
g_value_set_boolean (value, sink->provide_clock); g_value_set_boolean (value, sink->provide_clock);
GST_OBJECT_UNLOCK (sink);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -543,7 +564,7 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf)
/* we tollerate a 10th of a second diff before we start resyncing. This /* we tollerate a 10th of a second diff before we start resyncing. This
* should be enough to compensate for various rounding errors in the timestamp * should be enough to compensate for various rounding errors in the timestamp
* and sample offset position. */ * and sample offset position. We always resync if we got a discont anyway. */
if (diff < ringbuf->spec.rate / DIFF_TOLERANCE) { if (diff < ringbuf->spec.rate / DIFF_TOLERANCE) {
GST_DEBUG_OBJECT (sink, GST_DEBUG_OBJECT (sink,
"align with prev sample, %" G_GINT64_FORMAT " < %lu", diff, "align with prev sample, %" G_GINT64_FORMAT " < %lu", diff,