[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 10/10] paaudio: fix channel order for usb-audio 5.1 and 7.1 st
From: |
Kővágó, Zoltán |
Subject: |
[PATCH v6 10/10] paaudio: fix channel order for usb-audio 5.1 and 7.1 streams |
Date: |
Sun, 13 Oct 2019 21:58:07 +0200 |
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
audio/paaudio.c | 50 ++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 45 insertions(+), 5 deletions(-)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index d195b1caa8..6ff0d17537 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -338,17 +338,59 @@ static pa_stream *qpa_simple_new (
pa_stream_direction_t dir,
const char *dev,
const pa_sample_spec *ss,
- const pa_channel_map *map,
const pa_buffer_attr *attr,
int *rerror)
{
int r;
- pa_stream *stream;
+ pa_stream *stream = NULL;
pa_stream_flags_t flags;
+ pa_channel_map map;
pa_threaded_mainloop_lock(c->mainloop);
- stream = pa_stream_new(c->context, name, ss, map);
+ pa_channel_map_init(&map);
+ map.channels = ss->channels;
+
+ /*
+ * TODO: This currently expects the only frontend supporting more than 2
+ * channels is the usb-audio. We will need some means to set channel
+ * order when a new frontend gains multi-channel support.
+ */
+ switch (ss->channels) {
+ case 1:
+ map.map[0] = PA_CHANNEL_POSITION_MONO;
+ break;
+
+ case 2:
+ map.map[0] = PA_CHANNEL_POSITION_LEFT;
+ map.map[1] = PA_CHANNEL_POSITION_RIGHT;
+ break;
+
+ case 6:
+ map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+ map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+ map.map[2] = PA_CHANNEL_POSITION_CENTER;
+ map.map[3] = PA_CHANNEL_POSITION_LFE;
+ map.map[4] = PA_CHANNEL_POSITION_REAR_LEFT;
+ map.map[5] = PA_CHANNEL_POSITION_REAR_RIGHT;
+ break;
+
+ case 8:
+ map.map[0] = PA_CHANNEL_POSITION_FRONT_LEFT;
+ map.map[1] = PA_CHANNEL_POSITION_FRONT_RIGHT;
+ map.map[2] = PA_CHANNEL_POSITION_CENTER;
+ map.map[3] = PA_CHANNEL_POSITION_LFE;
+ map.map[4] = PA_CHANNEL_POSITION_REAR_LEFT;
+ map.map[5] = PA_CHANNEL_POSITION_REAR_RIGHT;
+ map.map[6] = PA_CHANNEL_POSITION_SIDE_LEFT;
+ map.map[7] = PA_CHANNEL_POSITION_SIDE_RIGHT;
+
+ default:
+ dolog("Internal error: unsupported channel count %d\n", ss->channels);
+ goto fail;
+ }
+
+ stream = pa_stream_new(c->context, name, ss, &map);
if (!stream) {
goto fail;
}
@@ -421,7 +463,6 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings
*as,
PA_STREAM_PLAYBACK,
ppdo->has_name ? ppdo->name : NULL,
&ss,
- NULL, /* channel map */
&ba, /* buffering attributes */
&error
);
@@ -470,7 +511,6 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings
*as, void *drv_opaque)
PA_STREAM_RECORD,
ppdo->has_name ? ppdo->name : NULL,
&ss,
- NULL, /* channel map */
&ba, /* buffering attributes */
&error
);
--
2.23.0
- [PATCH v6 00/10] Audio: Mixeng-free 5.1/7.1 audio support, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 02/10] audio: make mixeng optional, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 03/10] paaudio: get/put_buffer functions, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 01/10] audio: add mixing-engine option (documentation), Kővágó, Zoltán, 2019/10/13
- [PATCH v6 06/10] audio: basic support for multichannel audio, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 04/10] audio: support more than two channels in volume setting, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 07/10] usb-audio: do not count on avail bytes actually available, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 09/10] usbaudio: change playback counters to 64 bit, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 10/10] paaudio: fix channel order for usb-audio 5.1 and 7.1 streams,
Kővágó, Zoltán <=
- [PATCH v6 05/10] audio: replace shift in audio_pcm_info with bytes_per_frame, Kővágó, Zoltán, 2019/10/13
- [PATCH v6 08/10] usb-audio: support more than two channels of audio, Kővágó, Zoltán, 2019/10/13