From patchwork Mon Sep 30 20:28:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 1169608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DkfgoKqK"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46hvkc4cgdz9sPd for ; Tue, 1 Oct 2019 06:53:28 +1000 (AEST) Received: from localhost ([::1]:57212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iF2fe-0008WQ-EI for incoming@patchwork.ozlabs.org; Mon, 30 Sep 2019 16:53:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45740) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iF2Hb-0003wi-BA for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:28:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iF2HZ-0002U2-RS for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:28:35 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:37831) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iF2HZ-0002R9-I5 for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:28:33 -0400 Received: by mail-wm1-x344.google.com with SMTP id f22so836428wmc.2 for ; Mon, 30 Sep 2019 13:28:33 -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=DkfgoKqK7dUSBf8DHGmdEG6tdSreHj+ZunbCOOpgDN9BUFiobccFSYyI36qNmUcSLu m6akWDsS1jbA0dwrYYLn69g7Rw7RSsbAKRwDALO9fRkCB3ZYbcym/1QQZeDb+wyRWm6W V53k3VtDIzleCogzQrjWQh1cZB6h/2a8Bgvu+8B1UHsY7ksRgl/SdydZsyitcjx5YcNs asctDADf1nAI9r+eMSHlg2RDNtXVjUGrdHPhcNIv7Twjq+OMhNQTC3rHS1E4ieRy0kOI MMTKZBoKSRM7+Wd8BeNBPMqZFPP0PrxHIuMIffMhjHGtinivuGy1pjIopXsAje8vE0cn hg2g== 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=eJ8FoWpSZFXkG3kmYpPpeDN0/t1Q095HVkXV8xFMH9jg/prVO2vZdBriQHktzNc4jX JEuOmP2JWN0h8PIb4uWJ207kVxGHCUmaOmDdIcLbwz3PmQvjTltsuIPgEUayw5VUqxQx Kdchukm43FBCS+OY/6zgNb2efVQVRKukYN5osBz1F4nKT0XyyM9t79G+9dfbMRKgplqt j93NSSMLfym2/kZqaZUnRaE8bTDuAfmcky//tt4Q8hQXeTMXQebq8qb0RXmlFdNpj+k7 SYVCIQSngmZEhH5Nx9E/6YeLIsgnQGDqNYGgarAhOF+IktMob4CAjq5ERorhh3QxLB1E 5ikQ== X-Gm-Message-State: APjAAAXO+QFEQN6ZHwE18iNiWm+YAGI6ckgVMyq7JB1rLskzKpr78kWx J7bKkGWxfUvCWic6mknk1ez/bJsA X-Google-Smtp-Source: APXvYqyxlEvHNoSfuwsTkH3DHCQ3xw9bC9RnaPTjICSkZtA1cJC4jFY8PdzIMuhRWjjQjkR76YqPHQ== X-Received: by 2002:a7b:c156:: with SMTP id z22mr786150wmi.142.1569875312365; Mon, 30 Sep 2019 13:28:32 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-e8f4-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:e8f4::5]) by smtp.gmail.com with ESMTPSA id o9sm34402911wrh.46.2019.09.30.13.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 13:28:31 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Subject: [PATCH v5 03/10] paaudio: get/put_buffer functions Date: Mon, 30 Sep 2019 22:28:56 +0200 Message-Id: X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This lets us avoid some buffer copying when using mixeng. Signed-off-by: Kővágó, Zoltán --- 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) +static void *qpa_get_buffer_in(HWVoiceIn *hw, size_t *size) +{ + PAVoiceIn *p = (PAVoiceIn *) hw; + PAConnection *c = 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 = pa_stream_peek(p->stream, &p->read_data, &p->read_length); + CHECK_SUCCESS_GOTO(c, r == 0, unlock_and_fail, + "pa_stream_peek failed\n"); + } + + *size = 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 = 0; + return NULL; +} + +static void qpa_put_buffer_in(HWVoiceIn *hw, void *buf, size_t size) +{ + PAVoiceIn *p = (PAVoiceIn *) hw; + PAConnection *c = 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 == p->read_data && size <= p->read_length); + + p->read_data += size; + p->read_length -= size; + + if (size && !p->read_length) { + r = pa_stream_drop(p->stream); + CHECK_SUCCESS_GOTO(c, r == 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 = (PAVoiceIn *) hw; @@ -136,6 +189,32 @@ unlock_and_fail: return 0; } +static void *qpa_get_buffer_out(HWVoiceOut *hw, size_t *size) +{ + PAVoiceOut *p = (PAVoiceOut *) hw; + PAConnection *c = 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 = -1; + r = pa_stream_begin_write(p->stream, &ret, size); + CHECK_SUCCESS_GOTO(c, r >= 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 = 0; + return NULL; +} + static size_t qpa_write(HWVoiceOut *hw, void *data, size_t length) { PAVoiceOut *p = (PAVoiceOut *) hw; @@ -698,11 +777,15 @@ static struct audio_pcm_ops qpa_pcm_ops = { .init_out = qpa_init_out, .fini_out = qpa_fini_out, .write = qpa_write, + .get_buffer_out = qpa_get_buffer_out, + .put_buffer_out = qpa_write, /* pa handles it */ .volume_out = qpa_volume_out, .init_in = qpa_init_in, .fini_in = qpa_fini_in, .read = qpa_read, + .get_buffer_in = qpa_get_buffer_in, + .put_buffer_in = qpa_put_buffer_in, .volume_in = qpa_volume_in };