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

riff-media: allow more channel_masks

Browse source 
Allow partial valid channel masks.
Set channel mask to 0 for non-valid channel masks.

https://bugzilla.gnome.org/show_bug.cgi?id=733405
This commit is contained in:
Peter G. Baum 2014-10-03 12:57:52 +02:00 committed by Sebastian Dröge
parent c734fbc139
commit 7b211bf6b3
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gst-libs/gst/riff/riff-media.c
View file

@ -1021,26 +1021,24 @@ gst_riff_wavext_add_channel_mask (GstCaps * caps, gint num_channels,
{ {
gint i, p; gint i, p;
guint64 channel_mask = 0; guint64 channel_mask = 0;
GstAudioChannelPosition from[18], to[18]; GstAudioChannelPosition *from, *to;
gboolean ret = FALSE;
if (num_channels < 1 || num_channels > MAX_CHANNEL_POSITIONS) { if (num_channels < 1) {
GST_DEBUG ("invalid number of channels: %d", num_channels); GST_DEBUG ("invalid number of channels: %d", num_channels);
return FALSE; return FALSE;
} }
from = g_new (GstAudioChannelPosition, num_channels);
to = g_new (GstAudioChannelPosition, num_channels);
p = 0; p = 0;
for (i = 0; i < MAX_CHANNEL_POSITIONS; ++i) { for (i = 0; i < MAX_CHANNEL_POSITIONS; ++i) {
if ((layout & layout_mapping[i].ms_mask) != 0) { if ((layout & layout_mapping[i].ms_mask) != 0) {
if (p >= num_channels) { if (p >= num_channels) {
GST_WARNING ("More bits set in the channel layout map than there " GST_WARNING ("More bits set in the channel layout map than there "
"are channels! Broken file"); "are channels! Setting channel-mask to 0.");
return FALSE; channel_mask = 0;
} break;
if (layout_mapping[i].gst_pos == GST_AUDIO_CHANNEL_POSITION_INVALID) {
GST_WARNING ("Unsupported channel position (mask 0x%08x) in channel "
"layout map - ignoring those channels", layout_mapping[i].ms_mask);
/* what to do? just ignore it and let downstream deal with a channel
* layout that has INVALID positions in it for now ... */
} }
channel_mask |= G_GUINT64_CONSTANT (1) << layout_mapping[i].gst_pos; channel_mask |= G_GUINT64_CONSTANT (1) << layout_mapping[i].gst_pos;
from[p] = layout_mapping[i].gst_pos; from[p] = layout_mapping[i].gst_pos;
@ -1048,25 +1046,33 @@ gst_riff_wavext_add_channel_mask (GstCaps * caps, gint num_channels,
} }
} }
if (p != num_channels) { if (channel_mask > 0 && channel_reorder_map) {
GST_WARNING ("Only %d bits set in the channel layout map, but there are " if (p != num_channels) {
"supposed to be %d channels! Broken file", p, num_channels); /* WAVEFORMATEXTENSIBLE allows to have more channels than bits in
return FALSE; * the channel mask. We accept this, too, and hope that downstream
} * can handle this */
GST_WARNING ("Partially unknown positions in channel mask");
if (channel_reorder_map) { for (; p < num_channels; ++p)
from[p] = GST_AUDIO_CHANNEL_POSITION_INVALID;
}
memcpy (to, from, sizeof (from[0]) * num_channels); memcpy (to, from, sizeof (from[0]) * num_channels);
if (!gst_audio_channel_positions_to_valid_order (to, num_channels)) if (!gst_audio_channel_positions_to_valid_order (to, num_channels))
return FALSE; goto fail;
if (!gst_audio_get_channel_reorder_map (num_channels, from, to, if (!gst_audio_get_channel_reorder_map (num_channels, from, to,
channel_reorder_map)) channel_reorder_map))
return FALSE; goto fail;
} }
gst_caps_set_simple (caps, "channel-mask", GST_TYPE_BITMASK, channel_mask, gst_caps_set_simple (caps, "channel-mask", GST_TYPE_BITMASK, channel_mask,
NULL); NULL);
return TRUE; ret = TRUE;
fail:
g_free (from);
g_free (to);
return ret;
} }
static gboolean static gboolean