mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 04:56:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioparse: Allow implicit channel map for 1-/2-channel audio

Browse source 
This makes sure we don't set an empty channel map array for 1-/2-channel
audio, causing an assert later on.
This commit is contained in:
Arun Raghavan 2010-12-06 22:48:09 +05:30 committed by Edward Hervey
parent 8974371914
commit 7abe0a56af
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/rawparse/gstaudioparse.c
View file

@ -373,6 +373,11 @@ gst_audio_parse_set_channel_positions (GstAudioParse * ap, GstStructure * s)
GValue pos_array = { 0, }; GValue pos_array = { 0, };
gint i; gint i;
if (!ap->channel_positions && ap->channels <= 2) {
/* Implicit mapping for 1- and 2-channel audio is okay */
return;
}
g_value_init (&pos_array, GST_TYPE_ARRAY); g_value_init (&pos_array, GST_TYPE_ARRAY);
if (ap->channel_positions if (ap->channel_positions
@ -382,7 +387,8 @@ gst_audio_parse_set_channel_positions (GstAudioParse * ap, GstStructure * s)
for (i = 0; i < ap->channels; i++) for (i = 0; i < ap->channels; i++)
gst_value_array_append_value (&pos_array, gst_value_array_append_value (&pos_array,
g_value_array_get_nth (ap->channel_positions, i)); g_value_array_get_nth (ap->channel_positions, i));
} else if (ap->channels != 1 && ap->channels != 2) { } else {
/* >2 channels and no explicit mapping */
GValue pos_none = { 0, }; GValue pos_none = { 0, };
GST_WARNING_OBJECT (ap, "Using NONE channel positions"); GST_WARNING_OBJECT (ap, "Using NONE channel positions");