mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-26 09:50:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioconvert: Fix channel-mask handling

Browse source
This commit is contained in:
Sebastian Dröge 2012-01-04 10:26:33 +01:00
parent 31c9f7d09a
commit 241de164ee
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/audioconvert/gstaudioconvert.c
View file

@ -469,9 +469,11 @@ gst_audio_convert_fixate_channels (GstBaseTransform * base, GstStructure * ins,
/* channels == 1 => MONO */ /* channels == 1 => MONO */
if (out_chans == 2) { if (out_chans == 2) {
out_mask = out_mask =
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT | GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_LEFT) |
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT; GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_RIGHT);
has_out_mask = TRUE; has_out_mask = TRUE;
gst_structure_set (outs, "channel-mask", GST_TYPE_BITMASK, out_mask,
NULL);
} }
} }
@ -483,8 +485,8 @@ gst_audio_convert_fixate_channels (GstBaseTransform * base, GstStructure * ins,
/* channels == 1 => MONO */ /* channels == 1 => MONO */
if (in_chans == 2) { if (in_chans == 2) {
in_mask = in_mask =
GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT | GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_LEFT) |
GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT; GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_RIGHT);
has_in_mask = TRUE; has_in_mask = TRUE;
} else if (in_chans > 2) } else if (in_chans > 2)
g_warning ("%s: Upstream caps contain no channel mask", g_warning ("%s: Upstream caps contain no channel mask",
@ -571,7 +573,7 @@ gst_audio_convert_fixate_channels (GstBaseTransform * base, GstStructure * ins,
out_mask = 0; out_mask = 0;
for (i = 0; i < out_chans; i++) for (i = 0; i < out_chans; i++)
out_mask |= default_positions[out_chans - 1][i]; out_mask |= G_GUINT64_CONSTANT (1) << default_positions[out_chans - 1][i];
gst_structure_set (outs, "channel-mask", GST_TYPE_BITMASK, out_mask, NULL); gst_structure_set (outs, "channel-mask", GST_TYPE_BITMASK, out_mask, NULL);
} else { } else {