[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 48/51] paaudio: channel-map option
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH 48/51] paaudio: channel-map option |
Date: |
Thu, 14 Jan 2016 14:46:01 +0100 |
Add an option to change the channel map used by pulseaudio. If not
specified, falls back to an OSS compatible channel map.
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
audio/paaudio.c | 18 ++++++++++++++----
qapi/audio.json | 5 ++++-
qemu-options.hx | 9 +++++++++
3 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 7d5e697..bb9d928 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -336,17 +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 pa_map;
pa_threaded_mainloop_lock(c->mainloop);
- stream = pa_stream_new(c->context, name, ss, map);
+ if (map && !pa_channel_map_parse(&pa_map, map)) {
+ dolog("Invalid channel map specified: '%s'\n", map);
+ map = NULL;
+ }
+ if (!map) {
+ pa_channel_map_init_extend(&pa_map, ss->channels,
+ PA_CHANNEL_MAP_OSS);
+ }
+
+ stream = pa_stream_new(c->context, name, ss, &pa_map);
if (!stream) {
goto fail;
}
@@ -423,7 +433,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
);
@@ -471,7 +481,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 9bd61de..e91de45 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: OSS compatible map)
+#
# Since: 2.6
##
{ 'struct': 'AudiodevPaPerDirectionOptions',
'data': {
- '*name': 'str' } }
+ '*name': 'str',
+ '*channel-map': 'str' } }
##
# @AudiodevPaOptions
diff --git a/qemu-options.hx b/qemu-options.hx
index a995fca..33ee3f2 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -372,6 +372,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"
@@ -525,6 +526,14 @@ Sets the PulseAudio @var{server} to connect to.
@item sink|address@hidden
Use the specified sink/source for playback/recording.
address@hidden sink|address@hidden
+Use the specified channel map. The default is an OSS compatible
+channel map. Do not forget to escape commas inside the map:
+
address@hidden
+-audiodev pa,id=example,sink.channel-map=front-left,,front-right
address@hidden example
+
@end table
@item -audiodev sdl,address@hidden,@address@hidden,...]]
--
2.7.0
- [Qemu-devel] [PATCH 42/51] audio: add mixeng option (documentation), (continued)
- [Qemu-devel] [PATCH 42/51] audio: add mixeng option (documentation), Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 43/51] audio: make mixeng optional, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 47/51] audio: basic support for multichannel audio, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 39/51] audio: remove hw->samples, buffer_size_in/out pcm_ops, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 41/51] audio: split ctl_* functions into enable_* and volume_*, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 49/51] usb-audio: do not count on avail bytes actually available, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 40/51] audio: common rate control code for timer based outputs, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 51/51] usbaudio: change playback counters to 64 bit, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 24/51] audio: do not run each backend in audio_run, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 23/51] audio: remove audio_MIN, audio_MAX, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 48/51] paaudio: channel-map option,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH 46/51] audio: replace shift in audio_pcm_info with bytes_per_frame, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 38/51] audio: unify input and output mixeng buffer management, Kővágó, Zoltán, 2016/01/14
- Re: [Qemu-devel] [PATCH 00/51] audio 5.1 patches, Victor Toso, 2016/01/14
- Re: [Qemu-devel] [PATCH 00/51] audio 5.1 patches, Gerd Hoffmann, 2016/01/15