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 F3B14C76188 for ; Mon, 22 Jul 2019 14:22:17 +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 CA7BE217D6 for ; Mon, 22 Jul 2019 14:22:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA7BE217D6 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]:34056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpZCj-0008Rw-4m for qemu-devel@archiver.kernel.org; Mon, 22 Jul 2019 10:22:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35763) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpZCX-00082W-LC for qemu-devel@nongnu.org; Mon, 22 Jul 2019 10:22:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpZCV-0004PG-Rb for qemu-devel@nongnu.org; Mon, 22 Jul 2019 10:22:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35206) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpZCV-0004Ol-J8 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 10:22:03 -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 8941D330265; Mon, 22 Jul 2019 14:22:02 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-244.ams2.redhat.com [10.36.117.244]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB5DD5D721; Mon, 22 Jul 2019 14:21:59 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7AD45113865F; Mon, 22 Jul 2019 16:21:57 +0200 (CEST) From: Markus Armbruster To: =?utf-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= References: <8245dab2e59b99b55f3f7773fd39dc920ae48951.1563224628.git.DirtY.iCE.hu@gmail.com> <878ssyqyyu.fsf@dusky.pond.sub.org> Date: Mon, 22 Jul 2019 16:21:57 +0200 In-Reply-To: (=?utf-8?B?IlpvbHTDoW4JS8WRdsOhZ8OzIidz?= message of "Sun, 21 Jul 2019 17:05:16 +0200") Message-ID: <87lfwqywsa.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.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 22 Jul 2019 14:22:02 +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 Subject: Re: [Qemu-devel] [PATCH v2 03/14] audio: add audiodev property to vnc and wav_capture 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: Gerd Hoffmann , Markus Armbruster , "Dr. David Alan Gilbert" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" "Zolt=C3=A1n K=C5=91v=C3=A1g=C3=B3" writes: > On 2019-07-16 08:23, Markus Armbruster wrote: >> "K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n" writes: >> >>> Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n >>> --- >>> ui/vnc.h | 2 ++ >>> monitor/misc.c | 12 +++++++++++- >>> ui/vnc.c | 15 ++++++++++++++- >>> hmp-commands.hx | 13 ++++++++----- >>> qemu-options.hx | 6 ++++++ >>> 5 files changed, 41 insertions(+), 7 deletions(-) >>> >>> diff --git a/ui/vnc.h b/ui/vnc.h >>> index 2f84db3142..6f54653455 100644 >>> --- a/ui/vnc.h >>> +++ b/ui/vnc.h >>> @@ -183,6 +183,8 @@ struct VncDisplay >>> #ifdef CONFIG_VNC_SASL >>> VncDisplaySASL sasl; >>> #endif >>> + >>> + AudioState *audio_state; >>> }; >>> typedef struct VncTight { >>> diff --git a/monitor/misc.c b/monitor/misc.c >>> index e393333a0e..f97810d370 100644 >>> --- a/monitor/misc.c >>> +++ b/monitor/misc.c >>> @@ -1148,7 +1148,17 @@ static void hmp_wavcapture(Monitor *mon, const Q= Dict *qdict) >>> int bits =3D qdict_get_try_int(qdict, "bits", -1); >>> int has_channels =3D qdict_haskey(qdict, "nchannels"); >>> int nchannels =3D qdict_get_try_int(qdict, "nchannels", -1); >>> + const char *audiodev =3D qdict_get_try_str(qdict, "audiodev"); >>> CaptureState *s; >>> + AudioState *as =3D NULL; >>> + >>> + if (audiodev) { >>> + as =3D audio_state_by_name(audiodev); >>> + if (!as) { >>> + monitor_printf(mon, "Invalid audiodev specified\n"); >>> + return; >>> + } >>> + } >> >> Note for later: if "audiodev" is specified, it must name an existing >> AudioState. >> >>> s =3D g_malloc0 (sizeof (*s)); >>> @@ -1156,7 +1166,7 @@ static void hmp_wavcapture(Monitor *mon, >>> const QDict *qdict) >>> bits =3D has_bits ? bits : 16; >>> nchannels =3D has_channels ? nchannels : 2; >>> - if (wav_start_capture(NULL, s, path, freq, bits, nchannels)) >>> { >>> + if (wav_start_capture(as, s, path, freq, bits, nchannels)) { >>> monitor_printf(mon, "Failed to add wave capture\n"); >>> g_free (s); >>> return; >> >> Note for later: this is the only other failure mode. >> >>> diff --git a/ui/vnc.c b/ui/vnc.c >>> index 140f364dda..24f9be5b5d 100644 >>> --- a/ui/vnc.c >>> +++ b/ui/vnc.c >>> @@ -1222,7 +1222,7 @@ static void audio_add(VncState *vs) >>> ops.destroy =3D audio_capture_destroy; >>> ops.capture =3D audio_capture; >>> - vs->audio_cap =3D AUD_add_capture(NULL, &vs->as, &ops, vs); >>> + vs->audio_cap =3D AUD_add_capture(vs->vd->audio_state, &vs->as, &o= ps, vs); >>> if (!vs->audio_cap) { >>> error_report("Failed to add audio capture"); >>> } >>> @@ -3369,6 +3369,9 @@ static QemuOptsList qemu_vnc_opts =3D { >>> },{ >>> .name =3D "non-adaptive", >>> .type =3D QEMU_OPT_BOOL, >>> + },{ >>> + .name =3D "audiodev", >>> + .type =3D QEMU_OPT_STRING, >>> }, >>> { /* end of list */ } >>> }, >>> @@ -3806,6 +3809,7 @@ void vnc_display_open(const char *id, Error **err= p) >>> const char *saslauthz; >>> int lock_key_sync =3D 1; >>> int key_delay_ms; >>> + const char *audiodev; >>> if (!vd) { >>> error_setg(errp, "VNC display not active"); >>> @@ -3991,6 +3995,15 @@ void vnc_display_open(const char *id, Error **er= rp) >>> } >>> vd->ledstate =3D 0; >>> + audiodev =3D qemu_opt_get(opts, "audiodev"); >>> + if (audiodev) { >>> + vd->audio_state =3D audio_state_by_name(audiodev); >>> + if (!vd->audio_state) { >>> + error_setg(errp, "Audiodev '%s' not found", audiodev); >>> + goto fail; >>> + } >>> + } >> >> Note for later: if "audiodev" is specified, it must name an existing >> AudioState. >> >> I like this error message better than the one in hmp_wavcapture(). Use >> it there, too? >> >> Move it into audio_state_by_name() by giving it an Error **errp >> parameter? Matter of taste, up to you. >> >>> + >>> device_id =3D qemu_opt_get(opts, "display"); >>> if (device_id) { >>> int head =3D qemu_opt_get_number(opts, "head", 0); >>> diff --git a/hmp-commands.hx b/hmp-commands.hx >>> index bfa5681dd2..fa7f009268 100644 >>> --- a/hmp-commands.hx >>> +++ b/hmp-commands.hx >>> @@ -819,16 +819,19 @@ ETEXI >>> { >>> .name =3D "wavcapture", >>> - .args_type =3D "path:F,freq:i?,bits:i?,nchannels:i?", >>> - .params =3D "path [frequency [bits [channels]]]", >>> + .args_type =3D "path:F,freq:i?,bits:i?,nchannels:i?,audiodev:= s?", >>> + .params =3D "path [frequency [bits [channels [audiodev]]]]= ", >>> .help =3D "capture audio to a wave file (default freque= ncy=3D44100 bits=3D16 channels=3D2)", >>> .cmd =3D hmp_wavcapture, >>> }, >>> STEXI >>> -@item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{cha= nnels}]]] >>> +@item wavcapture @var{filename} [@var{frequency} [@var{bits} [@var{cha= nnels} [@var{audiodev}]]]] >>> @findex wavcapture >>> -Capture audio into @var{filename}. Using sample rate @var{frequency} >>> -bits per sample @var{bits} and number of channels @var{channels}. >>> +Capture audio into @var{filename} from @var{audiodev}, using sample ra= te >>> +@var{frequency} bits per sample @var{bits} and number of channels >>> +@var{channels}. When not using an -audiodev argument on command line, >>> +@var{audiodev} must be omitted, otherwise is must specify a valid >>> +audiodev. >> >> I can see the code for "must specify a valid audiodev" in >> hmp_wavcapture(). Where is "must be omitted" checked? > > It's not checked right now, but if the user specifies audiodev, it > must be a valid audiodev id. So if the user can guess the id (which > is not too hard ATM, it's simply the driver's name), it will work even > in this case. > >> Preexisting: the list "sample rate @var{frequency} bits per sample >> @var{bits} and number of channels @var{channels}" lacks a comma after >> @var{frequency}, please fix that. I'd put one after @var{bits} as well, >> but that's a matter of taste[*] >> >> The sentence is of the form "if not COND then A else B". The >> less-negated form "if COND then B else A" is commonly easier to read. >> >> Documentation says "from @var{audiodev}". But when "not using an >> -audiodev argument on command line, +@var{audiodev} must be omitted". >> Where does it sample from then? I figure from some default audio >> device. Where is that default audio device explained? I skimmed the >> -audiodev documentation in qemu-options.hx, but couldn't see it there. > > Currently there are two ways to specify audio options, the legacy ones > using the QEMU_AUDIO_* environment variables, and the new one using > -audiodev arguments. The two formats cannot be mixed, and eventually > we should remove the legacy ones (IIRC my previous patch series > already deprecated them), then we can get rid of this madness. Maybe > something like "When using the legacy environment variable based audio > config, @var{audiodev} must be omitted." would be better? What about effectively de-documenting the deprecated method? I.e. write as if it was already gone. This should result in more readable documentation. Double-checking: will audiodev become mandatory once the deprecated method is gone? >> >> Suggest to say "an -audiodev command line option" instead of "an >> -audiodev argument on command line". >> >> Double-checking: >> >> * -audiodev is the only way to create an audio backend. >> >> * If the user creates no audio backend, QEMU supplies a default audio >> backend. >> >> Correct? > > Not exactly a default audio backend, as it can be customized through > environment variables, and as I previously said this is > deprecated. When we remove the legacy config, there will be no default > backend (like with -netdev and -device). Thanks, I see more clearly now. >> Other kinds of backends can also be created at run-time with the >> monitor. I'm not asking you provide that for audio. I'm just wondering >> whether it could conceivably be useful. > > Yes, since we can create new soundcard devices run-time, creating > backends would make sense too. > >> >> If yes, you might want to avoid the narrow "if using -audiodev", and >> instead say "if the default audio device is in use". >> >>> Defaults: >>> @itemize @minus >>> diff --git a/qemu-options.hx b/qemu-options.hx >>> index 9621e934c0..a308e5f5aa 100644 >>> --- a/qemu-options.hx >>> +++ b/qemu-options.hx >>> @@ -1978,6 +1978,12 @@ can help the device and guest to keep up and not= lose events in case >>> events are arriving in bulk. Possible causes for the latter are flaky >>> network connections, or scripts for automated testing. >>> +@item audiodev=3D@var{audiodev} >>> + >>> +Use the specified @var{audiodev} when the VNC client requests audio >>> +transmission. When not using an -audiodev argument, this option must >>> +be omitted, otherwise is must be present and specify a valid audiodev. >>> + >>> @end table >>> ETEXI >> >> Same as for wavcapture, basically. >> >> >> [*] https://en.wikipedia.org/wiki/Serial_comma >>