mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

osxaudiosink: Allow renegotiating caps

Browse source 
Once osxaudiosink's device is open, it fixates on the initial caps and
refuses to accept new caps. This is erroneous since the Audio Unit is
can accept a new ASBD, and GstAudioRingBuffer supports reconfiguration
as well.

https://bugzilla.gnome.org/show_bug.cgi?id=743925
This commit is contained in:
Ilya Konstantinov 2015-02-21 14:41:08 +02:00 committed by Arun Raghavan
parent 8cd40e77b7
commit fd25ef137e
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/osxaudio/gstosxaudiosink.c
View file

@ -363,17 +363,12 @@ gst_osx_audio_sink_getcaps (GstBaseSink * sink, GstCaps * filter)
if (buf) { if (buf) {
GST_OBJECT_LOCK (buf); GST_OBJECT_LOCK (buf);
if (buf->acquired && buf->spec.caps) { if (buf->open && !osxsink->cached_caps) {
/* Caps are fixed, use what we have */
ret = gst_caps_ref (buf->spec.caps);
}
if (!ret && buf->open && !osxsink->cached_caps) {
/* Device is open, let's probe its caps */ /* Device is open, let's probe its caps */
gst_osx_audio_sink_probe_caps (osxsink); gst_osx_audio_sink_probe_caps (osxsink);
} }
if (!ret && osxsink->cached_caps) if (osxsink->cached_caps)
ret = gst_caps_ref (osxsink->cached_caps); ret = gst_caps_ref (osxsink->cached_caps);
GST_OBJECT_UNLOCK (buf); GST_OBJECT_UNLOCK (buf);
@ -381,7 +376,10 @@ gst_osx_audio_sink_getcaps (GstBaseSink * sink, GstCaps * filter)
gst_object_unref (buf); gst_object_unref (buf);
} }
if (ret && filter) { if (!ret)
ret = gst_pad_get_pad_template_caps (GST_AUDIO_BASE_SINK_PAD (osxsink));
if (filter) {
GstCaps *tmp; GstCaps *tmp;
tmp = gst_caps_intersect_full (filter, ret, GST_CAPS_INTERSECT_FIRST); tmp = gst_caps_intersect_full (filter, ret, GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (ret); gst_caps_unref (ret);