audio-channel-mixer: improve non-interleaved flags
authorWim Taymans <wtaymans@redhat.com>
Fri, 4 Mar 2016 16:13:59 +0000 (17:13 +0100)
committerWim Taymans <wtaymans@redhat.com>
Fri, 4 Mar 2016 16:17:33 +0000 (17:17 +0100)
Make separate flags for non-interleaved input and output because the
channel mixer should be able to convert between the two layouts in the
future.

gst-libs/gst/audio/audio-channel-mixer.h

index 90f6a57..813ef35 100644 (file)
@@ -31,17 +31,19 @@ typedef struct _GstAudioChannelMixer GstAudioChannelMixer;
 /**
  * GstAudioChannelMixerFlags:
  * @GST_AUDIO_CHANNEL_MIXER_FLAGS_NONE: no flag
- * @GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED: channels are not interleaved
+ * @GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_IN: input channels are not interleaved
+ * @GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_OUT: output channels are not interleaved
  * @GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_IN: input channels are explicitly unpositioned
  * @GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_OUT: output channels are explicitly unpositioned
  *
  * Flags passed to gst_audio_channel_mixer_new()
  */
 typedef enum {
-  GST_AUDIO_CHANNEL_MIXER_FLAGS_NONE             = 0,
-  GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED  = (1 << 0),
-  GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_IN  = (1 << 1),
-  GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_OUT = (1 << 2)
+  GST_AUDIO_CHANNEL_MIXER_FLAGS_NONE                = 0,
+  GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_IN  = (1 << 0),
+  GST_AUDIO_CHANNEL_MIXER_FLAGS_NON_INTERLEAVED_OUT = (1 << 1),
+  GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_IN     = (1 << 2),
+  GST_AUDIO_CHANNEL_MIXER_FLAGS_UNPOSITIONED_OUT    = (1 << 3)
 } GstAudioChannelMixerFlags;
 
 GstAudioChannelMixer * gst_audio_channel_mixer_new   (GstAudioChannelMixerFlags flags,