From nobody Wed Nov 12 06:51:59 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=1568576543; cv=none; d=zoho.com; s=zohoarc; b=E2E6jhcocDXwcsgdnICM52rElPW6NlvNE8GBrynJNWdrSivwgOZD+O83lvXp46k64ugZ9NnnLBNWDnpFWGp6088/U0K9UuF5wi5s0Ak5cKJW1Tx0LdRDYX33h7OoGXsG4I6I6uLL77mdZYwEB+TUViU2sKKJvup/VopLezefDZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568576543; 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=i9UxN713GW0ghifGTVMxk9JG2fJFSnFStux97zyYILs=; b=bE8wjuPr6MVH/rwb/q9ZyQZIdJZDF8zortkoEHNMy42twXaVo/RteS3ugic5712/ZKzz+Vql6QJoe/2qqX1RWMK/wyb9stcQe8miegTKi0OfOAjthTRXr4B6mEHbAq+KIneoeXFvclMsa+IBjR2gXUgyuGiYizp1RCRT5Uz7Y6k= 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 1568576543690275.68986759335155; Sun, 15 Sep 2019 12:42:23 -0700 (PDT) Received: from localhost ([::1]:56698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9aPe-0000DX-8L for importer@patchew.org; Sun, 15 Sep 2019 15:42:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40097) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9a7o-0006C4-A4 for qemu-devel@nongnu.org; Sun, 15 Sep 2019 15:23:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9a7n-00021f-5d for qemu-devel@nongnu.org; Sun, 15 Sep 2019 15:23:56 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:37071) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i9a7m-00021S-Vn for qemu-devel@nongnu.org; Sun, 15 Sep 2019 15:23:55 -0400 Received: by mail-ed1-x541.google.com with SMTP id i1so31286823edv.4 for ; Sun, 15 Sep 2019 12:23:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Sep 2019 12:23:53 -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=i9UxN713GW0ghifGTVMxk9JG2fJFSnFStux97zyYILs=; b=Il6w6RJmjcY1DbvWm8CYqG0GqXDyz+V3wPqzVsDgH50YwuTmHGb37Zp5qpdIfn6mSR ssx6cy9G10fAvXfZWP9UmXItDT/YVBaKaHZo2v0DvBn2MOsXZc184q5hU0qrTkjNT1H3 0NYgeW4CM7wH0S9zgdnu12opgjB+MfEWDlTEZwcIdOYUrwc4igPxDKMu9La+gA85YqgK Vj1K/m1uSy2twKqqB5eJRg5roODRZFNlmLwuup2urk0BtHjgonKXUrxre7TCLIullZZC QUWD8T2z08+jmnLNkgsWv2sDyyR+0k+7tE7pFoMN4zoHR2tXyfQqTfxaKR42HESfuXu/ s/Rg== 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=i9UxN713GW0ghifGTVMxk9JG2fJFSnFStux97zyYILs=; b=RVpcSUTfrrzSW1PXXuZy59k2+dsGOaoaneApbsPPV0pyGsfRptsErpP9xZnMmJSxIZ c3+HW2zPqOIdPGfAomaJExJXUDzpG/hpaM7CJ6ew4LN+na3E2VarGVWVNiEFw1JqiS6S lBbAU0yvqYLp7ndQVtFq0qXqs1UK+qrci+lpyh0MGx3Em3xD6WHmlLZL1P647axkMcSC SY37hq2aYMnNF2/Gc1ZJVk1e0AE64AwNhYcr+Rp4jdmdbI5CGR8t87uNbkJZaZNsb4+H UXQli8eEzsNyEF3asnkD/Kumyje01rLyHekJZcpudUh7eg/QOlYwtL2Ps3fR95qqFqQw 86CQ== X-Gm-Message-State: APjAAAWXls9FW2zZz0THCPY5vvbrSCCAVTYFLE5h3GH3vCgDP+V+ngP+ Q1jGnFU8q0Pwt8IXQb/eUULtDT3s X-Google-Smtp-Source: APXvYqy5YQWhLilq62yb04St/FCa5/CkhOB1svCFwfHrK/yTSYZLHSlMRtpevLT942R7IzytXZO4Ag== X-Received: by 2002:a17:906:f283:: with SMTP id gu3mr11958078ejb.17.1568575433887; Sun, 15 Sep 2019 12:23:53 -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:33 +0200 Message-Id: <4554ff54ad04f706ad0e9af87fe07650fd6d9ac1.1568574965.git.DirtY.iCE.hu@gmail.com> 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::541 Subject: [Qemu-devel] [PATCH v3 17/24] paaudio: get/put_buffer functions 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) This lets us avoid some buffer copying when using mixeng. Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n --- audio/paaudio.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/audio/paaudio.c b/audio/paaudio.c index ed31f863f7..6ccdf31415 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -98,6 +98,59 @@ static inline int PA_STREAM_IS_GOOD(pa_stream_state_t x) } \ } while (0) =20 +static void *qpa_get_buffer_in(HWVoiceIn *hw, size_t *size) +{ + PAVoiceIn *p =3D (PAVoiceIn *) hw; + PAConnection *c =3D p->g->conn; + int r; + + pa_threaded_mainloop_lock(c->mainloop); + + CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail, + "pa_threaded_mainloop_lock failed\n"); + + 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"); + } + + *size =3D MIN(p->read_length, *size); + + pa_threaded_mainloop_unlock(c->mainloop); + return (void *) p->read_data; + +unlock_and_fail: + pa_threaded_mainloop_unlock(c->mainloop); + *size =3D 0; + return NULL; +} + +static void qpa_put_buffer_in(HWVoiceIn *hw, void *buf, size_t size) +{ + PAVoiceIn *p =3D (PAVoiceIn *) hw; + PAConnection *c =3D p->g->conn; + int r; + + pa_threaded_mainloop_lock(c->mainloop); + + CHECK_DEAD_GOTO(c, p->stream, unlock, + "pa_threaded_mainloop_lock failed\n"); + + assert(buf =3D=3D p->read_data && size <=3D p->read_length); + + p->read_data +=3D size; + p->read_length -=3D size; + + if (size && !p->read_length) { + r =3D pa_stream_drop(p->stream); + CHECK_SUCCESS_GOTO(c, r =3D=3D 0, unlock, "pa_stream_drop failed\n= "); + } + +unlock: + pa_threaded_mainloop_unlock(c->mainloop); +} + static size_t qpa_read(HWVoiceIn *hw, void *data, size_t length) { PAVoiceIn *p =3D (PAVoiceIn *) hw; @@ -136,6 +189,32 @@ unlock_and_fail: return 0; } =20 +static void *qpa_get_buffer_out(HWVoiceOut *hw, size_t *size) +{ + PAVoiceOut *p =3D (PAVoiceOut *) hw; + PAConnection *c =3D p->g->conn; + void *ret; + int r; + + pa_threaded_mainloop_lock(c->mainloop); + + CHECK_DEAD_GOTO(c, p->stream, unlock_and_fail, + "pa_threaded_mainloop_lock failed\n"); + + *size =3D -1; + r =3D pa_stream_begin_write(p->stream, &ret, size); + CHECK_SUCCESS_GOTO(c, r >=3D 0, unlock_and_fail, + "pa_stream_begin_write failed\n"); + + pa_threaded_mainloop_unlock(c->mainloop); + return ret; + +unlock_and_fail: + pa_threaded_mainloop_unlock(c->mainloop); + *size =3D 0; + return NULL; +} + static size_t qpa_write(HWVoiceOut *hw, void *data, size_t length) { PAVoiceOut *p =3D (PAVoiceOut *) hw; @@ -698,11 +777,15 @@ static struct audio_pcm_ops qpa_pcm_ops =3D { .init_out =3D qpa_init_out, .fini_out =3D qpa_fini_out, .write =3D qpa_write, + .get_buffer_out =3D qpa_get_buffer_out, + .put_buffer_out =3D qpa_write, /* pa handles it */ .volume_out =3D qpa_volume_out, =20 .init_in =3D qpa_init_in, .fini_in =3D qpa_fini_in, .read =3D qpa_read, + .get_buffer_in =3D qpa_get_buffer_in, + .put_buffer_in =3D qpa_put_buffer_in, .volume_in =3D qpa_volume_in }; =20 --=20 2.23.0