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

audioringbuffer: Use new function to get a channel reordering map

Browse source
This commit is contained in:
Sebastian Dröge 2011-12-24 10:54:20 +01:00
parent 9e930a1ade
commit bd40936409
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst-libs/gst/audio/gstaudioringbuffer.c
View file

@ -1883,7 +1883,7 @@ gst_audio_ring_buffer_set_channel_positions (GstAudioRingBuffer * buf,
{ {
const GstAudioChannelPosition *to; const GstAudioChannelPosition *to;
gint channels; gint channels;
gint i, j; gint i;
g_return_if_fail (GST_IS_AUDIO_RING_BUFFER (buf)); g_return_if_fail (GST_IS_AUDIO_RING_BUFFER (buf));
g_return_if_fail (buf->acquired); g_return_if_fail (buf->acquired);
@ -1895,25 +1895,9 @@ gst_audio_ring_buffer_set_channel_positions (GstAudioRingBuffer * buf,
if (memcmp (position, to, channels * sizeof (to[0])) == 0) if (memcmp (position, to, channels * sizeof (to[0])) == 0)
return; return;
/* Build reorder map and check compatibility */ if (!gst_audio_get_channel_reorder_map (channels, position, to,
for (i = 0; i < channels; i++) { buf->channel_reorder_map))
g_return_if_fail (position[i] == GST_AUDIO_CHANNEL_POSITION_NONE g_return_if_reached ();
|| to[i] == GST_AUDIO_CHANNEL_POSITION_NONE);
g_return_if_fail (position[i] == GST_AUDIO_CHANNEL_POSITION_INVALID
|| to[i] == GST_AUDIO_CHANNEL_POSITION_INVALID);
g_return_if_fail (position[i] == GST_AUDIO_CHANNEL_POSITION_MONO
|| to[i] == GST_AUDIO_CHANNEL_POSITION_MONO);
for (j = 0; j < channels; j++) {
if (position[i] == to[j]) {
buf->channel_reorder_map[i] = j;
break;
}
}
/* Not all channels present in both */
g_return_if_fail (j == channels);
}
for (i = 0; i < channels; i++) { for (i = 0; i < channels; i++) {
if (buf->channel_reorder_map[i] != i) { if (buf->channel_reorder_map[i] != i) {