From nobody Fri Nov 7 04:15:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545599675864804.1547436350925; Sun, 23 Dec 2018 13:14:35 -0800 (PST) Received: from localhost ([127.0.0.1]:59822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbB4z-0001HE-2J for importer@patchew.org; Sun, 23 Dec 2018 16:14:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbAjr-0007WT-Vx for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbAjp-0001yy-Tf for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:43 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:39956) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbAjp-0001va-Hf for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:41 -0500 Received: by mail-wm1-x343.google.com with SMTP id f188so10406929wmf.5 for ; Sun, 23 Dec 2018 12:52:41 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-24a3-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:24a3::5]) by smtp.gmail.com with ESMTPSA id g198sm25456920wmd.23.2018.12.23.12.52.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 12:52:39 -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=nrXQsUZtGs3cN6Zxy1oriXZA+DwG5rkLKgE6Qe8K8P4=; b=cxlNw753oSk6BWLlYDqwApcGAM9+Fu5nHQnaNdu/hO518aFDpG/g2GdBcii7gzfje9 LUeyKUXYDE6q6KsAwvoC80Oyde3CZ3IxTdsqGIU3SxkbMTDEBuFsgJwxOQ8Xo0RND6mI SA5Sywl11a7ewONz5brl3c3y/kFoKNyhvHoMq9z6Q3fY7Y8gi6UI2UIXeDNEG+L4qrO0 QNXtu1BzMLGm2uLg5Tdazq9vjakpizW6isYygiHLY791Xb8/2X10RW5jhsDqmLnAj5qG 6TY8lKSRGp7XW1usIhOejo25fCtv5sYTLffwSC4xr2iIskSy/1hUuXUs7Y/XWxd/7lm6 YMkg== 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=nrXQsUZtGs3cN6Zxy1oriXZA+DwG5rkLKgE6Qe8K8P4=; b=e7FCfkUeL3kX54Xwe9pY9u+BiH0MDP/qigYjt1MGwEInf1e5p6En94hN+AyOVtlMo4 8SjqPw9oxZBBlKH2VhNmbAGcsVa6/jS8ELsAv278QHHyp5AfuZebNDo40DNUuxdgWmHq XUislbejNhMe4TPcHZBN0uO//RU6r3j16zG9XIz6wx8jkY67qrSXQM3sookzsyqcEWmd fEyKyhYP2gDpXq+6U9K6u3yGIgg08gIzQk5skqkuzCFAIZO3VA/ezKTNy8S4sCE7LLXq /aTMyB2qrhAhUuCq2ce1EVLWC03BiyhNbUwrIJ+NPMtDe9vVaCwXnlMYJtfGIcpsfJNM VNpw== X-Gm-Message-State: AJcUukcQeQT/IN0rTF0weBPkwIDLoVilPOH2lV/eh/vUsAgsVo3s7m6h g9TcUv8NfmnYtGLgZ7SrBTJrwsAhaJc= X-Google-Smtp-Source: ALg8bN4t2viuBYFzWS6PCcxLG7ZtbOr0sPdPPGn1+SFl2JPWrjRwvB4dO7pxKGJTlxyrXK9vFaIy7g== X-Received: by 2002:a1c:888d:: with SMTP id k135mr10472164wmd.137.1545598360090; Sun, 23 Dec 2018 12:52:40 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Sun, 23 Dec 2018 21:51:47 +0100 Message-Id: <26249b5186151dd3be871730b41b87959037540f.1545598229.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH v2 11/52] ossaudio: port to -audiodev config 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n --- audio/audio_legacy.c | 17 +++++ audio/ossaudio.c | 153 ++++++++++++------------------------------- 2 files changed, 59 insertions(+), 111 deletions(-) diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c index 48a22c390a..f37407586b 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -81,6 +81,21 @@ SimpleEnvMap dsound_map[] =3D { { /* End of list */ } }; =20 +SimpleEnvMap oss_map[] =3D { + { "QEMU_AUDIO_DAC_TRY_POLL", "oss-out.try-poll", ENV_TRANSFORM_BOOL }, + { "QEMU_AUDIO_ADC_TRY_POLL", "oss-in.try-poll", ENV_TRANSFORM_BOOL }, + + { "QEMU_OSS_FRAGSIZE", "buffer-len", ENV_TRANSFORM_BYTES_TO_USECS_OUT = }, + { "QEMU_OSS_NFRAGS", "buffer-count" }, + { "QEMU_OSS_MMAP", "try-mmap", ENV_TRANSFORM_BOOL }, + { "QEMU_OSS_DAC_DEV", "oss-out.dev" }, + { "QEMU_OSS_ADC_DEV", "oss-in.dev" }, + { "QEMU_OSS_EXCLUSIVE", "exclusive", ENV_TRANSFORM_BOOL }, + { "QEMU_OSS_POLICY", "dsp-policy" }, + + { /* End of list */ } +}; + static unsigned long long toull(const char *str) { unsigned long long ret; @@ -255,6 +270,8 @@ static void legacy_opt(const char *drv) handle_env_opts(opts, coreaudio_map); } else if (strcmp(drv, "dsound") =3D=3D 0) { handle_env_opts(opts, dsound_map); + } else if (strcmp(drv, "oss") =3D=3D 0) { + handle_env_opts(opts, oss_map); } } =20 diff --git a/audio/ossaudio.c b/audio/ossaudio.c index e0cadbef29..83ff1d2ebd 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -27,6 +27,7 @@ #include "qemu-common.h" #include "qemu/main-loop.h" #include "qemu/host-utils.h" +#include "qapi/opts-visitor.h" #include "audio.h" #include "trace.h" =20 @@ -37,16 +38,6 @@ #define USE_DSP_POLICY #endif =20 -typedef struct OSSConf { - int try_mmap; - int nfrags; - int fragsize; - const char *devpath_out; - const char *devpath_in; - int exclusive; - int policy; -} OSSConf; - typedef struct OSSVoiceOut { HWVoiceOut hw; void *pcm_buf; @@ -56,7 +47,7 @@ typedef struct OSSVoiceOut { int fragsize; int mmapped; int pending; - OSSConf *conf; + Audiodev *dev; } OSSVoiceOut; =20 typedef struct OSSVoiceIn { @@ -65,12 +56,12 @@ typedef struct OSSVoiceIn { int fd; int nfrags; int fragsize; - OSSConf *conf; + Audiodev *dev; } OSSVoiceIn; =20 struct oss_params { int freq; - AudioFormat fmt; + int fmt; int nchannels; int nfrags; int fragsize; @@ -262,19 +253,26 @@ static int oss_get_version (int fd, int *version, con= st char *typ) } #endif =20 -static int oss_open (int in, struct oss_params *req, - struct oss_params *obt, int *pfd, OSSConf* conf) +static int oss_open(int in, struct oss_params *req, audsettings *as, + struct oss_params *obt, int *pfd, Audiodev *dev) { + AudiodevOssOptions *oopts =3D &dev->u.oss; + AudiodevOssPerDirectionOptions *opdo =3D in ? oopts->oss_in : oopts->o= ss_out; + AudiodevPerDirectionOptions *pdo =3D in ? dev->in : dev->out; int fd; - int oflags =3D conf->exclusive ? O_EXCL : 0; + int oflags =3D (oopts->has_exclusive && oopts->exclusive) ? O_EXCL : 0; audio_buf_info abinfo; int fmt, freq, nchannels; int setfragment =3D 1; - const char *dspname =3D in ? conf->devpath_in : conf->devpath_out; + const char *dspname =3D opdo->has_dev ? opdo->dev : "/dev/dsp"; const char *typ =3D in ? "ADC" : "DAC"; +#ifdef USE_DSP_POLICY + int policy =3D oopts->has_dsp_policy ? oopts->dsp_policy : 5; +#endif =20 /* Kludge needed to have working mmap on Linux */ - oflags |=3D conf->try_mmap ? O_RDWR : (in ? O_RDONLY : O_WRONLY); + oflags |=3D (oopts->has_try_mmap && oopts->try_mmap) ? + O_RDWR : (in ? O_RDONLY : O_WRONLY); =20 fd =3D open (dspname, oflags | O_NONBLOCK); if (-1 =3D=3D fd) { @@ -285,6 +283,8 @@ static int oss_open (int in, struct oss_params *req, freq =3D req->freq; nchannels =3D req->nchannels; fmt =3D req->fmt; + req->nfrags =3D pdo->has_buffer_count ? pdo->buffer_count : 4; + req->fragsize =3D audio_buffer_bytes(pdo, as, 23220); =20 if (ioctl (fd, SNDCTL_DSP_SAMPLESIZE, &fmt)) { oss_logerr2 (errno, typ, "Failed to set sample size %d\n", req->fm= t); @@ -308,18 +308,18 @@ static int oss_open (int in, struct oss_params *req, } =20 #ifdef USE_DSP_POLICY - if (conf->policy >=3D 0) { + if (policy >=3D 0) { int version; =20 if (!oss_get_version (fd, &version, typ)) { trace_oss_version(version); =20 if (version >=3D 0x040000) { - int policy =3D conf->policy; - if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) { + int policy2 =3D policy; + if (ioctl (fd, SNDCTL_DSP_POLICY, &policy2)) { oss_logerr2 (errno, typ, "Failed to set timing policy to %d\n", - conf->policy); + policy); goto err; } setfragment =3D 0; @@ -502,17 +502,16 @@ static int oss_init_out(HWVoiceOut *hw, struct audset= tings *as, int fd; AudioFormat effective_fmt; struct audsettings obt_as; - OSSConf *conf =3D drv_opaque; + Audiodev *dev =3D drv_opaque; + AudiodevOssOptions *oopts =3D &dev->u.oss; =20 oss->fd =3D -1; =20 req.fmt =3D aud_to_ossfmt (as->fmt, as->endianness); req.freq =3D as->freq; req.nchannels =3D as->nchannels; - req.fragsize =3D conf->fragsize; - req.nfrags =3D conf->nfrags; =20 - if (oss_open (0, &req, &obt, &fd, conf)) { + if (oss_open(0, &req, as, &obt, &fd, dev)) { return -1; } =20 @@ -539,7 +538,7 @@ static int oss_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, hw->samples =3D (obt.nfrags * obt.fragsize) >> hw->info.shift; =20 oss->mmapped =3D 0; - if (conf->try_mmap) { + if (oopts->has_try_mmap && oopts->try_mmap) { oss->pcm_buf =3D mmap ( NULL, hw->samples << hw->info.shift, @@ -597,7 +596,7 @@ static int oss_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, } =20 oss->fd =3D fd; - oss->conf =3D conf; + oss->dev =3D dev; return 0; } =20 @@ -605,16 +604,12 @@ static int oss_ctl_out (HWVoiceOut *hw, int cmd, ...) { int trig; OSSVoiceOut *oss =3D (OSSVoiceOut *) hw; + AudiodevOssPerDirectionOptions *opdo =3D oss->dev->u.oss.oss_out; =20 switch (cmd) { case VOICE_ENABLE: { - va_list ap; - int poll_mode; - - va_start (ap, cmd); - poll_mode =3D va_arg (ap, int); - va_end (ap); + bool poll_mode =3D !opdo->has_try_poll || opdo->try_poll; =20 ldebug ("enabling voice\n"); if (poll_mode) { @@ -669,16 +664,14 @@ static int oss_init_in(HWVoiceIn *hw, struct audsetti= ngs *as, void *drv_opaque) int fd; AudioFormat effective_fmt; struct audsettings obt_as; - OSSConf *conf =3D drv_opaque; + Audiodev *dev =3D drv_opaque; =20 oss->fd =3D -1; =20 req.fmt =3D aud_to_ossfmt (as->fmt, as->endianness); req.freq =3D as->freq; req.nchannels =3D as->nchannels; - req.fragsize =3D conf->fragsize; - req.nfrags =3D conf->nfrags; - if (oss_open (1, &req, &obt, &fd, conf)) { + if (oss_open(1, &req, as, &obt, &fd, dev)) { return -1; } =20 @@ -712,7 +705,7 @@ static int oss_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) } =20 oss->fd =3D fd; - oss->conf =3D conf; + oss->dev =3D dev; return 0; } =20 @@ -803,16 +796,12 @@ static int oss_read (SWVoiceIn *sw, void *buf, int si= ze) static int oss_ctl_in (HWVoiceIn *hw, int cmd, ...) { OSSVoiceIn *oss =3D (OSSVoiceIn *) hw; + AudiodevOssPerDirectionOptions *opdo =3D oss->dev->u.oss.oss_out; =20 switch (cmd) { case VOICE_ENABLE: { - va_list ap; - int poll_mode; - - va_start (ap, cmd); - poll_mode =3D va_arg (ap, int); - va_end (ap); + bool poll_mode =3D !opdo->has_try_poll || opdo->try_poll; =20 if (poll_mode) { oss_poll_in (hw); @@ -832,82 +821,25 @@ static int oss_ctl_in (HWVoiceIn *hw, int cmd, ...) return 0; } =20 -static OSSConf glob_conf =3D { - .try_mmap =3D 0, - .nfrags =3D 4, - .fragsize =3D 4096, - .devpath_out =3D "/dev/dsp", - .devpath_in =3D "/dev/dsp", - .exclusive =3D 0, - .policy =3D 5 -}; - static void *oss_audio_init(Audiodev *dev) { - OSSConf *conf =3D g_malloc(sizeof(OSSConf)); - *conf =3D glob_conf; + AudiodevOssOptions *oopts; + assert(dev->driver =3D=3D AUDIODEV_DRIVER_OSS); =20 - if (access(conf->devpath_in, R_OK | W_OK) < 0 || - access(conf->devpath_out, R_OK | W_OK) < 0) { - g_free(conf); + oopts =3D &dev->u.oss; + if (access(oopts->oss_in->has_dev ? oopts->oss_in->dev : "/dev/dsp", + R_OK | W_OK) < 0 || + access(oopts->oss_out->has_dev ? oopts->oss_out->dev : "/dev/dsp", + R_OK | W_OK) < 0) { return NULL; } - return conf; + return dev; } =20 static void oss_audio_fini (void *opaque) { - g_free(opaque); } =20 -static struct audio_option oss_options[] =3D { - { - .name =3D "FRAGSIZE", - .tag =3D AUD_OPT_INT, - .valp =3D &glob_conf.fragsize, - .descr =3D "Fragment size in bytes" - }, - { - .name =3D "NFRAGS", - .tag =3D AUD_OPT_INT, - .valp =3D &glob_conf.nfrags, - .descr =3D "Number of fragments" - }, - { - .name =3D "MMAP", - .tag =3D AUD_OPT_BOOL, - .valp =3D &glob_conf.try_mmap, - .descr =3D "Try using memory mapped access" - }, - { - .name =3D "DAC_DEV", - .tag =3D AUD_OPT_STR, - .valp =3D &glob_conf.devpath_out, - .descr =3D "Path to DAC device" - }, - { - .name =3D "ADC_DEV", - .tag =3D AUD_OPT_STR, - .valp =3D &glob_conf.devpath_in, - .descr =3D "Path to ADC device" - }, - { - .name =3D "EXCLUSIVE", - .tag =3D AUD_OPT_BOOL, - .valp =3D &glob_conf.exclusive, - .descr =3D "Open device in exclusive mode (vmix won't work)" - }, -#ifdef USE_DSP_POLICY - { - .name =3D "POLICY", - .tag =3D AUD_OPT_INT, - .valp =3D &glob_conf.policy, - .descr =3D "Set the timing policy of the device, -1 to use fragmen= t mode", - }, -#endif - { /* End of list */ } -}; - static struct audio_pcm_ops oss_pcm_ops =3D { .init_out =3D oss_init_out, .fini_out =3D oss_fini_out, @@ -925,7 +857,6 @@ static struct audio_pcm_ops oss_pcm_ops =3D { static struct audio_driver oss_audio_driver =3D { .name =3D "oss", .descr =3D "OSS http://www.opensound.com", - .options =3D oss_options, .init =3D oss_audio_init, .fini =3D oss_audio_fini, .pcm_ops =3D &oss_pcm_ops, --=20 2.20.1