mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

osxaudio: Use gst_audio_channel_positions_to_mask() to create mask

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=698807
This commit is contained in:
Todd Agulnick 2013-04-17 16:47:31 -07:00 committed by Sebastian Dröge
parent e7710c2655
commit a30634a248
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/osxaudio/gstosxaudiosink.c
View file

@ -574,39 +574,30 @@ gst_osx_audio_sink_allowed_caps (GstOsxAudioSink * osxsink)
switch (layout->mChannelDescriptions[i].mChannelLabel) { switch (layout->mChannelDescriptions[i].mChannelLabel) {
case kAudioChannelLabel_Left: case kAudioChannelLabel_Left:
pos[i] = GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT; pos[i] = GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT;
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_LEFT);
break; break;
case kAudioChannelLabel_Right: case kAudioChannelLabel_Right:
pos[i] = GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT; pos[i] = GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT;
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_RIGHT);
break; break;
case kAudioChannelLabel_Center: case kAudioChannelLabel_Center:
pos[i] = GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER; pos[i] = GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER;
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_CENTER);
break; break;
case kAudioChannelLabel_LFEScreen: case kAudioChannelLabel_LFEScreen:
pos[i] = GST_AUDIO_CHANNEL_POSITION_LFE1; pos[i] = GST_AUDIO_CHANNEL_POSITION_LFE1;
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (LFE1);
break; break;
case kAudioChannelLabel_LeftSurround: case kAudioChannelLabel_LeftSurround:
pos[i] = GST_AUDIO_CHANNEL_POSITION_REAR_LEFT; pos[i] = GST_AUDIO_CHANNEL_POSITION_REAR_LEFT;
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (REAR_LEFT);
break; break;
case kAudioChannelLabel_RightSurround: case kAudioChannelLabel_RightSurround:
pos[i] = GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT; pos[i] = GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT;
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (REAR_RIGHT);
break; break;
case kAudioChannelLabel_RearSurroundLeft: case kAudioChannelLabel_RearSurroundLeft:
pos[i] = GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT; pos[i] = GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT;
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (SIDE_LEFT);
break; break;
case kAudioChannelLabel_RearSurroundRight: case kAudioChannelLabel_RearSurroundRight:
pos[i] = GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT; pos[i] = GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT;
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (SIDE_RIGHT);
break; break;
case kAudioChannelLabel_CenterSurround: case kAudioChannelLabel_CenterSurround:
pos[i] = GST_AUDIO_CHANNEL_POSITION_REAR_CENTER; pos[i] = GST_AUDIO_CHANNEL_POSITION_REAR_CENTER;
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (REAR_CENTER);
break; break;
default: default:
GST_WARNING_OBJECT (osxsink, "unrecognized channel: %d", GST_WARNING_OBJECT (osxsink, "unrecognized channel: %d",
@ -637,6 +628,7 @@ gst_osx_audio_sink_allowed_caps (GstOsxAudioSink * osxsink)
gst_caps_append_structure (caps, gst_structure_copy (in_s)); gst_caps_append_structure (caps, gst_structure_copy (in_s));
} }
} }
gst_audio_channel_positions_to_mask (pos, channels, false, &channel_mask);
out_s = gst_structure_copy (in_s); out_s = gst_structure_copy (in_s);
gst_structure_remove_fields (out_s, "channels", "channel-mask", NULL); gst_structure_remove_fields (out_s, "channels", "channel-mask", NULL);
gst_structure_set (out_s, "channels", G_TYPE_INT, channels, gst_structure_set (out_s, "channels", G_TYPE_INT, channels,