From nobody Sun May 19 05:50:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=caoua.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1662557233137567.8370059642417; Wed, 7 Sep 2022 06:27:13 -0700 (PDT) Received: from localhost ([::1]:49876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVv5E-0006n0-01 for importer@patchew.org; Wed, 07 Sep 2022 09:27:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVv1y-0001bF-Fl for qemu-devel@nongnu.org; Wed, 07 Sep 2022 09:23:50 -0400 Received: from vm1.arverb.com ([185.82.219.62]:33087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1oVv1u-0004pM-Qj for qemu-devel@nongnu.org; Wed, 07 Sep 2022 09:23:50 -0400 Received: from localhost (vm1.arverb.com [local]) by vm1.arverb.com (OpenSMTPD) with ESMTPA id 56edcdba; Wed, 7 Sep 2022 15:23:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=default; bh=QIuQgzIJPmgN lRryyqRqQEKfl3ltq3Ndd/0ffVrTz+0=; h=subject:cc:to:from:date; d=caoua.org; b=HIbbAYR8pHShpkIKUdjFHb6ybXEIKE0AzYyzxrPBypbRQfnRLC2Zkv5 qf6XwCCtqaST1Qz6jZOfIpbutQgSB7BGd+5NyJumm4ru6Z/kQ+U7hmmNS7W6PmG60/psWK bF7XfOftJk+94KM7qmlF0+KKdXOI7V+cuZZrCWftDzLTec= Date: Wed, 7 Sep 2022 15:23:42 +0200 From: Alexandre Ratchov To: Gerd Hoffmann , Christian Schoenebeck , Volker =?iso-8859-1?Q?R=FCmelin?= , Brad Cc: qemu-devel@nongnu.org Subject: [PATCH v3] audio: Add sndio backend Message-ID: MIME-Version: 1.0 Content-Disposition: inline Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=185.82.219.62; envelope-from=alex@caoua.org; helo=vm1.arverb.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1662557236022100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" sndio is the native API used by OpenBSD, although it has been ported to other *BSD's and Linux (packages for Ubuntu, Debian, Void, Arch, etc.). Signed-off-by: Brad Smith Signed-off-by: Alexandre Ratchov Reviewed-by: Volker R=C3=BCmelin Tested-by: Volker R=C3=BCmelin --- References to the previous patch versions and related discussions are here: https://marc.info/?l=3Dqemu-devel&m=3D163973393011543 (v2) https://marc.info/?l=3Dqemu-devel&m=3D163626248712444 (initial patch) Here are the changes between v2 and v3 of this patch: - fixed of typos in file-names in MAINTAINERS - added Gerd Hoffmann to the M: entry in MAINTAINERS - added missin S: entry in MAINTAINERS - removed unused #include "qemu-common.h" - bumped "Since:" version to 7.2 in qapi/audio.json - regenerated scripts/meson-buildoptions.sh - implement buffer_get_free() method, introduced by commit 9833438ef624155de879d4ed57ecfcd3464a0bbe audio: restore mixing-engine playback buffer size Running "make update-buildoptions" triggered unrelated changes of scripts/meson-buildoptions.sh, that I removed from the commit as they are not related to sndio. Tested on OpenBSD, still works as expected :-) Regards, Alexandre MAINTAINERS | 7 + audio/audio.c | 1 + audio/audio_template.h | 2 + audio/meson.build | 1 + audio/sndioaudio.c | 565 ++++++++++++++++++++++++++++++++++ meson.build | 9 +- meson_options.txt | 4 +- qapi/audio.json | 25 +- qemu-options.hx | 16 + scripts/meson-buildoptions.sh | 7 +- 10 files changed, 632 insertions(+), 5 deletions(-) create mode 100644 audio/sndioaudio.c diff --git a/MAINTAINERS b/MAINTAINERS index 1729c0901c..2064efc856 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2438,6 +2438,7 @@ X: audio/jackaudio.c X: audio/ossaudio.c X: audio/paaudio.c X: audio/sdlaudio.c +X: audio/sndioaudio.c X: audio/spiceaudio.c F: qapi/audio.json =20 @@ -2482,6 +2483,12 @@ R: Thomas Huth S: Odd Fixes F: audio/sdlaudio.c =20 +Sndio Audio backend +M: Gerd Hoffmann +R: Alexandre Ratchov +S: Odd Fixes +F: audio/sndioaudio.c + Block layer core M: Kevin Wolf M: Hanna Reitz diff --git a/audio/audio.c b/audio/audio.c index 76b8735b44..d3a768007e 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -2029,6 +2029,7 @@ void audio_create_pdos(Audiodev *dev) CASE(OSS, oss, Oss); CASE(PA, pa, Pa); CASE(SDL, sdl, Sdl); + CASE(SNDIO, sndio, ); CASE(SPICE, spice, ); CASE(WAV, wav, ); =20 diff --git a/audio/audio_template.h b/audio/audio_template.h index 7192b19e73..81860cea62 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -336,6 +336,8 @@ AudiodevPerDirectionOptions *glue(audio_get_pdo_, TYPE)= (Audiodev *dev) return qapi_AudiodevPaPerDirectionOptions_base(dev->u.pa.TYPE); case AUDIODEV_DRIVER_SDL: return qapi_AudiodevSdlPerDirectionOptions_base(dev->u.sdl.TYPE); + case AUDIODEV_DRIVER_SNDIO: + return dev->u.sndio.TYPE; case AUDIODEV_DRIVER_SPICE: return dev->u.spice.TYPE; case AUDIODEV_DRIVER_WAV: diff --git a/audio/meson.build b/audio/meson.build index 3abee90860..34aed78342 100644 --- a/audio/meson.build +++ b/audio/meson.build @@ -17,6 +17,7 @@ foreach m : [ ['pa', pulse, files('paaudio.c')], ['sdl', sdl, files('sdlaudio.c')], ['jack', jack, files('jackaudio.c')], + ['sndio', sndio, files('sndioaudio.c')], ['spice', spice, files('spiceaudio.c')] ] if m[1].found() diff --git a/audio/sndioaudio.c b/audio/sndioaudio.c new file mode 100644 index 0000000000..7c45276d36 --- /dev/null +++ b/audio/sndioaudio.c @@ -0,0 +1,565 @@ +/* + * SPDX-License-Identifier: ISC + * + * Copyright (c) 2019 Alexandre Ratchov + */ + +/* + * TODO : + * + * Use a single device and open it in full-duplex rather than + * opening it twice (once for playback once for recording). + * + * This is the only way to ensure that playback doesn't drift with respect + * to recording, which is what guest systems expect. + */ + +#include +#include +#include "qemu/osdep.h" +#include "qemu/main-loop.h" +#include "audio.h" +#include "trace.h" + +#define AUDIO_CAP "sndio" +#include "audio_int.h" + +/* default latency in microseconds if no option is set */ +#define SNDIO_LATENCY_US 50000 + +typedef struct SndioVoice { + union { + HWVoiceOut out; + HWVoiceIn in; + } hw; + struct sio_par par; + struct sio_hdl *hdl; + struct pollfd *pfds; + struct pollindex { + struct SndioVoice *self; + int index; + } *pindexes; + unsigned char *buf; + size_t buf_size; + size_t sndio_pos; + size_t qemu_pos; + unsigned int mode; + unsigned int nfds; + bool enabled; +} SndioVoice; + +typedef struct SndioConf { + const char *devname; + unsigned int latency; +} SndioConf; + +/* needed for forward reference */ +static void sndio_poll_in(void *arg); +static void sndio_poll_out(void *arg); + +/* + * stop polling descriptors + */ +static void sndio_poll_clear(SndioVoice *self) +{ + struct pollfd *pfd; + int i; + + for (i =3D 0; i < self->nfds; i++) { + pfd =3D &self->pfds[i]; + qemu_set_fd_handler(pfd->fd, NULL, NULL, NULL); + } + + self->nfds =3D 0; +} + +/* + * write data to the device until it blocks or + * all of our buffered data is written + */ +static void sndio_write(SndioVoice *self) +{ + size_t todo, n; + + todo =3D self->qemu_pos - self->sndio_pos; + + /* + * transfer data to device, until it blocks + */ + while (todo > 0) { + n =3D sio_write(self->hdl, self->buf + self->sndio_pos, todo); + if (n =3D=3D 0) { + break; + } + self->sndio_pos +=3D n; + todo -=3D n; + } + + if (self->sndio_pos =3D=3D self->buf_size) { + /* + * we complete the block + */ + self->sndio_pos =3D 0; + self->qemu_pos =3D 0; + } +} + +/* + * read data from the device until it blocks or + * there no room any longer + */ +static void sndio_read(SndioVoice *self) +{ + size_t todo, n; + + todo =3D self->buf_size - self->sndio_pos; + + /* + * transfer data from the device, until it blocks + */ + while (todo > 0) { + n =3D sio_read(self->hdl, self->buf + self->sndio_pos, todo); + if (n =3D=3D 0) { + break; + } + self->sndio_pos +=3D n; + todo -=3D n; + } +} + +/* + * Set handlers for all descriptors libsndio needs to + * poll + */ +static void sndio_poll_wait(SndioVoice *self) +{ + struct pollfd *pfd; + int events, i; + + events =3D 0; + if (self->mode =3D=3D SIO_PLAY) { + if (self->sndio_pos < self->qemu_pos) { + events |=3D POLLOUT; + } + } else { + if (self->sndio_pos < self->buf_size) { + events |=3D POLLIN; + } + } + + /* + * fill the given array of descriptors with the events sndio + * wants, they are different from our 'event' variable because + * sndio may use descriptors internally. + */ + self->nfds =3D sio_pollfd(self->hdl, self->pfds, events); + + for (i =3D 0; i < self->nfds; i++) { + pfd =3D &self->pfds[i]; + if (pfd->fd < 0) { + continue; + } + qemu_set_fd_handler(pfd->fd, + (pfd->events & POLLIN) ? sndio_poll_in : NULL, + (pfd->events & POLLOUT) ? sndio_poll_out : NULL, + &self->pindexes[i]); + pfd->revents =3D 0; + } +} + +/* + * call-back called when one of the descriptors + * became readable or writable + */ +static void sndio_poll_event(SndioVoice *self, int index, int event) +{ + int revents; + + /* + * ensure we're not called twice this cycle + */ + sndio_poll_clear(self); + + /* + * make self->pfds[] look as we're returning from poll syscal, + * this is how sio_revents expects events to be. + */ + self->pfds[index].revents =3D event; + + /* + * tell sndio to handle events and return whether we can read or + * write without blocking. + */ + revents =3D sio_revents(self->hdl, self->pfds); + if (self->mode =3D=3D SIO_PLAY) { + if (revents & POLLOUT) { + sndio_write(self); + } + + if (self->qemu_pos < self->buf_size) { + audio_run(self->hw.out.s, "sndio_out"); + } + } else { + if (revents & POLLIN) { + sndio_read(self); + } + + if (self->qemu_pos < self->sndio_pos) { + audio_run(self->hw.in.s, "sndio_in"); + } + } + + /* + * audio_run() may have changed state + */ + if (self->enabled) { + sndio_poll_wait(self); + } +} + +/* + * return the upper limit of the amount of free play buffer space + */ +static size_t sndio_buffer_get_free(HWVoiceOut *hw) +{ + SndioVoice *self =3D (SndioVoice *) hw; + + return self->buf_size - self->qemu_pos; +} + +/* + * return a buffer where data to play can be stored, + * its size is stored in the location pointed by the size argument. + */ +static void *sndio_get_buffer_out(HWVoiceOut *hw, size_t *size) +{ + SndioVoice *self =3D (SndioVoice *) hw; + + *size =3D self->buf_size - self->qemu_pos; + return self->buf + self->qemu_pos; +} + +/* + * put back to sndio back-end a buffer returned by sndio_get_buffer_out() + */ +static size_t sndio_put_buffer_out(HWVoiceOut *hw, void *buf, size_t size) +{ + SndioVoice *self =3D (SndioVoice *) hw; + + self->qemu_pos +=3D size; + sndio_poll_wait(self); + return size; +} + +/* + * return a buffer from where recorded data is available, + * its size is stored in the location pointed by the size argument. + * it may not exceed the initial value of "*size". + */ +static void *sndio_get_buffer_in(HWVoiceIn *hw, size_t *size) +{ + SndioVoice *self =3D (SndioVoice *) hw; + size_t todo, max_todo; + + /* + * unlike the get_buffer_out() method, get_buffer_in() + * must return a buffer of at most the given size, see audio.c + */ + max_todo =3D *size; + + todo =3D self->sndio_pos - self->qemu_pos; + if (todo > max_todo) { + todo =3D max_todo; + } + + *size =3D todo; + return self->buf + self->qemu_pos; +} + +/* + * discard the given amount of recorded data + */ +static void sndio_put_buffer_in(HWVoiceIn *hw, void *buf, size_t size) +{ + SndioVoice *self =3D (SndioVoice *) hw; + + self->qemu_pos +=3D size; + if (self->qemu_pos =3D=3D self->buf_size) { + self->qemu_pos =3D 0; + self->sndio_pos =3D 0; + } + sndio_poll_wait(self); +} + +/* + * call-back called when one of our descriptors becomes writable + */ +static void sndio_poll_out(void *arg) +{ + struct pollindex *pindex =3D (struct pollindex *) arg; + + sndio_poll_event(pindex->self, pindex->index, POLLOUT); +} + +/* + * call-back called when one of our descriptors becomes readable + */ +static void sndio_poll_in(void *arg) +{ + struct pollindex *pindex =3D (struct pollindex *) arg; + + sndio_poll_event(pindex->self, pindex->index, POLLIN); +} + +static void sndio_fini(SndioVoice *self) +{ + if (self->hdl) { + sio_close(self->hdl); + self->hdl =3D NULL; + } + + g_free(self->pfds); + g_free(self->pindexes); + g_free(self->buf); +} + +static int sndio_init(SndioVoice *self, + struct audsettings *as, int mode, Audiodev *dev) +{ + AudiodevSndioOptions *opts =3D &dev->u.sndio; + unsigned long long latency; + const char *dev_name; + struct sio_par req; + unsigned int nch; + int i, nfds; + + dev_name =3D opts->has_dev ? opts->dev : SIO_DEVANY; + latency =3D opts->has_latency ? opts->latency : SNDIO_LATENCY_US; + + /* open the device in non-blocking mode */ + self->hdl =3D sio_open(dev_name, mode, 1); + if (self->hdl =3D=3D NULL) { + dolog("failed to open device\n"); + return -1; + } + + self->mode =3D mode; + + sio_initpar(&req); + + switch (as->fmt) { + case AUDIO_FORMAT_S8: + req.bits =3D 8; + req.sig =3D 1; + break; + case AUDIO_FORMAT_U8: + req.bits =3D 8; + req.sig =3D 0; + break; + case AUDIO_FORMAT_S16: + req.bits =3D 16; + req.sig =3D 1; + break; + case AUDIO_FORMAT_U16: + req.bits =3D 16; + req.sig =3D 0; + break; + case AUDIO_FORMAT_S32: + req.bits =3D 32; + req.sig =3D 1; + break; + case AUDIO_FORMAT_U32: + req.bits =3D 32; + req.sig =3D 0; + break; + default: + dolog("unknown audio sample format\n"); + return -1; + } + + if (req.bits > 8) { + req.le =3D as->endianness ? 0 : 1; + } + + req.rate =3D as->freq; + if (mode =3D=3D SIO_PLAY) { + req.pchan =3D as->nchannels; + } else { + req.rchan =3D as->nchannels; + } + + /* set on-device buffer size */ + req.appbufsz =3D req.rate * latency / 1000000; + + if (!sio_setpar(self->hdl, &req)) { + dolog("failed set audio params\n"); + goto fail; + } + + if (!sio_getpar(self->hdl, &self->par)) { + dolog("failed get audio params\n"); + goto fail; + } + + nch =3D (mode =3D=3D SIO_PLAY) ? self->par.pchan : self->par.rchan; + + /* + * With the default setup, sndio supports any combination of parameters + * so these checks are mostly to catch configuration errors. + */ + if (self->par.bits !=3D req.bits || self->par.bps !=3D req.bits / 8 || + self->par.sig !=3D req.sig || (req.bits > 8 && self->par.le !=3D r= eq.le) || + self->par.rate !=3D as->freq || nch !=3D as->nchannels) { + dolog("unsupported audio params\n"); + goto fail; + } + + /* + * we use one block as buffer size; this is how + * transfers get well aligned + */ + self->buf_size =3D self->par.round * self->par.bps * nch; + + self->buf =3D g_malloc(self->buf_size); + if (self->buf =3D=3D NULL) { + dolog("failed to allocate audio buffer\n"); + goto fail; + } + + nfds =3D sio_nfds(self->hdl); + + self->pfds =3D g_malloc_n(nfds, sizeof(struct pollfd)); + if (self->pfds =3D=3D NULL) { + dolog("failed to allocate pollfd structures\n"); + goto fail; + } + + self->pindexes =3D g_malloc_n(nfds, sizeof(struct pollindex)); + if (self->pindexes =3D=3D NULL) { + dolog("failed to allocate pollindex structures\n"); + goto fail; + } + + for (i =3D 0; i < nfds; i++) { + self->pindexes[i].self =3D self; + self->pindexes[i].index =3D i; + } + + return 0; +fail: + sndio_fini(self); + return -1; +} + +static void sndio_enable(SndioVoice *self, bool enable) +{ + if (enable) { + sio_start(self->hdl); + self->enabled =3D true; + sndio_poll_wait(self); + } else { + self->enabled =3D false; + sndio_poll_clear(self); + sio_stop(self->hdl); + } +} + +static void sndio_enable_out(HWVoiceOut *hw, bool enable) +{ + SndioVoice *self =3D (SndioVoice *) hw; + + sndio_enable(self, enable); +} + +static void sndio_enable_in(HWVoiceIn *hw, bool enable) +{ + SndioVoice *self =3D (SndioVoice *) hw; + + sndio_enable(self, enable); +} + +static int sndio_init_out(HWVoiceOut *hw, struct audsettings *as, void *op= aque) +{ + SndioVoice *self =3D (SndioVoice *) hw; + + if (sndio_init(self, as, SIO_PLAY, opaque) =3D=3D -1) { + return -1; + } + + audio_pcm_init_info(&hw->info, as); + hw->samples =3D self->par.round; + return 0; +} + +static int sndio_init_in(HWVoiceIn *hw, struct audsettings *as, void *opaq= ue) +{ + SndioVoice *self =3D (SndioVoice *) hw; + + if (sndio_init(self, as, SIO_REC, opaque) =3D=3D -1) { + return -1; + } + + audio_pcm_init_info(&hw->info, as); + hw->samples =3D self->par.round; + return 0; +} + +static void sndio_fini_out(HWVoiceOut *hw) +{ + SndioVoice *self =3D (SndioVoice *) hw; + + sndio_fini(self); +} + +static void sndio_fini_in(HWVoiceIn *hw) +{ + SndioVoice *self =3D (SndioVoice *) hw; + + sndio_fini(self); +} + +static void *sndio_audio_init(Audiodev *dev) +{ + assert(dev->driver =3D=3D AUDIODEV_DRIVER_SNDIO); + return dev; +} + +static void sndio_audio_fini(void *opaque) +{ +} + +static struct audio_pcm_ops sndio_pcm_ops =3D { + .init_out =3D sndio_init_out, + .fini_out =3D sndio_fini_out, + .enable_out =3D sndio_enable_out, + .write =3D audio_generic_write, + .buffer_get_free =3D sndio_buffer_get_free, + .get_buffer_out =3D sndio_get_buffer_out, + .put_buffer_out =3D sndio_put_buffer_out, + .init_in =3D sndio_init_in, + .fini_in =3D sndio_fini_in, + .read =3D audio_generic_read, + .enable_in =3D sndio_enable_in, + .get_buffer_in =3D sndio_get_buffer_in, + .put_buffer_in =3D sndio_put_buffer_in, +}; + +static struct audio_driver sndio_audio_driver =3D { + .name =3D "sndio", + .descr =3D "sndio https://sndio.org", + .init =3D sndio_audio_init, + .fini =3D sndio_audio_fini, + .pcm_ops =3D &sndio_pcm_ops, + .can_be_default =3D 1, + .max_voices_out =3D INT_MAX, + .max_voices_in =3D INT_MAX, + .voice_size_out =3D sizeof(SndioVoice), + .voice_size_in =3D sizeof(SndioVoice) +}; + +static void register_audio_sndio(void) +{ + audio_driver_register(&sndio_audio_driver); +} + +type_init(register_audio_sndio); diff --git a/meson.build b/meson.build index c2adb7caf4..a9d773e26b 100644 --- a/meson.build +++ b/meson.build @@ -681,6 +681,11 @@ if not get_option('jack').auto() or have_system jack =3D dependency('jack', required: get_option('jack'), method: 'pkg-config', kwargs: static_kwargs) endif +sndio =3D not_found +if not get_option('sndio').auto() or have_system + sndio =3D dependency('sndio', required: get_option('sndio'), + method: 'pkg-config', kwargs: static_kwargs) +endif =20 spice_protocol =3D not_found if not get_option('spice_protocol').auto() or have_system @@ -1597,6 +1602,7 @@ if have_system 'oss': oss.found(), 'pa': pulse.found(), 'sdl': sdl.found(), + 'sndio': sndio.found(), } foreach k, v: audio_drivers_available config_host_data.set('CONFIG_AUDIO_' + k.to_upper(), v) @@ -1604,7 +1610,7 @@ if have_system =20 # Default to native drivers first, OSS second, SDL third audio_drivers_priority =3D \ - [ 'pa', 'coreaudio', 'dsound', 'oss' ] + \ + [ 'pa', 'coreaudio', 'dsound', 'sndio', 'oss' ] + \ (targetos =3D=3D 'linux' ? [] : [ 'sdl' ]) audio_drivers_default =3D [] foreach k: audio_drivers_priority @@ -3928,6 +3934,7 @@ if vnc.found() endif if targetos not in ['darwin', 'haiku', 'windows'] summary_info +=3D {'OSS support': oss} + summary_info +=3D {'sndio support': sndio} elif targetos =3D=3D 'darwin' summary_info +=3D {'CoreAudio support': coreaudio} elif targetos =3D=3D 'windows' diff --git a/meson_options.txt b/meson_options.txt index 63f0725174..9df9e86d7d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,7 +21,7 @@ option('tls_priority', type : 'string', value : 'NORMAL', option('default_devices', type : 'boolean', value : true, description: 'Include a default selection of devices in emulators') option('audio_drv_list', type: 'array', value: ['default'], - choices: ['alsa', 'coreaudio', 'default', 'dsound', 'jack', 'oss', = 'pa', 'sdl'], + choices: ['alsa', 'coreaudio', 'default', 'dsound', 'jack', 'oss', = 'pa', 'sdl', 'sndio'], description: 'Set audio driver list') option('block_drv_rw_whitelist', type : 'string', value : '', description: 'set block driver read-write whitelist (by default aff= ects only QEMU, not tools like qemu-img)') @@ -240,6 +240,8 @@ option('oss', type: 'feature', value: 'auto', description: 'OSS sound support') option('pa', type: 'feature', value: 'auto', description: 'PulseAudio sound support') +option('sndio', type: 'feature', value: 'auto', + description: 'sndio sound support') =20 option('vhost_kernel', type: 'feature', value: 'auto', description: 'vhost kernel backend support') diff --git a/qapi/audio.json b/qapi/audio.json index 8099e3d7f1..1e0a24bdfc 100644 --- a/qapi/audio.json +++ b/qapi/audio.json @@ -106,6 +106,28 @@ '*out': 'AudiodevAlsaPerDirectionOptions', '*threshold': 'uint32' } } =20 +## +# @AudiodevSndioOptions: +# +# Options of the sndio audio backend. +# +# @in: options of the capture stream +# +# @out: options of the playback stream +# +# @dev: the name of the sndio device to use (default 'default') +# +# @latency: play buffer size (in microseconds) +# +# Since: 7.2 +## +{ 'struct': 'AudiodevSndioOptions', + 'data': { + '*in': 'AudiodevPerDirectionOptions', + '*out': 'AudiodevPerDirectionOptions', + '*dev': 'str', + '*latency': 'uint32'} } + ## # @AudiodevCoreaudioPerDirectionOptions: # @@ -387,7 +409,7 @@ ## { 'enum': 'AudiodevDriver', 'data': [ 'none', 'alsa', 'coreaudio', 'dbus', 'dsound', 'jack', 'oss', = 'pa', - 'sdl', 'spice', 'wav' ] } + 'sdl', 'sndio', 'spice', 'wav' ] } =20 ## # @Audiodev: @@ -418,5 +440,6 @@ 'oss': 'AudiodevOssOptions', 'pa': 'AudiodevPaOptions', 'sdl': 'AudiodevSdlOptions', + 'sndio': 'AudiodevSndioOptions', 'spice': 'AudiodevGenericOptions', 'wav': 'AudiodevWavOptions' } } diff --git a/qemu-options.hx b/qemu-options.hx index 31c04f7eea..8a2f7c1585 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -767,6 +767,9 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev, "-audiodev sdl,id=3Did[,prop[=3Dvalue][,...]]\n" " in|out.buffer-count=3D number of buffers\n" #endif +#ifdef CONFIG_AUDIO_SNDIO + "-audiodev sndio,id=3Did[,prop[=3Dvalue][,...]]\n" +#endif #ifdef CONFIG_SPICE "-audiodev spice,id=3Did[,prop[=3Dvalue][,...]]\n" #endif @@ -933,6 +936,19 @@ SRST ``in|out.buffer-count=3Dcount`` Sets the count of the buffers. =20 +``-audiodev sndio,id=3Did[,prop[=3Dvalue][,...]]`` + Creates a backend using SNDIO. This backend is available on + OpenBSD and most other Unix-like systems. + + Sndio specific options are: + + ``in|out.dev=3Ddevice`` + Specify the sndio device to use for input and/or output. Default + is ``default``. + + ``in|out.latency=3Dusecs`` + Sets the desired period length in microseconds. + ``-audiodev spice,id=3Did[,prop[=3Dvalue][,...]]`` Creates a backend that sends audio through SPICE. This backend requires ``-spice`` and automatically selected in that case, so diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 359b04e0e6..f08e3a8a7e 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -1,7 +1,7 @@ # This file is generated by meson-buildoptions.py, do not edit! meson_options_help() { - printf "%s\n" ' --audio-drv-list=3DCHOICES Set audio driver list [defau= lt] (choices:' - printf "%s\n" ' alsa/coreaudio/default/dsound/= jack/oss/pa/sdl)' + printf "%s\n" ' --audio-drv-list=3DCHOICES Set audio driver list [defau= lt] (choices: alsa/co' + printf "%s\n" ' reaudio/default/dsound/jack/os= s/pa/sdl/sndio)' printf "%s\n" ' --block-drv-ro-whitelist=3DVALUE' printf "%s\n" ' set block driver read-only whi= telist (by default' printf "%s\n" ' affects only QEMU, not tools l= ike qemu-img)' @@ -144,6 +144,7 @@ meson_options_help() { printf "%s\n" ' slirp-smbd use smbd (at path --smbd=3D*) in slirp = networking' printf "%s\n" ' smartcard CA smartcard emulation support' printf "%s\n" ' snappy snappy compression support' + printf "%s\n" ' sndio sndio sound support' printf "%s\n" ' sparse sparse checker' printf "%s\n" ' spice Spice server support' printf "%s\n" ' spice-protocol Spice protocol support' @@ -393,6 +394,8 @@ _meson_option_parse() { --disable-smartcard) printf "%s" -Dsmartcard=3Ddisabled ;; --enable-snappy) printf "%s" -Dsnappy=3Denabled ;; --disable-snappy) printf "%s" -Dsnappy=3Ddisabled ;; + --enable-sndio) printf "%s" -Dsndio=3Denabled ;; + --disable-sndio) printf "%s" -Dsndio=3Ddisabled ;; --enable-sparse) printf "%s" -Dsparse=3Denabled ;; --disable-sparse) printf "%s" -Dsparse=3Ddisabled ;; --sphinx-build=3D*) quote_sh "-Dsphinx_build=3D$2" ;; --=20 2.37.2