Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5098FC04EBF for ; Mon, 23 Sep 2019 13:21:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2539020644 for ; Mon, 23 Sep 2019 13:21:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2539020644 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCOHZ-000147-4M for qemu-devel@archiver.kernel.org; Mon, 23 Sep 2019 09:21:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55245) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCO8T-0002d2-U9 for qemu-devel@nongnu.org; Mon, 23 Sep 2019 09:12:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCO8S-0006vw-LW for qemu-devel@nongnu.org; Mon, 23 Sep 2019 09:12:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42143) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCO8S-0006tb-Dj for qemu-devel@nongnu.org; Mon, 23 Sep 2019 09:12:12 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B041E190C005; Mon, 23 Sep 2019 13:12:11 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-142.ams2.redhat.com [10.36.117.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4CCFE61559; Mon, 23 Sep 2019 13:12:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CDEE0113864E; Mon, 23 Sep 2019 15:12:05 +0200 (CEST) From: Markus Armbruster To: =?utf-8?B?S8WRdsOhZ8OzLCBab2x0w6Fu?= Subject: Re: [PATCH v4 21/24] paaudio: channel-map option References: <8f650662fd6cc50baaede260581aeb560eed44fb.1568927990.git.DirtY.iCE.hu@gmail.com> Date: Mon, 23 Sep 2019 15:12:05 +0200 In-Reply-To: <8f650662fd6cc50baaede260581aeb560eed44fb.1568927990.git.DirtY.iCE.hu@gmail.com> (=?utf-8?B?IkvFkXbDoWfDsywgWm9sdMOhbiIncw==?= message of "Thu, 19 Sep 2019 23:24:29 +0200") Message-ID: <87o8zbma1m.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Mon, 23 Sep 2019 13:12:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" "K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n" writes: > 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=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n > --- > audio/paaudio.c | 18 ++++++++++++++---- > qapi/audio.json | 7 +++++-- > qemu-options.hx | 9 +++++++++ > 3 files changed, 28 insertions(+), 6 deletions(-) > > diff --git a/audio/paaudio.c b/audio/paaudio.c > index d195b1caa8..20402b0718 100644 > --- a/audio/paaudio.c > +++ b/audio/paaudio.c > @@ -338,17 +338,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; >=20=20 > pa_threaded_mainloop_lock(c->mainloop); >=20=20 > - stream =3D 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 =3D NULL; > + } > + if (!map) { > + pa_channel_map_init_extend(&pa_map, ss->channels, > + PA_CHANNEL_MAP_OSS); > + } > + > + stream =3D pa_stream_new(c->context, name, ss, &pa_map); > if (!stream) { > goto fail; > } > @@ -421,7 +431,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audset= tings *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 > ); > @@ -470,7 +480,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetti= ngs *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, > &ba, /* buffering attributes */ > &error > ); > diff --git a/qapi/audio.json b/qapi/audio.json > index 0535eff794..07003808cb 100644 > --- a/qapi/audio.json > +++ b/qapi/audio.json > @@ -214,13 +214,16 @@ > # @latency: latency you want PulseAudio to achieve in microseconds > # (default 15000) > # > +# @channel-map: channel map to use (default: OSS compatible map, since: = 4.2) > +# > # Since: 4.0 > ## > { 'struct': 'AudiodevPaPerDirectionOptions', > 'base': 'AudiodevPerDirectionOptions', > 'data': { > - '*name': 'str', > - '*latency': 'uint32' } } > + '*name': 'str', > + '*latency': 'uint32', > + '*channel-map': 'str' } } >=20=20 > ## > # @AudiodevPaOptions: > diff --git a/qemu-options.hx b/qemu-options.hx > index 395427422a..f3bc342f98 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -471,6 +471,7 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev, > "-audiodev pa,id=3Did[,prop[=3Dvalue][,...]]\n" > " server=3D PulseAudio server address\n" > " in|out.name=3D source/sink device name\n" > + " in|out.channel-map=3D channel map to use\n" > #endif > #ifdef CONFIG_AUDIO_SDL > "-audiodev sdl,id=3Did[,prop[=3Dvalue][,...]]\n" > @@ -636,6 +637,14 @@ Sets the PulseAudio @var{server} to connect to. > @item in|out.name=3D@var{sink} > Use the specified source/sink for recording/playback. >=20=20 > +@item in|out.channel-map=3D@var{map} > +Use the specified channel map. The default is an OSS compatible > +channel map. Do not forget to escape commas inside the map: Awkward. > + > +@example > +-audiodev pa,id=3Dexample,sink.channel-map=3Dfront-left,,front-right > +@end example Makes me realize new AudiodevPaPerDirectionOptions member @channel-map is a list encoded in a string. QAPI heavily frowns upon encoding stuff in strings. Any reason why you can't (or don't want to) make it ['str']? > + > @end table >=20=20 > @item -audiodev sdl,id=3D@var{id}[,@var{prop}[=3D@var{value}][,...]]