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

osxaudiosink: channel-mask configuration fixes

Browse source 
Set channel-mask according to sink's layout in case of stereo layout.
Also initialize and reset the mask when an unrecognized channel is detected.

https://bugzilla.gnome.org/show_bug.cgi?id=698224
This commit is contained in:
Philippe Normand 2013-04-17 21:05:14 +02:00 committed by Sebastian Dröge
parent b5a9ed20e1
commit d352201a34
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/osxaudio/gstosxaudiosink.c
View file

@ -537,7 +537,7 @@ gst_osx_audio_sink_allowed_caps (GstOsxAudioSink * osxsink)
GstElementClass *element_class; GstElementClass *element_class;
GstPadTemplate *pad_template; GstPadTemplate *pad_template;
GstCaps *caps, *in_caps; GstCaps *caps, *in_caps;
guint64 channel_mask; guint64 channel_mask = 0;
GstAudioChannelPosition *pos = osxsink->channel_positions; GstAudioChannelPosition *pos = osxsink->channel_positions;
/* First collect info about the HW capabilites and preferences */ /* First collect info about the HW capabilites and preferences */
@ -567,6 +567,8 @@ gst_osx_audio_sink_allowed_caps (GstOsxAudioSink * osxsink)
case 2: case 2:
pos[0] = GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT; pos[0] = GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT;
pos[1] = GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT; pos[1] = GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT;
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_LEFT);
channel_mask |= GST_AUDIO_CHANNEL_POSITION_MASK (FRONT_RIGHT);
break; break;
default: default:
channels = MIN (layout->mNumberChannelDescriptions, channels = MIN (layout->mNumberChannelDescriptions,
@ -612,6 +614,7 @@ gst_osx_audio_sink_allowed_caps (GstOsxAudioSink * osxsink)
default: default:
GST_WARNING_OBJECT (osxsink, "unrecognized channel: %d", GST_WARNING_OBJECT (osxsink, "unrecognized channel: %d",
(int) layout->mChannelDescriptions[i].mChannelLabel); (int) layout->mChannelDescriptions[i].mChannelLabel);
channel_mask = 0;
channels = 2; channels = 2;
break; break;
} }