mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 23:32:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

channelmix: don't limit channelpositions

Browse source 
Don't set a limit on the channel positions, just like the metadata.
This commit is contained in:
Wim Taymans 2015-11-06 16:42:35 +01:00
parent 9fbe0386d0
commit 268ed5dd6f
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/audioconvert/gstchannelmix.c
View file

@ -785,16 +785,16 @@ GstAudioChannelMix *
gst_audio_channel_mix_new (GstAudioChannelMixFlags flags, gst_audio_channel_mix_new (GstAudioChannelMixFlags flags,
GstAudioFormat format, GstAudioFormat format,
gint in_channels, gint in_channels,
GstAudioChannelPosition in_position[64], GstAudioChannelPosition * in_position,
gint out_channels, GstAudioChannelPosition out_position[64]) gint out_channels, GstAudioChannelPosition * out_position)
{ {
GstAudioChannelMix *mix; GstAudioChannelMix *mix;
gint i; gint i;
g_return_val_if_fail (format == GST_AUDIO_FORMAT_S32 g_return_val_if_fail (format == GST_AUDIO_FORMAT_S32
|| format == GST_AUDIO_FORMAT_F64, NULL); || format == GST_AUDIO_FORMAT_F64, NULL);
g_return_val_if_fail (in_channels > 0, NULL); g_return_val_if_fail (in_channels > 0 && in_channels < 64, NULL);
g_return_val_if_fail (out_channels > 0, NULL); g_return_val_if_fail (out_channels > 0 && out_channels < 64, NULL);
mix = g_slice_new0 (GstAudioChannelMix); mix = g_slice_new0 (GstAudioChannelMix);
mix->flags = flags; mix->flags = flags;
@ -802,10 +802,11 @@ gst_audio_channel_mix_new (GstAudioChannelMixFlags flags,
mix->in_channels = in_channels; mix->in_channels = in_channels;
mix->out_channels = out_channels; mix->out_channels = out_channels;
for (i = 0; i < 64; i++) { for (i = 0; i < in_channels; i++)
mix->in_position[i] = in_position[i]; mix->in_position[i] = in_position[i];
for (i = 0; i < out_channels; i++)
mix->out_position[i] = out_position[i]; mix->out_position[i] = out_position[i];
}
gst_audio_channel_mix_setup_matrix (mix); gst_audio_channel_mix_setup_matrix (mix);
switch (mix->format) { switch (mix->format) {

4
gst/audioconvert/gstchannelmix.h
View file

@ -47,9 +47,9 @@ typedef enum {
GstAudioChannelMix * gst_audio_channel_mix_new (GstAudioChannelMixFlags flags, GstAudioChannelMix * gst_audio_channel_mix_new (GstAudioChannelMixFlags flags,
GstAudioFormat format, GstAudioFormat format,
gint in_channels, gint in_channels,
GstAudioChannelPosition in_position[64], GstAudioChannelPosition *in_position,
gint out_channels, gint out_channels,
GstAudioChannelPosition out_position[64]); GstAudioChannelPosition *out_position);
void gst_audio_channel_mix_free (GstAudioChannelMix *mix); void gst_audio_channel_mix_free (GstAudioChannelMix *mix);
/* /*