mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio: Improve/fix handling of NONE layouts

Browse source
This commit is contained in:
Sebastian Dröge 2012-01-04 14:48:33 +01:00
parent 8dcea5d498
commit 9e072ea844
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gst-libs/gst/audio/audio.c
View file

@ -424,7 +424,8 @@ check_valid_channel_positions (const GstAudioChannelPosition * position,
j++; j++;
if (position[i] == GST_AUDIO_CHANNEL_POSITION_INVALID || if (position[i] == GST_AUDIO_CHANNEL_POSITION_INVALID ||
position[i] == GST_AUDIO_CHANNEL_POSITION_MONO) position[i] == GST_AUDIO_CHANNEL_POSITION_MONO ||
position[i] == GST_AUDIO_CHANNEL_POSITION_NONE)
return FALSE; return FALSE;
/* Is this in valid channel order? */ /* Is this in valid channel order? */
@ -459,10 +460,10 @@ gst_audio_info_set_format (GstAudioInfo * info, GstAudioFormat format,
gint rate, gint channels, const GstAudioChannelPosition * position) gint rate, gint channels, const GstAudioChannelPosition * position)
{ {
const GstAudioFormatInfo *finfo; const GstAudioFormatInfo *finfo;
gint i;
g_return_if_fail (info != NULL); g_return_if_fail (info != NULL);
g_return_if_fail (format != GST_AUDIO_FORMAT_UNKNOWN); g_return_if_fail (format != GST_AUDIO_FORMAT_UNKNOWN);
g_return_if_fail (channels <= 2 || position != NULL);
finfo = &formats[format]; finfo = &formats[format];
@ -477,17 +478,27 @@ gst_audio_info_set_format (GstAudioInfo * info, GstAudioFormat format,
if (!position && channels == 1) { if (!position && channels == 1) {
info->position[0] = GST_AUDIO_CHANNEL_POSITION_MONO; info->position[0] = GST_AUDIO_CHANNEL_POSITION_MONO;
return;
} else if (!position && channels == 2) { } else if (!position && channels == 2) {
info->position[0] = GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT; info->position[0] = GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT;
info->position[1] = GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT; info->position[1] = GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT;
return;
} else { } else {
if (!check_valid_channel_positions (position, channels, TRUE, NULL)) { if (!check_valid_channel_positions (position, channels, TRUE, NULL)) {
g_warning ("Invalid channel positions"); g_warning ("Invalid channel positions");
} else { } else {
memcpy (&info->position, position, memcpy (&info->position, position,
info->channels * sizeof (info->position[0])); info->channels * sizeof (info->position[0]));
if (info->position[0] == GST_AUDIO_CHANNEL_POSITION_NONE)
info->flags |= GST_AUDIO_FLAG_UNPOSITIONED;
return;
} }
} }
/* Otherwise a NONE layout */
info->flags |= GST_AUDIO_FLAG_UNPOSITIONED;
for (i = 0; i < MIN (64, channels); i++)
info->position[i] = GST_AUDIO_CHANNEL_POSITION_NONE;
} }
/** /**
@ -553,7 +564,8 @@ gst_audio_info_from_caps (GstAudioInfo * info, const GstCaps * caps)
goto no_channel_mask; goto no_channel_mask;
} }
} else if (channel_mask == 0) { } else if (channel_mask == 0) {
for (i = 0; i < G_N_ELEMENTS (position); i++) info->flags |= GST_AUDIO_FLAG_UNPOSITIONED;
for (i = 0; i < MIN (64, channels); i++)
position[i] = GST_AUDIO_CHANNEL_POSITION_NONE; position[i] = GST_AUDIO_CHANNEL_POSITION_NONE;
} else { } else {
gint j; gint j;
@ -665,9 +677,13 @@ gst_audio_info_to_caps (const GstAudioInfo * info)
|| info->position[0] != GST_AUDIO_CHANNEL_POSITION_MONO) { || info->position[0] != GST_AUDIO_CHANNEL_POSITION_MONO) {
guint64 channel_mask = 0; guint64 channel_mask = 0;
if (!check_valid_channel_positions (info->position, info->channels, if ((info->flags & GST_AUDIO_FLAG_UNPOSITIONED)) {
TRUE, &channel_mask)) channel_mask = 0;
goto invalid_channel_positions; } else {
if (!check_valid_channel_positions (info->position, info->channels,
TRUE, &channel_mask))
goto invalid_channel_positions;
}
if (info->channels == 1 if (info->channels == 1
&& info->position[0] == GST_AUDIO_CHANNEL_POSITION_MONO) { && info->position[0] == GST_AUDIO_CHANNEL_POSITION_MONO) {