From patchwork Wed Jan 16 23:37:16 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: 1026318 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ac1rgwKM"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43g47d44S3z9sCX for ; Thu, 17 Jan 2019 11:04:29 +1100 (AEDT) Received: from localhost ([127.0.0.1]:37469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjvAZ-0007bE-FR for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2019 19:04:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjul5-0004MH-Qs for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjul4-0003QC-1t for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:07 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:38059) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gjul3-0003ML-Nx for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:05 -0500 Received: by mail-wr1-x441.google.com with SMTP id v13so8966308wrw.5 for ; Wed, 16 Jan 2019 15:38:04 -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=tTY1W5I1BvSohdMC0L9ttbPe41jJ2IOf/RIdE7ybc6E=; b=ac1rgwKMqrHzL94YHpWj/cfx3asbyh9qBHi8+JmoFp464Pboex3m3F3L446T3YyPEY ZhqDhFivPSZzF54tpQ6H7I4UvIX0KxHjJgspieUhrIl0wjdz8AhS+6oKOLQffIBb8tu8 vMKzUh+dUwy3qCWxZ0+xFp6Udk/80SnzSikqtx7nsC7a4eJrpLJ7t73ovs8dJrFKKU5f 16teOYDaXLunM7PeSqP5HeEx4GPr1fJaWpcPKG/irSBhHzPoRsirHn8Iafhh4YpykY2X TovU8ZEXeOXCRhqPB68HJaB24paY/0q/XRBgHvd+eSjRYEH3adRicdMaNyxr5hXrwJtO uuMg== 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=tTY1W5I1BvSohdMC0L9ttbPe41jJ2IOf/RIdE7ybc6E=; b=YEZlxbBt/kr3OgT9IbnReWWKktF4BPiw0XgoGm4Dm5SBUQrrOepqCOfafxNEHSPxQN o/UxdIAB3nax20LrymctcVUIrg/n9RfR808MW9YUN21AarWqfkx+PmQ6rPx72EieDb3k WjTmof08HV2QO1hwJ8AEcsRs4YH+t66NaOmsAnhlUwt8SGug7+NuaksAvAudfpEkGmD2 bSfbHNIwZlX73bPjXju7bz9XtgMfKyZV5/0qt+M7H9oUHeJhCmVT6Wg/VamwIlHIhp0l QjpRho6CdBMF+UyTzh2Z3rkXnEy26Nz2nfPIKDMs04v+tfG2kFKVVRosBA0kZsrosTAI 79FA== X-Gm-Message-State: AJcUukdt+Fec6+INn1k6enxGcZkKgCkHQcW8zYhwtgxRh/G6WsYwuLq4 nCfb/O1KQxHuhDWlfO5Zg2K7GTJwhlM= X-Google-Smtp-Source: ALg8bN4HaopbDyDv7hnR8iCb+dM+Vd1xZlHI2U08LnsWce8Q5VptFo7xPRq8Hct+PnqNYlOZj+ml4Q== X-Received: by 2002:adf:ca13:: with SMTP id o19mr9419110wrh.148.1547681883559; Wed, 16 Jan 2019 15:38:03 -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.38.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 15:38:03 -0800 (PST) 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 Date: Thu, 17 Jan 2019 00:37:16 +0100 Message-Id: <8afbe9918cd5da8e6d70749efd4cab3739e068a5.1547681517.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.20.1 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::441 Subject: [Qemu-devel] [PATCH v3 43/50] paaudio: get/put_buffer functions 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+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 a45469066b..01c5df278b 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -97,6 +97,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; @@ -135,6 +188,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; @@ -683,12 +762,16 @@ static struct audio_pcm_ops qpa_pcm_ops = { .fini_out = qpa_fini_out, .write = qpa_write, .buffer_size_out = qpa_buffer_size_out, + .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, .buffer_size_in = qpa_buffer_size_in, + .get_buffer_in = qpa_get_buffer_in, + .put_buffer_in = qpa_put_buffer_in, .volume_in = qpa_volume_in };