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

osxaudiosink: Add some error handling around channel layout parsing

Browse source 
For now we just spit a warning and ignore the channel layout if we can't
support it.

https://bugzilla.gnome.org/show_bug.cgi?id=740987
This commit is contained in:
Arun Raghavan 2014-12-09 13:38:26 +05:30
parent d18a6b0a2c
commit f573f028d2
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sys/osxaudio/gstosxaudiosink.c
View file

@ -632,6 +632,10 @@ gst_osx_audio_sink_probe_caps (GstOsxAudioSink * osxsink)
g_free (layout);
if (!gst_audio_channel_positions_to_mask (pos, channels, TRUE, &channel_mask)) {
GST_WARNING_OBJECT (osxsink, "Probably unsupported channel order");
}
/* Recover the template caps */
element_class = GST_ELEMENT_GET_CLASS (osxsink);
pad_template = gst_element_class_get_pad_template (element_class, "sink");
@ -650,11 +654,17 @@ gst_osx_audio_sink_probe_caps (GstOsxAudioSink * osxsink)
gst_caps_append_structure (caps, gst_structure_copy (in_s));
}
} else {
gst_audio_channel_positions_to_mask (pos, channels, false, &channel_mask);
out_s = gst_structure_copy (in_s);
gst_structure_remove_fields (out_s, "channels", "channel-mask", NULL);
gst_structure_set (out_s, "channels", G_TYPE_INT, channels,
"channel-mask", GST_TYPE_BITMASK, channel_mask, NULL);
gst_structure_remove_fields (out_s, "channels", NULL);
gst_structure_set (out_s, "channels", G_TYPE_INT, channels, NULL);
if (channel_mask) {
gst_structure_remove_fields (out_s, "channel-mask", NULL);
gst_structure_set (out_s, "channel-mask", GST_TYPE_BITMASK,
channel_mask, NULL);
}
gst_caps_append_structure (caps, out_s);
}
}