From patchwork Wed Jan 16 23:37:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 10767213 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4E861746 for ; Thu, 17 Jan 2019 00:21:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AEBC2F144 for ; Thu, 17 Jan 2019 00:21:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2BA132FAF5; Thu, 17 Jan 2019 00:21:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A525F2F144 for ; Thu, 17 Jan 2019 00:21:26 +0000 (UTC) Received: from localhost ([127.0.0.1]:41907 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjvQw-0004mH-2K for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Jan 2019 19:21:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjul9-0004RM-QT for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjul6-0003YW-JA for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:11 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54054) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gjul6-0003VH-6O for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:08 -0500 Received: by mail-wm1-x344.google.com with SMTP id d15so3886090wmb.3 for ; Wed, 16 Jan 2019 15:38:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wFxcgM/q5BlX8DcgUOK+D68Xqs58OTOhAm8rzeXNdZk=; b=hXltc+hjUnYSSdzbyfhpUmtg9+DxgPdeIPp6lFfPkWpLuK4Bk76bCPIzvHdDhu8N10 88FCS/3nj8hlCUsLWcgo9g2it8s6VTXrIWlhklGSOGvidYTzEAJ+BkjJO1xJUk6KUaqO 8q/5al1Az8Lxl14nyn0Mo6nIK2dUehalltxrvtTL4Jyt7I95nS0SQG69YCklRmFM7JVr pQLoU/UdfZwxNvaUeKzN+18e9Ze/9NR84dg8ffmbAV9VGT7TqJDXk7tyrZzhGEtfoW0o m8OJ/iqh4NSvqc8jRFlWY1vMj870DtyQYEsSp7rGMAcBp22R3WI12eeVcyktZz5BnNcN lf+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wFxcgM/q5BlX8DcgUOK+D68Xqs58OTOhAm8rzeXNdZk=; b=InjqNt6hFXRLunuocWA0hFWmiXOCmGg8X6J1LoDEEH5Y0cMoMNbrfaUHXoHnpIVAge dL9YNdC2bg4DN/XnL/kAcc9LgvFNvCowPUeIAdiFm4Xr9sgKWs9dcnCwr77FrCAvSxUq 1a/b7rFE/Y9sjmSSzpcyqj0CjlK13vMO0NCIEMTUqw3Bw7wePJ41a26MNRNghfTUwzJ4 6LCPgN5oTz5QO+rnL+04aUM3hih2nDpoyvF+wHdtPFPeXa6osTDfyaIxqNW/0gNmmAjB ZwcJMNCKb/ZVjA8OZKuOH8//Nun3ib/MdBwlnfE20SYuZwtbE3iQhkEfopgSte1mQseQ AEsA== X-Gm-Message-State: AJcUukfUE2HinTZ6H+x/rCNt29xwApMQZ7MyT/7PwvZJAwlu71GzPpdq danJpT/TcVU8+ORyjvisAvkan/gHvCo= X-Google-Smtp-Source: ALg8bN5qcunwJXxEWiIYon9M/M2sVxMrfhe48eFBvndFY9lRW/EnCEoC7VRSRw8p+rdG/g4TyJBPGA== X-Received: by 2002:a1c:bc82:: with SMTP id m124mr9197733wmf.77.1547681886789; Wed, 16 Jan 2019 15:38:06 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-e4b0-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:e4b0::5]) by smtp.gmail.com with ESMTPSA id s66sm30760437wmf.34.2019.01.16.15.38.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 15:38:06 -0800 (PST) From: " =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= " X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Thu, 17 Jan 2019 00:37:20 +0100 Message-Id: <82a755097c6aaa16363348599110f9af3bb07583.1547681517.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v3 47/50] paaudio: channel-map option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Markus Armbruster Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- qapi/audio.json | 5 ++++- audio/paaudio.c | 18 ++++++++++++++---- qemu-options.hx | 9 +++++++++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/qapi/audio.json b/qapi/audio.json index 7bcea6240f..86078039dc 100644 --- a/qapi/audio.json +++ b/qapi/audio.json @@ -107,11 +107,14 @@ # # @name: name of the sink/source to use # +# @channel-map: channel map to use (default: OSS compatible map) +# # Since: 4.0 ## { 'struct': 'AudiodevPaPerDirectionOptions', 'data': { - '*name': 'str' } } + '*name': 'str', + '*channel-map': 'str' } } ## # @AudiodevPaOptions: diff --git a/audio/paaudio.c b/audio/paaudio.c index 0d67c03b4c..b0e311584a 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -337,17 +337,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; } @@ -424,7 +434,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 ); @@ -472,7 +482,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/qemu-options.hx b/qemu-options.hx index 53fc5ef453..c4835f77c3 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -468,6 +468,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" @@ -621,6 +622,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 OSS 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}][,...]]