From nobody Mon Feb 9 01:01:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=gmail.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552084944789500.73065365580305; Fri, 8 Mar 2019 14:42:24 -0800 (PST) Received: from localhost ([127.0.0.1]:50874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2OC1-0005SD-9s for importer@patchew.org; Fri, 08 Mar 2019 17:42:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2O4a-0007fL-Sq for qemu-devel@nongnu.org; Fri, 08 Mar 2019 17:34:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2O4Y-0002cA-Hd for qemu-devel@nongnu.org; Fri, 08 Mar 2019 17:34:36 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:46384) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2O4Y-0002bi-2s for qemu-devel@nongnu.org; Fri, 08 Mar 2019 17:34:34 -0500 Received: by mail-wr1-x42e.google.com with SMTP id i16so22933198wrs.13 for ; Fri, 08 Mar 2019 14:34:33 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-6af5-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:6af5::5]) by smtp.gmail.com with ESMTPSA id v2sm15269144wme.29.2019.03.08.14.34.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 14:34:32 -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=gaHdir15EirF/hlhMFUsUdiPTNAOm/UWRLXIYmmdsks=; b=aHfYb7ZjFaJ6HZ7cY7v4gDCU1TBvS6HicOmZHZQe1XaUTdMbtupH7+/GCq/jiGwg1F aI5YYiFLaiPSjKTMz6VH3O7rVaz7t3auWlfNMuEwIGznwIixvBIzaCI2MY/VIYUAOUkX ZB4A8IB3/64zjqWtcSbgff2I0jR5mhJEh08xJ9Cp6PXtJJT5PWoB60J7HHajYYzNufOE uJnMLDrwqslhcCyGo3Z3qhzQZnf2u+CyLFPKv0NaqL68rp8tHD/QtcHfGOOdSBo1G3wr mHnUNDSqXGyy0frl1u0qoD0e/jJmj2Qhq/Gk7sspSCP6gavN+9vNhgLgvufrLr7wxWhP 0Z/A== 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=gaHdir15EirF/hlhMFUsUdiPTNAOm/UWRLXIYmmdsks=; b=OQvQoH9MdHCgbIRf/8SlJEode0sYyKBsRTNJOX/Qv4zgqSZNzeiNRvOEzWiqg+d1bi eiFxNjloOPvXzUzifoTDheTdokxbNClUxyzfCsJmzNQcRTQ3bTj3VYPQX+Z4g1XGw0kw nyshzuoiJ+RQ0qiP/cXxPlYankLuPmkn0wjsprxwtYFH4wz227CXBCEk9jDZOCF0PLyS /y1cHlx7UNS6/mdyWfguPmlI/ulYkuiYoXFOGw3Hi5MDSgWCSwGtnEaffpF811ivgRnX 1VJKtHxK1SPWnFDth2xazusNBJCbtvL5psjr5ObhBgwS7izDSUBA+rI8elFFYWQkd1d/ 7Dig== X-Gm-Message-State: APjAAAWsFkwgfd4v5vXsiInAA0SYigw+wuV8sK02Gplqje/TpMvsWndU 7iVmMwovrC8NgMPwMOBo0i6rJYclmQM= X-Google-Smtp-Source: APXvYqzDDh7ybd4NjEhzozdZ3CSOnGx344L1a8FycrVTpMCXLWDo4hqxg03aTfP7t1aWgQ7H+UBPuA== X-Received: by 2002:adf:e64c:: with SMTP id b12mr3449357wrn.112.1552084472713; Fri, 08 Mar 2019 14:34:32 -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: Fri, 8 Mar 2019 23:34:16 +0100 Message-Id: <663d2c918a11ef44d4042e56c796d6dbf40be70c.1552083282.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::42e Subject: [Qemu-devel] [PATCH v6 05/14] alsaaudio: 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/alsaaudio.c | 329 +++++++++++++------------------------------ audio/audio_legacy.c | 84 ++++++++++- 2 files changed, 181 insertions(+), 232 deletions(-) diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index 8302f3e882..49e6884309 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -33,28 +33,9 @@ #define AUDIO_CAP "alsa" #include "audio_int.h" =20 -typedef struct ALSAConf { - int size_in_usec_in; - int size_in_usec_out; - const char *pcm_name_in; - const char *pcm_name_out; - unsigned int buffer_size_in; - unsigned int period_size_in; - unsigned int buffer_size_out; - unsigned int period_size_out; - unsigned int threshold; - - int buffer_size_in_overridden; - int period_size_in_overridden; - - int buffer_size_out_overridden; - int period_size_out_overridden; -} ALSAConf; - struct pollhlp { snd_pcm_t *handle; struct pollfd *pfds; - ALSAConf *conf; int count; int mask; }; @@ -66,6 +47,7 @@ typedef struct ALSAVoiceOut { void *pcm_buf; snd_pcm_t *handle; struct pollhlp pollhlp; + Audiodev *dev; } ALSAVoiceOut; =20 typedef struct ALSAVoiceIn { @@ -73,16 +55,13 @@ typedef struct ALSAVoiceIn { snd_pcm_t *handle; void *pcm_buf; struct pollhlp pollhlp; + Audiodev *dev; } ALSAVoiceIn; =20 struct alsa_params_req { int freq; snd_pcm_format_t fmt; int nchannels; - int size_in_usec; - int override_mask; - unsigned int buffer_size; - unsigned int period_size; }; =20 struct alsa_params_obt { @@ -408,17 +387,18 @@ static int alsa_to_audfmt (snd_pcm_format_t alsafmt, = AudioFormat *fmt, =20 static void alsa_dump_info (struct alsa_params_req *req, struct alsa_params_obt *obt, - snd_pcm_format_t obtfmt) + snd_pcm_format_t obtfmt, + AudiodevAlsaPerDirectionOptions *apdo) { - dolog ("parameter | requested value | obtained value\n"); - dolog ("format | %10d | %10d\n", req->fmt, obtfmt); - dolog ("channels | %10d | %10d\n", - req->nchannels, obt->nchannels); - dolog ("frequency | %10d | %10d\n", req->freq, obt->freq); - dolog ("=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"= ); - dolog ("requested: buffer size %d period size %d\n", - req->buffer_size, req->period_size); - dolog ("obtained: samples %ld\n", obt->samples); + dolog("parameter | requested value | obtained value\n"); + dolog("format | %10d | %10d\n", req->fmt, obtfmt); + dolog("channels | %10d | %10d\n", + req->nchannels, obt->nchannels); + dolog("frequency | %10d | %10d\n", req->freq, obt->freq); + dolog("=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + dolog("requested: buffer len %" PRId32 " period len %" PRId32 "\n", + apdo->buffer_length, apdo->period_length); + dolog("obtained: samples %ld\n", obt->samples); } =20 static void alsa_set_threshold (snd_pcm_t *handle, snd_pcm_uframes_t thres= hold) @@ -451,23 +431,23 @@ static void alsa_set_threshold (snd_pcm_t *handle, sn= d_pcm_uframes_t threshold) } } =20 -static int alsa_open (int in, struct alsa_params_req *req, - struct alsa_params_obt *obt, snd_pcm_t **handlep, - ALSAConf *conf) +static int alsa_open(bool in, struct alsa_params_req *req, + struct alsa_params_obt *obt, snd_pcm_t **handlep, + Audiodev *dev) { + AudiodevAlsaOptions *aopts =3D &dev->u.alsa; + AudiodevAlsaPerDirectionOptions *apdo =3D in ? aopts->in : aopts->out; snd_pcm_t *handle; snd_pcm_hw_params_t *hw_params; int err; - int size_in_usec; unsigned int freq, nchannels; - const char *pcm_name =3D in ? conf->pcm_name_in : conf->pcm_name_out; + const char *pcm_name =3D apdo->has_dev ? apdo->dev : "default"; snd_pcm_uframes_t obt_buffer_size; const char *typ =3D in ? "ADC" : "DAC"; snd_pcm_format_t obtfmt; =20 freq =3D req->freq; nchannels =3D req->nchannels; - size_in_usec =3D req->size_in_usec; =20 snd_pcm_hw_params_alloca (&hw_params); =20 @@ -527,79 +507,42 @@ static int alsa_open (int in, struct alsa_params_req = *req, goto err; } =20 - if (req->buffer_size) { - unsigned long obt; + if (apdo->buffer_length) { + int dir =3D 0; + unsigned int btime =3D apdo->buffer_length; =20 - if (size_in_usec) { - int dir =3D 0; - unsigned int btime =3D req->buffer_size; + err =3D snd_pcm_hw_params_set_buffer_time_near( + handle, hw_params, &btime, &dir); =20 - err =3D snd_pcm_hw_params_set_buffer_time_near ( - handle, - hw_params, - &btime, - &dir - ); - obt =3D btime; - } - else { - snd_pcm_uframes_t bsize =3D req->buffer_size; - - err =3D snd_pcm_hw_params_set_buffer_size_near ( - handle, - hw_params, - &bsize - ); - obt =3D bsize; - } if (err < 0) { - alsa_logerr2 (err, typ, "Failed to set buffer %s to %d\n", - size_in_usec ? "time" : "size", req->buffer_size= ); + alsa_logerr2(err, typ, "Failed to set buffer time to %" PRId32= "\n", + apdo->buffer_length); goto err; } =20 - if ((req->override_mask & 2) && (obt - req->buffer_size)) - dolog ("Requested buffer %s %u was rejected, using %lu\n", - size_in_usec ? "time" : "size", req->buffer_size, obt); + if (apdo->has_buffer_length && btime !=3D apdo->buffer_length) { + dolog("Requested buffer time %" PRId32 + " was rejected, using %u\n", apdo->buffer_length, btime); + } } =20 - if (req->period_size) { - unsigned long obt; + if (apdo->period_length) { + int dir =3D 0; + unsigned int ptime =3D apdo->period_length; =20 - if (size_in_usec) { - int dir =3D 0; - unsigned int ptime =3D req->period_size; - - err =3D snd_pcm_hw_params_set_period_time_near ( - handle, - hw_params, - &ptime, - &dir - ); - obt =3D ptime; - } - else { - int dir =3D 0; - snd_pcm_uframes_t psize =3D req->period_size; - - err =3D snd_pcm_hw_params_set_period_size_near ( - handle, - hw_params, - &psize, - &dir - ); - obt =3D psize; - } + err =3D snd_pcm_hw_params_set_period_time_near(handle, hw_params, = &ptime, + &dir); =20 if (err < 0) { - alsa_logerr2 (err, typ, "Failed to set period %s to %d\n", - size_in_usec ? "time" : "size", req->period_size= ); + alsa_logerr2(err, typ, "Failed to set period time to %" PRId32= "\n", + apdo->period_length); goto err; } =20 - if (((req->override_mask & 1) && (obt - req->period_size))) - dolog ("Requested period %s %u was rejected, using %lu\n", - size_in_usec ? "time" : "size", req->period_size, obt); + if (apdo->has_period_length && ptime !=3D apdo->period_length) { + dolog("Requested period time %" PRId32 " was rejected, using %= d\n", + apdo->period_length, ptime); + } } =20 err =3D snd_pcm_hw_params (handle, hw_params); @@ -631,33 +574,12 @@ static int alsa_open (int in, struct alsa_params_req = *req, goto err; } =20 - if (!in && conf->threshold) { - snd_pcm_uframes_t threshold; - int bytes_per_sec; - - bytes_per_sec =3D freq << (nchannels =3D=3D 2); - - switch (obt->fmt) { - case AUDIO_FORMAT_S8: - case AUDIO_FORMAT_U8: - break; - - case AUDIO_FORMAT_S16: - case AUDIO_FORMAT_U16: - bytes_per_sec <<=3D 1; - break; - - case AUDIO_FORMAT_S32: - case AUDIO_FORMAT_U32: - bytes_per_sec <<=3D 2; - break; - - default: - abort(); - } - - threshold =3D (conf->threshold * bytes_per_sec) / 1000; - alsa_set_threshold (handle, threshold); + if (!in && aopts->has_threshold && aopts->threshold) { + struct audsettings as =3D { .freq =3D freq }; + alsa_set_threshold( + handle, + audio_buffer_frames(qapi_AudiodevAlsaPerDirectionOptions_base(= apdo), + &as, aopts->threshold)); } =20 obt->nchannels =3D nchannels; @@ -670,11 +592,11 @@ static int alsa_open (int in, struct alsa_params_req = *req, obt->nchannels !=3D req->nchannels || obt->freq !=3D req->freq) { dolog ("Audio parameters for %s\n", typ); - alsa_dump_info (req, obt, obtfmt); + alsa_dump_info(req, obt, obtfmt, apdo); } =20 #ifdef DEBUG - alsa_dump_info (req, obt, obtfmt); + alsa_dump_info(req, obt, obtfmt, pdo); #endif return 0; =20 @@ -800,19 +722,13 @@ static int alsa_init_out(HWVoiceOut *hw, struct audse= ttings *as, struct alsa_params_obt obt; snd_pcm_t *handle; struct audsettings obt_as; - ALSAConf *conf =3D drv_opaque; + Audiodev *dev =3D drv_opaque; =20 req.fmt =3D aud_to_alsafmt (as->fmt, as->endianness); req.freq =3D as->freq; req.nchannels =3D as->nchannels; - req.period_size =3D conf->period_size_out; - req.buffer_size =3D conf->buffer_size_out; - req.size_in_usec =3D conf->size_in_usec_out; - req.override_mask =3D - (conf->period_size_out_overridden ? 1 : 0) | - (conf->buffer_size_out_overridden ? 2 : 0); =20 - if (alsa_open (0, &req, &obt, &handle, conf)) { + if (alsa_open(0, &req, &obt, &handle, dev)) { return -1; } =20 @@ -833,7 +749,7 @@ static int alsa_init_out(HWVoiceOut *hw, struct audsett= ings *as, } =20 alsa->handle =3D handle; - alsa->pollhlp.conf =3D conf; + alsa->dev =3D dev; return 0; } =20 @@ -873,16 +789,12 @@ static int alsa_voice_ctl (snd_pcm_t *handle, const c= har *typ, int ctl) static int alsa_ctl_out (HWVoiceOut *hw, int cmd, ...) { ALSAVoiceOut *alsa =3D (ALSAVoiceOut *) hw; + AudiodevAlsaPerDirectionOptions *apdo =3D alsa->dev->u.alsa.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 apdo->try_poll; =20 ldebug ("enabling voice\n"); if (poll_mode && alsa_poll_out (hw)) { @@ -911,19 +823,13 @@ static int alsa_init_in(HWVoiceIn *hw, struct audsett= ings *as, void *drv_opaque) struct alsa_params_obt obt; snd_pcm_t *handle; struct audsettings obt_as; - ALSAConf *conf =3D drv_opaque; + Audiodev *dev =3D drv_opaque; =20 req.fmt =3D aud_to_alsafmt (as->fmt, as->endianness); req.freq =3D as->freq; req.nchannels =3D as->nchannels; - req.period_size =3D conf->period_size_in; - req.buffer_size =3D conf->buffer_size_in; - req.size_in_usec =3D conf->size_in_usec_in; - req.override_mask =3D - (conf->period_size_in_overridden ? 1 : 0) | - (conf->buffer_size_in_overridden ? 2 : 0); =20 - if (alsa_open (1, &req, &obt, &handle, conf)) { + if (alsa_open(1, &req, &obt, &handle, dev)) { return -1; } =20 @@ -944,7 +850,7 @@ static int alsa_init_in(HWVoiceIn *hw, struct audsettin= gs *as, void *drv_opaque) } =20 alsa->handle =3D handle; - alsa->pollhlp.conf =3D conf; + alsa->dev =3D dev; return 0; } =20 @@ -1086,16 +992,12 @@ static int alsa_read (SWVoiceIn *sw, void *buf, int = size) static int alsa_ctl_in (HWVoiceIn *hw, int cmd, ...) { ALSAVoiceIn *alsa =3D (ALSAVoiceIn *) hw; + AudiodevAlsaPerDirectionOptions *apdo =3D alsa->dev->u.alsa.in; =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 apdo->try_poll; =20 ldebug ("enabling voice\n"); if (poll_mode && alsa_poll_in (hw)) { @@ -1118,88 +1020,54 @@ static int alsa_ctl_in (HWVoiceIn *hw, int cmd, ...) return -1; } =20 -static ALSAConf glob_conf =3D { - .buffer_size_out =3D 4096, - .period_size_out =3D 1024, - .pcm_name_out =3D "default", - .pcm_name_in =3D "default", -}; +static void alsa_init_per_direction(AudiodevAlsaPerDirectionOptions *apdo) +{ + if (!apdo->has_try_poll) { + apdo->try_poll =3D true; + apdo->has_try_poll =3D true; + } +} =20 static void *alsa_audio_init(Audiodev *dev) { - ALSAConf *conf =3D g_malloc(sizeof(ALSAConf)); - *conf =3D glob_conf; - return conf; + AudiodevAlsaOptions *aopts; + assert(dev->driver =3D=3D AUDIODEV_DRIVER_ALSA); + + aopts =3D &dev->u.alsa; + alsa_init_per_direction(aopts->in); + alsa_init_per_direction(aopts->out); + + /* + * need to define them, as otherwise alsa produces no sound + * doesn't set has_* so alsa_open can identify it wasn't set by the us= er + */ + if (!dev->u.alsa.out->has_period_length) { + /* 1024 frames assuming 44100Hz */ + dev->u.alsa.out->period_length =3D 1024 * 1000000 / 44100; + } + if (!dev->u.alsa.out->has_buffer_length) { + /* 4096 frames assuming 44100Hz */ + dev->u.alsa.out->buffer_length =3D 4096ll * 1000000 / 44100; + } + + /* + * OptsVisitor sets unspecified optional fields to zero, but do not de= pend + * on it... + */ + if (!dev->u.alsa.in->has_period_length) { + dev->u.alsa.in->period_length =3D 0; + } + if (!dev->u.alsa.in->has_buffer_length) { + dev->u.alsa.in->buffer_length =3D 0; + } + + return dev; } =20 static void alsa_audio_fini (void *opaque) { - g_free(opaque); } =20 -static struct audio_option alsa_options[] =3D { - { - .name =3D "DAC_SIZE_IN_USEC", - .tag =3D AUD_OPT_BOOL, - .valp =3D &glob_conf.size_in_usec_out, - .descr =3D "DAC period/buffer size in microseconds (otherwis= e in frames)" - }, - { - .name =3D "DAC_PERIOD_SIZE", - .tag =3D AUD_OPT_INT, - .valp =3D &glob_conf.period_size_out, - .descr =3D "DAC period size (0 to go with system default)", - .overriddenp =3D &glob_conf.period_size_out_overridden - }, - { - .name =3D "DAC_BUFFER_SIZE", - .tag =3D AUD_OPT_INT, - .valp =3D &glob_conf.buffer_size_out, - .descr =3D "DAC buffer size (0 to go with system default)", - .overriddenp =3D &glob_conf.buffer_size_out_overridden - }, - { - .name =3D "ADC_SIZE_IN_USEC", - .tag =3D AUD_OPT_BOOL, - .valp =3D &glob_conf.size_in_usec_in, - .descr =3D - "ADC period/buffer size in microseconds (otherwise in frames)" - }, - { - .name =3D "ADC_PERIOD_SIZE", - .tag =3D AUD_OPT_INT, - .valp =3D &glob_conf.period_size_in, - .descr =3D "ADC period size (0 to go with system default)", - .overriddenp =3D &glob_conf.period_size_in_overridden - }, - { - .name =3D "ADC_BUFFER_SIZE", - .tag =3D AUD_OPT_INT, - .valp =3D &glob_conf.buffer_size_in, - .descr =3D "ADC buffer size (0 to go with system default)", - .overriddenp =3D &glob_conf.buffer_size_in_overridden - }, - { - .name =3D "THRESHOLD", - .tag =3D AUD_OPT_INT, - .valp =3D &glob_conf.threshold, - .descr =3D "(undocumented)" - }, - { - .name =3D "DAC_DEV", - .tag =3D AUD_OPT_STR, - .valp =3D &glob_conf.pcm_name_out, - .descr =3D "DAC device name (for instance dmix)" - }, - { - .name =3D "ADC_DEV", - .tag =3D AUD_OPT_STR, - .valp =3D &glob_conf.pcm_name_in, - .descr =3D "ADC device name" - }, - { /* End of list */ } -}; - static struct audio_pcm_ops alsa_pcm_ops =3D { .init_out =3D alsa_init_out, .fini_out =3D alsa_fini_out, @@ -1217,7 +1085,6 @@ static struct audio_pcm_ops alsa_pcm_ops =3D { static struct audio_driver alsa_audio_driver =3D { .name =3D "alsa", .descr =3D "ALSA http://www.alsa-project.org", - .options =3D alsa_options, .init =3D alsa_audio_init, .fini =3D alsa_audio_fini, .pcm_ops =3D &alsa_pcm_ops, diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c index ad3b781add..f58c8b6aee 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -62,6 +62,18 @@ static void get_int(const char *env, uint32_t *dst, bool= *has_dst) } } =20 +static void get_str(const char *env, char **dst, bool *has_dst) +{ + const char *val =3D getenv(env); + if (val) { + if (*has_dst) { + g_free(*dst); + } + *dst =3D g_strdup(val); + *has_dst =3D true; + } +} + static void get_fmt(const char *env, AudioFormat *dst, bool *has_dst) { const char *val =3D getenv(env); @@ -80,8 +92,69 @@ static void get_fmt(const char *env, AudioFormat *dst, b= ool *has_dst) } } =20 + +static void get_millis_to_usecs(const char *env, uint32_t *dst, bool *has_= dst) +{ + const char *val =3D getenv(env); + if (val) { + *dst =3D toui32(val) * 1000; + *has_dst =3D true; + } +} + +static uint32_t frames_to_usecs(uint32_t frames, + AudiodevPerDirectionOptions *pdo) +{ + uint32_t freq =3D pdo->has_frequency ? pdo->frequency : 44100; + return (frames * 1000000 + freq / 2) / freq; +} + /* backend specific functions */ -/* todo */ +/* ALSA */ +static void handle_alsa_per_direction( + AudiodevAlsaPerDirectionOptions *apdo, const char *prefix) +{ + char buf[64]; + size_t len =3D strlen(prefix); + bool size_in_usecs =3D false; + bool dummy; + + memcpy(buf, prefix, len); + strcpy(buf + len, "TRY_POLL"); + get_bool(buf, &apdo->try_poll, &apdo->has_try_poll); + + strcpy(buf + len, "DEV"); + get_str(buf, &apdo->dev, &apdo->has_dev); + + strcpy(buf + len, "SIZE_IN_USEC"); + get_bool(buf, &size_in_usecs, &dummy); + + strcpy(buf + len, "PERIOD_SIZE"); + get_int(buf, &apdo->period_length, &apdo->has_period_length); + if (apdo->has_period_length && !size_in_usecs) { + apdo->period_length =3D frames_to_usecs( + apdo->period_length, + qapi_AudiodevAlsaPerDirectionOptions_base(apdo)); + } + + strcpy(buf + len, "BUFFER_SIZE"); + get_int(buf, &apdo->buffer_length, &apdo->has_buffer_length); + if (apdo->has_buffer_length && !size_in_usecs) { + apdo->buffer_length =3D frames_to_usecs( + apdo->buffer_length, + qapi_AudiodevAlsaPerDirectionOptions_base(apdo)); + } +} + +static void handle_alsa(Audiodev *dev) +{ + AudiodevAlsaOptions *aopt =3D &dev->u.alsa; + handle_alsa_per_direction(aopt->in, "QEMU_ALSA_ADC_"); + handle_alsa_per_direction(aopt->out, "QEMU_ALSA_DAC_"); + + get_millis_to_usecs("QEMU_ALSA_THRESHOLD", + &aopt->threshold, &aopt->has_threshold); +} =20 /* general */ static void handle_per_direction( @@ -123,6 +196,15 @@ static AudiodevListEntry *legacy_opt(const char *drvna= me) get_int("QEMU_AUDIO_TIMER_PERIOD", &e->dev->timer_period, &e->dev->has_timer_period); =20 + switch (e->dev->driver) { + case AUDIODEV_DRIVER_ALSA: + handle_alsa(e->dev); + break; + + default: + break; + } + return e; } =20 --=20 2.20.1