mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-01 21:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioconvert: Support converting >64 channels

Browse source 
There's nothing requiring <= 64 channels except for getting the reorder
map and creating a channel mixing matrix, but those won't be possible to
call anyway as channel positions can only express up to 64 channels.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6819>
This commit is contained in:
Sebastian Dröge 2024-05-09 09:57:54 +03:00 committed by GStreamer Marge Bot
parent d68ac0db57
commit 399b147d90
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-base/gst-libs/gst/audio/audio-channel-mixer.c
View file

@ -958,8 +958,6 @@ gst_audio_channel_mixer_new_with_matrix (GstAudioChannelMixerFlags flags,
|| format == GST_AUDIO_FORMAT_S32 || format == GST_AUDIO_FORMAT_S32
|| format == GST_AUDIO_FORMAT_F32 || format == GST_AUDIO_FORMAT_F32
|| format == GST_AUDIO_FORMAT_F64, NULL); || format == GST_AUDIO_FORMAT_F64, NULL);
g_return_val_if_fail (in_channels > 0 && in_channels <= 64, NULL);
g_return_val_if_fail (out_channels > 0 && out_channels <= 64, NULL);
mix = g_new0 (GstAudioChannelMixer, 1); mix = g_new0 (GstAudioChannelMixer, 1);
mix->in_channels = in_channels; mix->in_channels = in_channels;
@ -1120,8 +1118,6 @@ gst_audio_channel_mixer_new (GstAudioChannelMixerFlags flags,
|| format == GST_AUDIO_FORMAT_S32 || format == GST_AUDIO_FORMAT_S32
|| format == GST_AUDIO_FORMAT_F32 || format == GST_AUDIO_FORMAT_F32
|| format == GST_AUDIO_FORMAT_F64, NULL); || format == GST_AUDIO_FORMAT_F64, NULL);
g_return_val_if_fail (in_channels > 0 && in_channels <= 64, NULL);
g_return_val_if_fail (out_channels > 0 && out_channels <= 64, NULL);
matrix = matrix =
gst_audio_channel_mixer_setup_matrix (flags, in_channels, in_position, gst_audio_channel_mixer_setup_matrix (flags, in_channels, in_position,

4
subprojects/gst-plugins-base/gst-libs/gst/audio/audio-channels.c
View file

@ -222,7 +222,6 @@ gst_audio_reorder_channels (gpointer data, gsize size, GstAudioFormat format,
g_return_val_if_fail (info->width <= 8 * 64, FALSE); g_return_val_if_fail (info->width <= 8 * 64, FALSE);
g_return_val_if_fail (size % ((info->width * channels) / 8) == 0, FALSE); g_return_val_if_fail (size % ((info->width * channels) / 8) == 0, FALSE);
g_return_val_if_fail (channels > 0, FALSE); g_return_val_if_fail (channels > 0, FALSE);
g_return_val_if_fail (channels <= 64, FALSE);
if (size == 0) if (size == 0)
return TRUE; return TRUE;
@ -230,6 +229,8 @@ gst_audio_reorder_channels (gpointer data, gsize size, GstAudioFormat format,
if (gst_audio_channel_positions_equal (from, to, channels)) if (gst_audio_channel_positions_equal (from, to, channels))
return TRUE; return TRUE;
g_return_val_if_fail (channels <= 64, FALSE);
if (!gst_audio_get_channel_reorder_map (channels, from, to, reorder_map)) if (!gst_audio_get_channel_reorder_map (channels, from, to, reorder_map))
return FALSE; return FALSE;
@ -454,6 +455,7 @@ gst_audio_get_channel_reorder_map (gint channels,
g_return_val_if_fail (reorder_map != NULL, FALSE); g_return_val_if_fail (reorder_map != NULL, FALSE);
g_return_val_if_fail (channels > 0, FALSE); g_return_val_if_fail (channels > 0, FALSE);
g_return_val_if_fail (channels <= 64, FALSE);
g_return_val_if_fail (from != NULL, FALSE); g_return_val_if_fail (from != NULL, FALSE);
g_return_val_if_fail (to != NULL, FALSE); g_return_val_if_fail (to != NULL, FALSE);
g_return_val_if_fail (check_valid_channel_positions (from, channels, FALSE, g_return_val_if_fail (check_valid_channel_positions (from, channels, FALSE,