From nobody Wed Nov 12 06:52:11 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 ARC-Seal: i=1; a=rsa-sha256; t=1568575723; cv=none; d=zoho.com; s=zohoarc; b=R+zciQDiZIGvZ2AlxxzCEEcFXwMRT8JAcNmMbG1k2WKBM5+0mYqpv8Q6pkyUeIhDUDw94TioznEDcZTLV+Vf4ibLxauskF4xUwI/qDbM9EJb7y0UNBYbNGpD1tJJQN7qJdpINLiVJU1wBeVEIh2xKFalA9nzoD6iiBccXOy2ZxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568575723; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=AZf6/it/Lyk8fL9jYDjwtnrnumA5OJWUoIFrfXMwHcw=; b=DP4rX1ps9sey54CtpWh0A+7eEF6xdAKKrDJkaaHrhL/HiO9caHqX1Hk3ugvlT/DMe3OyRIjq0JRnOn6bV3s6FDa72jYRGMuL5LXLz4eis1kYgsMC/0xFx3FIZvihcLxNJhAI+7bY2QHON1U9UPZKudUX8/VuSABqb75gjVvFy/Q= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568575723148181.3768680914933; Sun, 15 Sep 2019 12:28:43 -0700 (PDT) Received: from localhost ([::1]:56582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9aCP-0002KU-PE for importer@patchew.org; Sun, 15 Sep 2019 15:28:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40008) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9a7h-00062M-Rp for qemu-devel@nongnu.org; Sun, 15 Sep 2019 15:23:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9a7f-0001yv-C9 for qemu-devel@nongnu.org; Sun, 15 Sep 2019 15:23:49 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:33377) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i9a7f-0001yZ-2H for qemu-devel@nongnu.org; Sun, 15 Sep 2019 15:23:47 -0400 Received: by mail-ed1-x534.google.com with SMTP id c4so2493267edl.0 for ; Sun, 15 Sep 2019 12:23:47 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-74ef-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:74ef::5]) by smtp.gmail.com with ESMTPSA id j20sm6480562edy.95.2019.09.15.12.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Sep 2019 12:23:45 -0700 (PDT) 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=AZf6/it/Lyk8fL9jYDjwtnrnumA5OJWUoIFrfXMwHcw=; b=j7n9gIc2LKIih8qKTiHz5cRyAUcxd3DAxNAjZRV3k4xssbuGYMpl/UKqtG8BmYZXCa fWqYydtS0VjBJUkcBWJ7LopgcJPYNqV++f5wWnWLEi11inW/pKyzcVmURm9VMr7hjfNf Fbgzvx5BKskQmpIh5mYm1idNcfYbyzgbnGiGsQh2rNQ1w6WvilPSgO/59dLA1IkR6tY2 A38gxm8h8/aXPedFz7ocAC02UePfQ1k8OLItszl2K8yeb1k8j/TJXpZG7b9qUkRUrp2U ZhU7sveurzkMAqPo0QuxSBL69v40lkrSHSYspgwkYgCS3ftENzPXHdvV/+1pHA0Mz3iD QCrQ== 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=AZf6/it/Lyk8fL9jYDjwtnrnumA5OJWUoIFrfXMwHcw=; b=TMQ2l+7wgcVzqpx8/eLVV/9Fgm8nT+FQ12MvDN6RhxUXQDnBtZSqHF5mw6kciHvDM9 Q5L0xKtSa1mdWhc4dMUXHyD/i6J8ZfAqLKgZQGmwn0BxcPSup0kM5dAr3egFUaB4Z+7K JVmkS0aIiE2wGnYOr5MabBer1vHhBmfLzf+58YCXTUT2tJr/c5rnBFhPcnTnU+pJy9Ae YeoVcGEJE8UoxhbsWie/ywABTLUhaPQBrkWWRxE6rYtuVK1GfvoRDz1LALbvJNwBpXvY 9E6Qnb1ZvxyuPNemy2aH9YxqyRwaKXGIpImZUmXoALBiEbwm5SLE687iGPhFPtUpj2xj YGzg== X-Gm-Message-State: APjAAAXBUJVvju0lVYLeV5ULEgapEHBT4MPyA2/cgfRMzEnLiD2RiLD0 jw2MppnZY3fKPKRzmTT1Z0z8ESYj X-Google-Smtp-Source: APXvYqxZSMbrReMPZnt/8jrWGsOm+YvFwAPxpjA+pjZ999+xFDxvDkhnsDnblmvr4zhaIp/kGi4YeQ== X-Received: by 2002:aa7:d4c8:: with SMTP id t8mr14028096edr.158.1568575425775; Sun, 15 Sep 2019 12:23:45 -0700 (PDT) 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, 15 Sep 2019 21:23:23 +0200 Message-Id: X-Mailer: git-send-email 2.23.0 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::534 Subject: [Qemu-devel] [PATCH v3 07/24] paaudio: port to the new audio backend api 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 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/Makefile.objs | 1 - audio/audio_pt_int.c | 173 -------------------- audio/audio_pt_int.h | 22 --- audio/paaudio.c | 372 ++++++------------------------------------- configure | 5 - 5 files changed, 45 insertions(+), 528 deletions(-) delete mode 100644 audio/audio_pt_int.c delete mode 100644 audio/audio_pt_int.h diff --git a/audio/Makefile.objs b/audio/Makefile.objs index dca87f6347..d7490a379f 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -2,7 +2,6 @@ common-obj-y =3D audio.o audio_legacy.o noaudio.o wavaudio.= o mixeng.o common-obj-$(CONFIG_SPICE) +=3D spiceaudio.o common-obj-$(CONFIG_AUDIO_COREAUDIO) +=3D coreaudio.o common-obj-$(CONFIG_AUDIO_DSOUND) +=3D dsoundaudio.o -common-obj-$(CONFIG_AUDIO_PT_INT) +=3D audio_pt_int.o common-obj-$(CONFIG_AUDIO_WIN_INT) +=3D audio_win_int.o common-obj-y +=3D wavcapture.o =20 diff --git a/audio/audio_pt_int.c b/audio/audio_pt_int.c deleted file mode 100644 index 9f9d44ad4a..0000000000 --- a/audio/audio_pt_int.c +++ /dev/null @@ -1,173 +0,0 @@ -#include "qemu/osdep.h" -#include "audio.h" - -#define AUDIO_CAP "audio-pt" - -#include "audio_int.h" -#include "audio_pt_int.h" - -static void GCC_FMT_ATTR(3, 4) logerr (struct audio_pt *pt, int err, - const char *fmt, ...) -{ - va_list ap; - - va_start (ap, fmt); - AUD_vlog (pt->drv, fmt, ap); - va_end (ap); - - AUD_log (NULL, "\n"); - AUD_log (pt->drv, "Reason: %s\n", strerror (err)); -} - -int audio_pt_init (struct audio_pt *p, void *(*func) (void *), - void *opaque, const char *drv, const char *cap) -{ - int err, err2; - const char *efunc; - sigset_t set, old_set; - - p->drv =3D drv; - - err =3D sigfillset (&set); - if (err) { - logerr(p, errno, "%s(%s): sigfillset failed", cap, __func__); - return -1; - } - - err =3D pthread_mutex_init (&p->mutex, NULL); - if (err) { - efunc =3D "pthread_mutex_init"; - goto err0; - } - - err =3D pthread_cond_init (&p->cond, NULL); - if (err) { - efunc =3D "pthread_cond_init"; - goto err1; - } - - err =3D pthread_sigmask (SIG_BLOCK, &set, &old_set); - if (err) { - efunc =3D "pthread_sigmask"; - goto err2; - } - - err =3D pthread_create (&p->thread, NULL, func, opaque); - - err2 =3D pthread_sigmask (SIG_SETMASK, &old_set, NULL); - if (err2) { - logerr(p, err2, "%s(%s): pthread_sigmask (restore) failed", - cap, __func__); - /* We have failed to restore original signal mask, all bets are of= f, - so terminate the process */ - exit (EXIT_FAILURE); - } - - if (err) { - efunc =3D "pthread_create"; - goto err2; - } - - return 0; - - err2: - err2 =3D pthread_cond_destroy (&p->cond); - if (err2) { - logerr(p, err2, "%s(%s): pthread_cond_destroy failed", cap, __func= __); - } - - err1: - err2 =3D pthread_mutex_destroy (&p->mutex); - if (err2) { - logerr(p, err2, "%s(%s): pthread_mutex_destroy failed", cap, __fun= c__); - } - - err0: - logerr(p, err, "%s(%s): %s failed", cap, __func__, efunc); - return -1; -} - -int audio_pt_fini (struct audio_pt *p, const char *cap) -{ - int err, ret =3D 0; - - err =3D pthread_cond_destroy (&p->cond); - if (err) { - logerr(p, err, "%s(%s): pthread_cond_destroy failed", cap, __func_= _); - ret =3D -1; - } - - err =3D pthread_mutex_destroy (&p->mutex); - if (err) { - logerr(p, err, "%s(%s): pthread_mutex_destroy failed", cap, __func= __); - ret =3D -1; - } - return ret; -} - -int audio_pt_lock (struct audio_pt *p, const char *cap) -{ - int err; - - err =3D pthread_mutex_lock (&p->mutex); - if (err) { - logerr(p, err, "%s(%s): pthread_mutex_lock failed", cap, __func__); - return -1; - } - return 0; -} - -int audio_pt_unlock (struct audio_pt *p, const char *cap) -{ - int err; - - err =3D pthread_mutex_unlock (&p->mutex); - if (err) { - logerr(p, err, "%s(%s): pthread_mutex_unlock failed", cap, __func_= _); - return -1; - } - return 0; -} - -int audio_pt_wait (struct audio_pt *p, const char *cap) -{ - int err; - - err =3D pthread_cond_wait (&p->cond, &p->mutex); - if (err) { - logerr(p, err, "%s(%s): pthread_cond_wait failed", cap, __func__); - return -1; - } - return 0; -} - -int audio_pt_unlock_and_signal (struct audio_pt *p, const char *cap) -{ - int err; - - err =3D pthread_mutex_unlock (&p->mutex); - if (err) { - logerr(p, err, "%s(%s): pthread_mutex_unlock failed", cap, __func_= _); - return -1; - } - err =3D pthread_cond_signal (&p->cond); - if (err) { - logerr(p, err, "%s(%s): pthread_cond_signal failed", cap, __func__= ); - return -1; - } - return 0; -} - -int audio_pt_join (struct audio_pt *p, void **arg, const char *cap) -{ - int err; - void *ret; - - err =3D pthread_join (p->thread, &ret); - if (err) { - logerr(p, err, "%s(%s): pthread_join failed", cap, __func__); - return -1; - } - *arg =3D ret; - return 0; -} diff --git a/audio/audio_pt_int.h b/audio/audio_pt_int.h deleted file mode 100644 index 4c0c15b9af..0000000000 --- a/audio/audio_pt_int.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef QEMU_AUDIO_PT_INT_H -#define QEMU_AUDIO_PT_INT_H - -#include - -struct audio_pt { - const char *drv; - pthread_t thread; - pthread_cond_t cond; - pthread_mutex_t mutex; -}; - -int audio_pt_init (struct audio_pt *, void *(*) (void *), void *, - const char *, const char *); -int audio_pt_fini (struct audio_pt *, const char *); -int audio_pt_lock (struct audio_pt *, const char *); -int audio_pt_unlock (struct audio_pt *, const char *); -int audio_pt_wait (struct audio_pt *, const char *); -int audio_pt_unlock_and_signal (struct audio_pt *, const char *); -int audio_pt_join (struct audio_pt *, void **, const char *); - -#endif /* QEMU_AUDIO_PT_INT_H */ diff --git a/audio/paaudio.c b/audio/paaudio.c index bfef9acaad..75fce53202 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -9,7 +9,6 @@ =20 #define AUDIO_CAP "pulseaudio" #include "audio_int.h" -#include "audio_pt_int.h" =20 typedef struct PAConnection { char *server; @@ -30,28 +29,16 @@ typedef struct { =20 typedef struct { HWVoiceOut hw; - size_t done; - size_t live; - size_t decr; - size_t rpos; pa_stream *stream; - void *pcm_buf; - struct audio_pt pt; paaudio *g; size_t samples; } PAVoiceOut; =20 typedef struct { HWVoiceIn hw; - size_t done; - size_t dead; - size_t incr; - size_t wpos; pa_stream *stream; - void *pcm_buf; - struct audio_pt pt; const void *read_data; - size_t read_index, read_length; + size_t read_length; paaudio *g; size_t samples; } PAVoiceIn; @@ -89,298 +76,96 @@ static inline int PA_STREAM_IS_GOOD(pa_stream_state_t = x) } #endif =20 -#define CHECK_SUCCESS_GOTO(c, rerror, expression, label) \ +#define CHECK_SUCCESS_GOTO(c, expression, label, msg) \ do { \ if (!(expression)) { \ - if (rerror) { \ - *(rerror) =3D pa_context_errno ((c)->context); \ - } \ + qpa_logerr(pa_context_errno((c)->context), msg); \ goto label; \ } \ } while (0) =20 -#define CHECK_DEAD_GOTO(c, stream, rerror, label) \ +#define CHECK_DEAD_GOTO(c, stream, label, msg) \ do { \ if (!(c)->context || !PA_CONTEXT_IS_GOOD (pa_context_get_state((c)= ->context)) || \ !(stream) || !PA_STREAM_IS_GOOD (pa_stream_get_state ((stream)= ))) { \ if (((c)->context && pa_context_get_state ((c)->context) =3D= =3D PA_CONTEXT_FAILED) || \ ((stream) && pa_stream_get_state ((stream)) =3D=3D PA_STRE= AM_FAILED)) { \ - if (rerror) { \ - *(rerror) =3D pa_context_errno ((c)->context); \ - } \ + qpa_logerr(pa_context_errno((c)->context), msg); \ } else { \ - if (rerror) { \ - *(rerror) =3D PA_ERR_BADSTATE; \ - } \ + qpa_logerr(PA_ERR_BADSTATE, msg); \ } \ goto label; \ } \ } while (0) =20 -static int qpa_simple_read (PAVoiceIn *p, void *data, size_t length, int *= rerror) +static size_t qpa_read(HWVoiceIn *hw, void *data, size_t length) { + PAVoiceIn *p =3D (PAVoiceIn *) hw; PAConnection *c =3D p->g->conn; + size_t l; + int r; =20 pa_threaded_mainloop_lock(c->mainloop); =20 - CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); - - while (length > 0) { - size_t l; - - while (!p->read_data) { - int r; - - r =3D pa_stream_peek (p->stream, &p->read_data, &p->read_lengt= h); - CHECK_SUCCESS_GOTO(c, rerror, r =3D=3D 0, unlock_and_fail); - - if (!p->read_data) { - pa_threaded_mainloop_wait(c->mainloop); - CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); - } else { - p->read_index =3D 0; - } - } - - l =3D p->read_length < length ? p->read_length : length; - memcpy (data, (const uint8_t *) p->read_data+p->read_index, l); - - data =3D (uint8_t *) data + l; - length -=3D l; + CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail, + "pa_threaded_mainloop_lock failed\n"); =20 - p->read_index +=3D l; - p->read_length -=3D l; + if (!p->read_length) { + r =3D pa_stream_peek(p->stream, &p->read_data, &p->read_length); + CHECK_SUCCESS_GOTO(c, r =3D=3D 0, unlock_and_fail, + "pa_stream_peek failed\n"); + } =20 - if (!p->read_length) { - int r; + l =3D MIN(p->read_length, length); + memcpy(data, p->read_data, l); =20 - r =3D pa_stream_drop (p->stream); - p->read_data =3D NULL; - p->read_length =3D 0; - p->read_index =3D 0; + p->read_data +=3D l; + p->read_length -=3D l; =20 - CHECK_SUCCESS_GOTO(c, rerror, r =3D=3D 0, unlock_and_fail); - } + if (!p->read_length) { + r =3D pa_stream_drop(p->stream); + CHECK_SUCCESS_GOTO(c, r =3D=3D 0, unlock_and_fail, + "pa_stream_drop failed\n"); } =20 pa_threaded_mainloop_unlock(c->mainloop); - return 0; + return l; =20 unlock_and_fail: pa_threaded_mainloop_unlock(c->mainloop); - return -1; + return 0; } =20 -static int qpa_simple_write (PAVoiceOut *p, const void *data, size_t lengt= h, int *rerror) +static size_t qpa_write(HWVoiceOut *hw, void *data, size_t length) { + PAVoiceOut *p =3D (PAVoiceOut *) hw; PAConnection *c =3D p->g->conn; + size_t l; + int r; =20 pa_threaded_mainloop_lock(c->mainloop); =20 - CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); + CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail, + "pa_threaded_mainloop_lock failed\n"); =20 - while (length > 0) { - size_t l; - int r; + l =3D pa_stream_writable_size(p->stream); =20 - while (!(l =3D pa_stream_writable_size (p->stream))) { - pa_threaded_mainloop_wait(c->mainloop); - CHECK_DEAD_GOTO(c, p->stream, rerror, unlock_and_fail); - } - - CHECK_SUCCESS_GOTO(c, rerror, l !=3D (size_t) -1, unlock_and_fail); - - if (l > length) { - l =3D length; - } + CHECK_SUCCESS_GOTO(c, l !=3D (size_t) -1, unlock_and_fail, + "pa_stream_writable_size failed\n"); =20 - r =3D pa_stream_write (p->stream, data, l, NULL, 0LL, PA_SEEK_RELA= TIVE); - CHECK_SUCCESS_GOTO(c, rerror, r >=3D 0, unlock_and_fail); - - data =3D (const uint8_t *) data + l; - length -=3D l; + if (l > length) { + l =3D length; } =20 + r =3D pa_stream_write(p->stream, data, l, NULL, 0LL, PA_SEEK_RELATIVE); + CHECK_SUCCESS_GOTO(c, r >=3D 0, unlock_and_fail, "pa_stream_write fail= ed\n"); + pa_threaded_mainloop_unlock(c->mainloop); - return 0; + return l; =20 unlock_and_fail: pa_threaded_mainloop_unlock(c->mainloop); - return -1; -} - -static void *qpa_thread_out (void *arg) -{ - PAVoiceOut *pa =3D arg; - HWVoiceOut *hw =3D &pa->hw; - - if (audio_pt_lock(&pa->pt, __func__)) { - return NULL; - } - - for (;;) { - size_t decr, to_mix, rpos; - - for (;;) { - if (pa->done) { - goto exit; - } - - if (pa->live > 0) { - break; - } - - if (audio_pt_wait(&pa->pt, __func__)) { - goto exit; - } - } - - decr =3D to_mix =3D MIN(pa->live, pa->samples >> 5); - rpos =3D pa->rpos; - - if (audio_pt_unlock(&pa->pt, __func__)) { - return NULL; - } - - while (to_mix) { - int error; - size_t chunk =3D MIN (to_mix, hw->samples - rpos); - struct st_sample *src =3D hw->mix_buf + rpos; - - hw->clip (pa->pcm_buf, src, chunk); - - if (qpa_simple_write (pa, pa->pcm_buf, - chunk << hw->info.shift, &error) < 0) { - qpa_logerr (error, "pa_simple_write failed\n"); - return NULL; - } - - rpos =3D (rpos + chunk) % hw->samples; - to_mix -=3D chunk; - } - - if (audio_pt_lock(&pa->pt, __func__)) { - return NULL; - } - - pa->rpos =3D rpos; - pa->live -=3D decr; - pa->decr +=3D decr; - } - - exit: - audio_pt_unlock(&pa->pt, __func__); - return NULL; -} - -static size_t qpa_run_out(HWVoiceOut *hw, size_t live) -{ - size_t decr; - PAVoiceOut *pa =3D (PAVoiceOut *) hw; - - if (audio_pt_lock(&pa->pt, __func__)) { - return 0; - } - - decr =3D MIN (live, pa->decr); - pa->decr -=3D decr; - pa->live =3D live - decr; - hw->rpos =3D pa->rpos; - if (pa->live > 0) { - audio_pt_unlock_and_signal(&pa->pt, __func__); - } - else { - audio_pt_unlock(&pa->pt, __func__); - } - return decr; -} - -/* capture */ -static void *qpa_thread_in (void *arg) -{ - PAVoiceIn *pa =3D arg; - HWVoiceIn *hw =3D &pa->hw; - - if (audio_pt_lock(&pa->pt, __func__)) { - return NULL; - } - - for (;;) { - size_t incr, to_grab, wpos; - - for (;;) { - if (pa->done) { - goto exit; - } - - if (pa->dead > 0) { - break; - } - - if (audio_pt_wait(&pa->pt, __func__)) { - goto exit; - } - } - - incr =3D to_grab =3D MIN(pa->dead, pa->samples >> 5); - wpos =3D pa->wpos; - - if (audio_pt_unlock(&pa->pt, __func__)) { - return NULL; - } - - while (to_grab) { - int error; - size_t chunk =3D MIN (to_grab, hw->samples - wpos); - void *buf =3D advance (pa->pcm_buf, wpos); - - if (qpa_simple_read (pa, buf, - chunk << hw->info.shift, &error) < 0) { - qpa_logerr (error, "pa_simple_read failed\n"); - return NULL; - } - - hw->conv (hw->conv_buf + wpos, buf, chunk); - wpos =3D (wpos + chunk) % hw->samples; - to_grab -=3D chunk; - } - - if (audio_pt_lock(&pa->pt, __func__)) { - return NULL; - } - - pa->wpos =3D wpos; - pa->dead -=3D incr; - pa->incr +=3D incr; - } - - exit: - audio_pt_unlock(&pa->pt, __func__); - return NULL; -} - -static size_t qpa_run_in(HWVoiceIn *hw) -{ - size_t live, incr, dead; - PAVoiceIn *pa =3D (PAVoiceIn *) hw; - - if (audio_pt_lock(&pa->pt, __func__)) { - return 0; - } - - live =3D audio_pcm_hw_get_live_in (hw); - dead =3D hw->samples - live; - incr =3D MIN (dead, pa->incr); - pa->incr -=3D incr; - pa->dead =3D dead - incr; - hw->wpos =3D pa->wpos; - if (pa->dead > 0) { - audio_pt_unlock_and_signal(&pa->pt, __func__); - } - else { - audio_pt_unlock(&pa->pt, __func__); - } - return incr; + return 0; } =20 static pa_sample_format_t audfmt_to_pa (AudioFormat afmt, int endianness) @@ -468,13 +253,6 @@ static void stream_state_cb (pa_stream *s, void * user= data) } } =20 -static void stream_request_cb (pa_stream *s, size_t length, void *userdata) -{ - PAConnection *c =3D userdata; - - pa_threaded_mainloop_signal(c->mainloop, 0); -} - static pa_stream *qpa_simple_new ( PAConnection *c, const char *name, @@ -497,8 +275,6 @@ static pa_stream *qpa_simple_new ( } =20 pa_stream_set_state_callback(stream, stream_state_cb, c); - pa_stream_set_read_callback(stream, stream_request_cb, c); - pa_stream_set_write_callback(stream, stream_request_cb, c); =20 flags =3D PA_STREAM_INTERPOLATE_TIMING @@ -579,28 +355,9 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsett= ings *as, hw->samples =3D pa->samples =3D audio_buffer_samples( qapi_AudiodevPaPerDirectionOptions_base(ppdo), &obt_as, ppdo->buffer_length); - pa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shif= t); - pa->rpos =3D hw->rpos; - if (!pa->pcm_buf) { - dolog("Could not allocate buffer (%zu bytes)\n", - hw->samples << hw->info.shift); - goto fail2; - } - - if (audio_pt_init(&pa->pt, qpa_thread_out, hw, AUDIO_CAP, __func__)) { - goto fail3; - } =20 return 0; =20 - fail3: - g_free (pa->pcm_buf); - pa->pcm_buf =3D NULL; - fail2: - if (pa->stream) { - pa_stream_unref (pa->stream); - pa->stream =3D NULL; - } fail1: return -1; } @@ -647,28 +404,9 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettin= gs *as, void *drv_opaque) hw->samples =3D pa->samples =3D audio_buffer_samples( qapi_AudiodevPaPerDirectionOptions_base(ppdo), &obt_as, ppdo->buffer_length); - pa->pcm_buf =3D audio_calloc(__func__, hw->samples, 1 << hw->info.shif= t); - pa->wpos =3D hw->wpos; - if (!pa->pcm_buf) { - dolog("Could not allocate buffer (%zu bytes)\n", - hw->samples << hw->info.shift); - goto fail2; - } - - if (audio_pt_init(&pa->pt, qpa_thread_in, hw, AUDIO_CAP, __func__)) { - goto fail3; - } =20 return 0; =20 - fail3: - g_free (pa->pcm_buf); - pa->pcm_buf =3D NULL; - fail2: - if (pa->stream) { - pa_stream_unref (pa->stream); - pa->stream =3D NULL; - } fail1: return -1; } @@ -696,42 +434,22 @@ static void qpa_simple_disconnect(PAConnection *c, pa= _stream *stream) =20 static void qpa_fini_out (HWVoiceOut *hw) { - void *ret; PAVoiceOut *pa =3D (PAVoiceOut *) hw; =20 - audio_pt_lock(&pa->pt, __func__); - pa->done =3D 1; - audio_pt_unlock_and_signal(&pa->pt, __func__); - audio_pt_join(&pa->pt, &ret, __func__); - if (pa->stream) { qpa_simple_disconnect(pa->g->conn, pa->stream); pa->stream =3D NULL; } - - audio_pt_fini(&pa->pt, __func__); - g_free (pa->pcm_buf); - pa->pcm_buf =3D NULL; } =20 static void qpa_fini_in (HWVoiceIn *hw) { - void *ret; PAVoiceIn *pa =3D (PAVoiceIn *) hw; =20 - audio_pt_lock(&pa->pt, __func__); - pa->done =3D 1; - audio_pt_unlock_and_signal(&pa->pt, __func__); - audio_pt_join(&pa->pt, &ret, __func__); - if (pa->stream) { qpa_simple_disconnect(pa->g->conn, pa->stream); pa->stream =3D NULL; } - - audio_pt_fini(&pa->pt, __func__); - g_free (pa->pcm_buf); - pa->pcm_buf =3D NULL; } =20 static int qpa_ctl_out (HWVoiceOut *hw, int cmd, ...) @@ -1005,12 +723,12 @@ static void qpa_audio_fini (void *opaque) static struct audio_pcm_ops qpa_pcm_ops =3D { .init_out =3D qpa_init_out, .fini_out =3D qpa_fini_out, - .run_out =3D qpa_run_out, + .write =3D qpa_write, .ctl_out =3D qpa_ctl_out, =20 .init_in =3D qpa_init_in, .fini_in =3D qpa_fini_in, - .run_in =3D qpa_run_in, + .read =3D qpa_read, .ctl_in =3D qpa_ctl_in }; =20 diff --git a/configure b/configure index 30aad233d1..d72ea39bb7 100755 --- a/configure +++ b/configure @@ -297,7 +297,6 @@ host_cc=3D"cc" libs_cpu=3D"" libs_softmmu=3D"" libs_tools=3D"" -audio_pt_int=3D"" audio_win_int=3D"" libs_qga=3D"" debug_info=3D"yes" @@ -3383,7 +3382,6 @@ for drv in $audio_drv_list; do pa | try-pa) if $pkg_config libpulse --exists; then pulse_libs=3D$($pkg_config libpulse --libs) - audio_pt_int=3D"yes" if test "$drv" =3D "try-pa"; then audio_drv_list=3D$(echo "$audio_drv_list" | sed -e 's/try-pa/p= a/') fi @@ -6606,9 +6604,6 @@ echo "PULSE_LIBS=3D$pulse_libs" >> $config_host_mak echo "COREAUDIO_LIBS=3D$coreaudio_libs" >> $config_host_mak echo "DSOUND_LIBS=3D$dsound_libs" >> $config_host_mak echo "OSS_LIBS=3D$oss_libs" >> $config_host_mak -if test "$audio_pt_int" =3D "yes" ; then - echo "CONFIG_AUDIO_PT_INT=3Dy" >> $config_host_mak -fi if test "$audio_win_int" =3D "yes" ; then echo "CONFIG_AUDIO_WIN_INT=3Dy" >> $config_host_mak fi --=20 2.23.0