Add an option to change the channel map used by pulseaudio. If not
specified, falls back to an ALSA compatible channel map.
Signed-off-by: Kővágó, Zoltán <dirty.ice...@gmail.com>
---
audio/paaudio.c | 18 +++++++++++-------
qapi/audio.json | 5 ++++-
qemu-options.hx | 9 +++++++++
3 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index d2267ee..10fc54f 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -336,23 +336,27 @@ 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 char *map,
const pa_buffer_attr *attr,
int *rerror)
{
int r;
pa_stream *stream;
pa_stream_flags_t flags;
- pa_channel_map my_map;
+ pa_channel_map pa_map;
pa_threaded_mainloop_lock(c->mainloop);
+ if (map && !pa_channel_map_parse(&pa_map, map)) {
+ dolog("Invalid channel map specified: '%s'\n", map);
+ map = NULL;
+ }
if (!map) {
- map = pa_channel_map_init_extend(&my_map, ss->channels,
- PA_CHANNEL_MAP_ALSA);
+ pa_channel_map_init_extend(&pa_map, ss->channels,
+ PA_CHANNEL_MAP_ALSA);
}
- stream = pa_stream_new(c->context, name, ss, map);
+ stream = pa_stream_new(c->context, name, ss, &pa_map);
if (!stream) {
goto fail;
}
@@ -428,7 +432,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings
*as,
PA_STREAM_PLAYBACK,
ppdo->has_name ? ppdo->name : NULL,
&ss,
- NULL, /* channel map */
+ ppdo->has_channel_map ? ppdo->channel_map : NULL,
&ba, /* buffering attributes */
&error
);
@@ -476,7 +480,7 @@ 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 */
+ ppdo->has_channel_map ? ppdo->channel_map : NULL,
NULL, /* buffering attributes */
&error
);
diff --git a/qapi/audio.json b/qapi/audio.json
index 0216a10..9070ac5 100644
--- a/qapi/audio.json
+++ b/qapi/audio.json
@@ -119,11 +119,14 @@
#
# @name: #optional name of the sink/source to use
#
+# @channel-map: #optional channel map to use (default: ALSA compatible map)
+#
# Since: 2.5
##
{ 'struct': 'AudiodevPaPerDirectionOptions',
'data': {
- '*name': 'str' } }
+ '*name': 'str',
+ '*channel-map': 'str' } }
##
# @AudiodevPaOptions
diff --git a/qemu-options.hx b/qemu-options.hx
index 8e5ab7c..382b0ab 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -365,6 +365,7 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev,
"-audiodev pa,id=id[,prop[=value][,...]]\n"
" server= PulseAudio server address\n"
" sink|source.name= sink/source device name\n"
+ " sink|source.channel-map= channel map to use\n"
#endif
#ifdef CONFIG_SDL
"-audiodev sdl,id=id[,prop[=value][,...]]\n"
@@ -518,6 +519,14 @@ Sets the PulseAudio @var{server} to connect to.
@item sink|source.name=@var{sink}
Use the specified sink/source for playback/recording.
+@item sink|source.channel-map=@var{map}
+Use the specified channel map. The default is an ALSA compatible
+channel map. Do not forget to escape commas inside the map:
+
+@example
+-audiodev pa,id=example,sink.channel-map=front-left,,front-right
+@end example
+
@end table
@item -audiodev sdl,id=@var{id}[,@var{prop}[=@var{value}][,...]]
--
2.5.0
