mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-02 10:01:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

asiosink: Fix channel selection

Browse source 
Fixing copy paste mistake

Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3321
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6170>
This commit is contained in:
Seungha Yang 2024-02-20 20:38:55 +09:00 committed by GStreamer Marge Bot
parent cc7726ea39
commit 06dc931b52
3 changed files with 30 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-bad/sys/asio/gstasioobject.cpp
View file

@ -734,7 +734,7 @@ gst_asio_object_thread_func (GstAsioObject * self)
}
self->output_channel_requested =
g_new0 (gboolean, self->max_num_input_channels);
g_new0 (gboolean, self->max_num_output_channels);
}
asio_rst = asio_handle->getSampleRate (&self->sample_rate);

40
subprojects/gst-plugins-bad/sys/asio/gstasiosink.cpp
View file

@ -27,6 +27,7 @@
#include <atlconv.h>
#include <string.h>
#include <set>
#include <vector>
GST_DEBUG_CATEGORY_STATIC (gst_asio_sink_debug);
#define GST_CAT_DEFAULT gst_asio_sink_debug
@ -234,9 +235,8 @@ gst_asio_sink_create_ringbuffer (GstAudioBaseSink * sink)
GstAsioObject *asio_object = nullptr;
glong max_input_ch = 0;
glong max_output_ch = 0;
guint *channel_indices = nullptr;
guint num_capture_channels = 0;
std::set < guint > channel_list;
std::vector < guint > channel_indices;
guint i;
gchar *ringbuffer_name;
@ -286,27 +286,27 @@ gst_asio_sink_create_ringbuffer (GstAudioBaseSink * sink)
/* Configure channels to use */
if (!gst_asio_object_get_max_num_channels (asio_object, &max_input_ch,
&max_output_ch) || max_input_ch <= 0) {
GST_WARNING_OBJECT (self, "No available input channels");
&max_output_ch) || max_output_ch <= 0) {
GST_WARNING_OBJECT (self, "No available output channels");
goto out;
}
/* Check if user requested specific channle(s) */
/* Check if user requested specific channel(s) */
if (self->output_channels) {
gchar **ch;
ch = g_strsplit (self->output_channels, ",", 0);
num_capture_channels = g_strv_length (ch);
if (num_capture_channels > max_input_ch) {
auto num_channels = g_strv_length (ch);
if (num_channels > max_output_ch) {
GST_WARNING_OBJECT (self, "To many channels %d were requested",
num_capture_channels);
num_channels);
} else {
for (i = 0; i < num_capture_channels; i++) {
for (i = 0; i < num_channels; i++) {
guint64 c = g_ascii_strtoull (ch[i], nullptr, 0);
if (c >= (guint64) max_input_ch) {
if (c >= (guint64) max_output_ch) {
GST_WARNING_OBJECT (self, "Invalid channel index");
num_capture_channels = 0;
channel_list.clear ();
break;
}
@ -317,18 +317,12 @@ gst_asio_sink_create_ringbuffer (GstAudioBaseSink * sink)
g_strfreev (ch);
}
channel_indices = (guint *) g_alloca (sizeof (guint) * max_input_ch);
if (channel_list.size () == 0) {
for (i = 0; i < max_input_ch; i++)
channel_indices[i] = i;
num_capture_channels = max_input_ch;
for (i = 0; i < max_output_ch; i++)
channel_indices.push_back (i);
} else {
num_capture_channels = (guint) channel_list.size ();
i = 0;
for (auto iter:channel_list) {
channel_indices[i++] = iter;
}
for (auto iter : channel_indices)
channel_indices.push_back (iter);
}
ringbuffer_name = g_strdup_printf ("%s-asioringbuffer",
@ -344,8 +338,8 @@ gst_asio_sink_create_ringbuffer (GstAudioBaseSink * sink)
goto out;
}
if (!gst_asio_ring_buffer_configure (ringbuffer, channel_indices,
num_capture_channels, self->buffer_size)) {
if (!gst_asio_ring_buffer_configure (ringbuffer, channel_indices.data (),
channel_indices.size (), self->buffer_size)) {
GST_WARNING_OBJECT (self, "Failed to configure ringbuffer");
gst_clear_object (&ringbuffer);
goto out;

30
subprojects/gst-plugins-bad/sys/asio/gstasiosrc.cpp
View file

@ -27,6 +27,7 @@
#include <atlconv.h>
#include <string.h>
#include <set>
#include <vector>
GST_DEBUG_CATEGORY_STATIC (gst_asio_src_debug);
#define GST_CAT_DEFAULT gst_asio_src_debug
@ -247,9 +248,8 @@ gst_asio_src_create_ringbuffer (GstAudioBaseSrc * src)
GstAsioObject *asio_object = nullptr;
glong max_input_ch = 0;
glong max_output_ch = 0;
guint *channel_indices = nullptr;
guint num_capture_channels = 0;
std::set < guint > channel_list;
std::vector < guint > channel_indices;
guint i;
gchar *ringbuffer_name;
@ -310,16 +310,16 @@ gst_asio_src_create_ringbuffer (GstAudioBaseSrc * src)
ch = g_strsplit (self->capture_channles, ",", 0);
num_capture_channels = g_strv_length (ch);
if (num_capture_channels > max_input_ch) {
auto num_channels = g_strv_length (ch);
if (num_channels > max_input_ch) {
GST_WARNING_OBJECT (self, "To many channels %d were requested",
num_capture_channels);
num_channels);
} else {
for (i = 0; i < num_capture_channels; i++) {
for (i = 0; i < num_channels; i++) {
guint64 c = g_ascii_strtoull (ch[i], nullptr, 0);
if (c >= (guint64) max_input_ch) {
GST_WARNING_OBJECT (self, "Invalid channel index");
num_capture_channels = 0;
channel_list.clear ();
break;
}
@ -330,18 +330,12 @@ gst_asio_src_create_ringbuffer (GstAudioBaseSrc * src)
g_strfreev (ch);
}
channel_indices = (guint *) g_alloca (sizeof (guint) * max_input_ch);
if (channel_list.size () == 0) {
for (i = 0; i < max_input_ch; i++)
channel_indices[i] = i;
num_capture_channels = max_input_ch;
channel_indices.push_back (i);
} else {
num_capture_channels = (guint) channel_list.size ();
i = 0;
for (auto iter:channel_list) {
channel_indices[i++] = iter;
}
for (auto iter : channel_indices)
channel_indices.push_back (iter);
}
ringbuffer_name = g_strdup_printf ("%s-asioringbuffer",
@ -358,8 +352,8 @@ gst_asio_src_create_ringbuffer (GstAudioBaseSrc * src)
goto out;
}
if (!gst_asio_ring_buffer_configure (ringbuffer, channel_indices,
num_capture_channels, self->buffer_size)) {
if (!gst_asio_ring_buffer_configure (ringbuffer, channel_indices.data (),
channel_indices.size (), self->buffer_size)) {
GST_WARNING_OBJECT (self, "Failed to configure ringbuffer");
gst_clear_object (&ringbuffer);
goto out;