From nobody Fri Nov 7 04:15:01 2025 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15476823365991012.7791994647525; Wed, 16 Jan 2019 15:45:36 -0800 (PST) Received: from localhost ([127.0.0.1]:33065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjusJ-0001uo-7i for importer@patchew.org; Wed, 16 Jan 2019 18:45:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjuks-00046v-4B for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:37:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjukj-0002ts-Sg for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:37:52 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:45494) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gjukj-0002hx-DH for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:37:45 -0500 Received: by mail-wr1-x443.google.com with SMTP id t6so8903510wrr.12 for ; Wed, 16 Jan 2019 15:37:35 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-e4b0-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:e4b0::5]) by smtp.gmail.com with ESMTPSA id s66sm30760437wmf.34.2019.01.16.15.37.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 15:37:33 -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=V1RGCp9xhLDikvB38j9gPHnz1eckoONO6UVeTZFRyRg=; b=rW9ClZnZJVOFo/j8eQ79acJdfIV+NfC4vqS1XgaJkBHFaiuoBYa08GyP8uVBU66Rba Ie4KnmiuDa9amkP7PyLMHYcvxVqY0mvSTANK4xV4PXnAxEITA4jk9Hh8euMxtSPvimh3 icTxdz5fRERYRZI6wSw390J5GxCaqnJ3hbpLOXAUddT1UBCUzeAr5/7kThe1rkkKh4w5 5OcLzLRFgqdSjTh1kkUfHMxZAJVNsM0PFeclTD0nwbkJls0bq8hHBy66G4Cn9j5X3WFU DD474v91Qyz7ZCHSyf4WEd7r1RxxC+N8HnhCIemwKHMWTcS8N87l+jPoDjDNahAyKK9b pn0A== 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=V1RGCp9xhLDikvB38j9gPHnz1eckoONO6UVeTZFRyRg=; b=h+FGw2N2aacByAZexnu8P48eqiS8l8N4faHGkMm0epgTvYJxoThhgoQ96RAU79gx6n MXrtB0jCR5Mta1aO0HQBaSX9PTfMm0uZcRZyicg57AupgChqGg4fwOXqebYMZpokrpRb GtpUfuoEMfbndw01UV7ziuxFW1Id6eL0b8n9bCEpf3AMCDHxOfX+Rbz50FsoDobj435n OpNbNp8SkB05eFNNQOXBMTuQXhwww+jSo3nc1aQB7waSBm425TjqIqVeDdmj775rEZ33 4z95II/i+DBPeawJlDvvqopSeoYbs3o0QovQc7Xlh1FYn5APHdNDjHJdYElah8SVXzUA FF7w== X-Gm-Message-State: AJcUuke1UMATMIpQzxe0G8ur0Jc8sEWIIgTMVHoOhHigOD21lTZqAWOo J5u6unNlf0M1oqfXDH8EdBJo3nwmiV4= X-Google-Smtp-Source: ALg8bN5QmcEFrHKiyTvZz4VZkqsA9AhhxS/rXZSkpMHh34fano7WQ1tzCYRnPX/YdRNK6ipsiGhTxA== X-Received: by 2002:adf:8484:: with SMTP id 4mr9392882wrg.249.1547681854513; Wed, 16 Jan 2019 15:37:34 -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: Thu, 17 Jan 2019 00:36:43 +0100 Message-Id: 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::443 Subject: [Qemu-devel] [PATCH v3 10/50] paaudio: 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 | 39 +++++++++++++++++++ audio/paaudio.c | 90 ++++++++++++++++++++------------------------ 2 files changed, 79 insertions(+), 50 deletions(-) diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c index 70b46cbcc1..d173ff042e 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -127,6 +127,16 @@ static uint32_t samples_to_usecs(uint32_t samples, return frames_to_usecs(samples / channels, pdo); } =20 +static void get_samples_to_usecs(const char *env, uint32_t *dst, bool *has= _dst, + AudiodevPerDirectionOptions *pdo) +{ + const char *val =3D getenv(env); + if (val) { + *dst =3D samples_to_usecs(toui32(val), pdo); + *has_dst =3D true; + } +} + static uint32_t bytes_to_usecs(uint32_t bytes, AudiodevPerDirectionOptions= *pdo) { AudioFormat fmt =3D pdo->has_format ? pdo->format : AUDIO_FORMAT_S16; @@ -250,6 +260,31 @@ static void handle_oss(Audiodev *dev) get_int("QEMU_OSS_POLICY", &oopt->dsp_policy, &oopt->has_dsp_policy); } =20 +/* pulseaudio */ +static void handle_pa_per_direction( + AudiodevPaPerDirectionOptions **ppdo, bool *has_ppdo, const char *env) +{ + *ppdo =3D g_malloc0(sizeof(AudiodevPaPerDirectionOptions)); + *has_ppdo =3D true; + + get_str(env, &(*ppdo)->name, &(*ppdo)->has_name); +} + +static void handle_pa(Audiodev *dev) +{ + handle_pa_per_direction(&dev->u.pa.sink, &dev->u.pa.has_sink, + "QEMU_PA_SINK"); + handle_pa_per_direction(&dev->u.pa.source, &dev->u.pa.has_source, + "QEMU_PA_SOURCE"); + + get_samples_to_usecs("QEMU_PA_SAMPLES", &dev->in->buffer_len, + &dev->in->has_buffer_len, dev->in); + get_samples_to_usecs("QEMU_PA_SAMPLES", &dev->out->buffer_len, + &dev->out->has_buffer_len, dev->out); + + get_str("QEMU_PA_SERVER", &dev->u.pa.server, &dev->u.pa.has_server); +} + /* general */ static void handle_per_direction( AudiodevPerDirectionOptions *pdo, const char *prefix) @@ -309,6 +344,10 @@ static AudiodevListEntry *legacy_opt(const char *drvna= me) handle_oss(e->dev); break; =20 + case AUDIODEV_DRIVER_PA: + handle_pa(e->dev); + break; + default: break; } diff --git a/audio/paaudio.c b/audio/paaudio.c index 0981f010c9..33e0e5d9be 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -2,6 +2,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "audio.h" +#include "qapi/opts-visitor.h" =20 #include =20 @@ -10,14 +11,7 @@ #include "audio_pt_int.h" =20 typedef struct { - int samples; - char *server; - char *sink; - char *source; -} PAConf; - -typedef struct { - PAConf conf; + Audiodev *dev; pa_threaded_mainloop *mainloop; pa_context *context; } paaudio; @@ -32,6 +26,7 @@ typedef struct { void *pcm_buf; struct audio_pt pt; paaudio *g; + int samples; } PAVoiceOut; =20 typedef struct { @@ -46,6 +41,7 @@ typedef struct { const void *read_data; size_t read_index, read_length; paaudio *g; + int samples; } PAVoiceIn; =20 static void qpa_audio_fini(void *opaque); @@ -227,7 +223,7 @@ static void *qpa_thread_out (void *arg) } } =20 - decr =3D to_mix =3D audio_MIN(pa->live, pa->g->conf.samples >> 5); + decr =3D to_mix =3D audio_MIN(pa->live, pa->samples >> 5); rpos =3D pa->rpos; =20 if (audio_pt_unlock(&pa->pt, __func__)) { @@ -319,7 +315,7 @@ static void *qpa_thread_in (void *arg) } } =20 - incr =3D to_grab =3D audio_MIN(pa->dead, pa->g->conf.samples >> 5); + incr =3D to_grab =3D audio_MIN(pa->dead, pa->samples >> 5); wpos =3D pa->wpos; =20 if (audio_pt_unlock(&pa->pt, __func__)) { @@ -546,6 +542,8 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, struct audsettings obt_as =3D *as; PAVoiceOut *pa =3D (PAVoiceOut *) hw; paaudio *g =3D pa->g =3D drv_opaque; + AudiodevPaOptions *popts =3D &g->dev->u.pa; + AudiodevPaPerDirectionOptions *ppdo =3D popts->sink; =20 ss.format =3D audfmt_to_pa (as->fmt, as->endianness); ss.channels =3D as->nchannels; @@ -566,7 +564,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, g, "qemu", PA_STREAM_PLAYBACK, - g->conf.sink, + ppdo->has_name ? ppdo->name : NULL, &ss, NULL, /* channel map */ &ba, /* buffering attributes */ @@ -578,7 +576,8 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsetti= ngs *as, } =20 audio_pcm_init_info (&hw->info, &obt_as); - hw->samples =3D g->conf.samples; + hw->samples =3D pa->samples =3D audio_buffer_samples(g->dev->out, &obt= _as, + 46440); pa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shif= t); pa->rpos =3D hw->rpos; if (!pa->pcm_buf) { @@ -612,6 +611,8 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) struct audsettings obt_as =3D *as; PAVoiceIn *pa =3D (PAVoiceIn *) hw; paaudio *g =3D pa->g =3D drv_opaque; + AudiodevPaOptions *popts =3D &g->dev->u.pa; + AudiodevPaPerDirectionOptions *ppdo =3D popts->source; =20 ss.format =3D audfmt_to_pa (as->fmt, as->endianness); ss.channels =3D as->nchannels; @@ -623,7 +624,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) g, "qemu", PA_STREAM_RECORD, - g->conf.source, + ppdo->has_name ? ppdo->name : NULL, &ss, NULL, /* channel map */ NULL, /* buffering attributes */ @@ -635,7 +636,8 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsetting= s *as, void *drv_opaque) } =20 audio_pcm_init_info (&hw->info, &obt_as); - hw->samples =3D g->conf.samples; + hw->samples =3D pa->samples =3D audio_buffer_samples(g->dev->in, &obt_= as, + 46440); pa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shif= t); pa->wpos =3D hw->wpos; if (!pa->pcm_buf) { @@ -808,14 +810,31 @@ static int qpa_ctl_in (HWVoiceIn *hw, int cmd, ...) } =20 /* common */ -static PAConf glob_conf =3D { - .samples =3D 4096, -}; +static void qpa_init_per_direction(AudiodevPaPerDirectionOptions **ppdo, + bool *has_ppdo) +{ + if (!*has_ppdo) { + *ppdo =3D g_malloc0(sizeof(AudiodevPaPerDirectionOptions)); + *has_ppdo =3D true; + } +} =20 static void *qpa_audio_init(Audiodev *dev) { - paaudio *g =3D g_malloc(sizeof(paaudio)); - g->conf =3D glob_conf; + paaudio *g; + AudiodevPaOptions *popts; + const char *server; + + assert(dev->driver =3D=3D AUDIODEV_DRIVER_PA); + + qpa_init_per_direction(&dev->u.pa.sink, &dev->u.pa.has_sink); + qpa_init_per_direction(&dev->u.pa.source, &dev->u.pa.has_source); + + g =3D g_malloc(sizeof(paaudio)); + popts =3D &dev->u.pa; + server =3D popts->has_server ? popts->server : NULL; + + g->dev =3D dev; g->mainloop =3D NULL; g->context =3D NULL; =20 @@ -825,14 +844,14 @@ static void *qpa_audio_init(Audiodev *dev) } =20 g->context =3D pa_context_new (pa_threaded_mainloop_get_api (g->mainlo= op), - g->conf.server); + server); if (!g->context) { goto fail; } =20 pa_context_set_state_callback (g->context, context_state_cb, g); =20 - if (pa_context_connect (g->context, g->conf.server, 0, NULL) < 0) { + if (pa_context_connect (g->context, server, 0, NULL) < 0) { qpa_logerr (pa_context_errno (g->context), "pa_context_connect() failed\n"); goto fail; @@ -895,34 +914,6 @@ static void qpa_audio_fini (void *opaque) g_free(g); } =20 -struct audio_option qpa_options[] =3D { - { - .name =3D "SAMPLES", - .tag =3D AUD_OPT_INT, - .valp =3D &glob_conf.samples, - .descr =3D "buffer size in samples" - }, - { - .name =3D "SERVER", - .tag =3D AUD_OPT_STR, - .valp =3D &glob_conf.server, - .descr =3D "server address" - }, - { - .name =3D "SINK", - .tag =3D AUD_OPT_STR, - .valp =3D &glob_conf.sink, - .descr =3D "sink device name" - }, - { - .name =3D "SOURCE", - .tag =3D AUD_OPT_STR, - .valp =3D &glob_conf.source, - .descr =3D "source device name" - }, - { /* End of list */ } -}; - static struct audio_pcm_ops qpa_pcm_ops =3D { .init_out =3D qpa_init_out, .fini_out =3D qpa_fini_out, @@ -940,7 +931,6 @@ static struct audio_pcm_ops qpa_pcm_ops =3D { static struct audio_driver pa_audio_driver =3D { .name =3D "pa", .descr =3D "http://www.pulseaudio.org/", - .options =3D qpa_options, .init =3D qpa_audio_init, .fini =3D qpa_audio_fini, .pcm_ops =3D &qpa_pcm_ops, --=20 2.20.1