From patchwork Thu Jan 14 13:45:57 2016 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: 567467 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 803081402E2 for ; Fri, 15 Jan 2016 01:04:50 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=R3YhbFw9; dkim-atps=neutral Received: from localhost ([::1]:42687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiW8-0005h0-9Y for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2016 09:04:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEg-0001pA-P3 for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJiEf-0003aF-LF for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:46 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35750) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEf-0003a7-40 for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:45 -0500 Received: by mail-wm0-x242.google.com with SMTP id f206so43696152wmf.2 for ; Thu, 14 Jan 2016 05:46:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=7m35vCjFfSQB7FlcioT8U4oVttz50IJiXNivnprzuwU=; b=R3YhbFw9FE4rNIIoBIGcD9xrr1TmEsXfO5ubHyuqcJMz2FjmpEAMSYnWiqnU9hcuh4 4OzPDyLgHKamw7uq02BHp4NKDlkEjs9ZMIR47rzwvbaxR6VCRARMHTD7nfI7yluMQs5Q ZJwSUAICB8jMSoFhRwxouNXX5Axf9MJD7VSug7IjAeekSWT2WfL0nvFwwubplsAhjfnS mLPYMSBoWxGIWL85NDwPQGhnVnV8eMkL6E2tZJkqgacNL3hgQSc2JwytRAoVFoqJdJjS fL9oYJwO0nyPg/nMS675VGKY5OYI2AaiPicxAF+KiOjU9A4xouhKHh8J7mr5GBHObFgE 1BeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=7m35vCjFfSQB7FlcioT8U4oVttz50IJiXNivnprzuwU=; b=JrmLl90v7FX2fx1uqyB/dtWkzhZzgNl0mpAN2bqTms8TyLeXjkY8epMh0uOkDpprXq Ikhcr9A105hUM7ltseJbgPPSdTxxQN8D8O6UElzsS0tID/lZG12vJGTs9x+m2vBVWkag ax7NhVSS5sH4c0ZxN1OoOy1Vkh9N+Fv2Nv3IEKLETYepScodLDr+PsDG2vMtWkuxatFW ocuE96ZlFVAu3/zm/rEfu8AOB1MwXMn2hJLrrurunOSriEOh5DYmKyWXanBx440Wqt38 vwXsvFqh6zsbCe9Xzxr5RiAlSJFe12mBGaoZQTiOVIkA21yN00CX98YedX6io0UC1OMC W8WQ== X-Gm-Message-State: ALoCoQn6RHBbmyGY1mFUaVMpI+gUdSqL23rBpLqi68nzwpojGgoRuXlJS06v1nOaAT0ZTvratjaYCYSpVszZEBrv/djq//7vxQ== X-Received: by 10.195.13.201 with SMTP id fa9mr5029598wjd.68.1452779204632; Thu, 14 Jan 2016 05:46:44 -0800 (PST) Received: from nullptr.home.dirty-ice.org (188-143-126-18.pool.digikabel.hu. [188.143.126.18]) by smtp.gmail.com with ESMTPSA id 79sm7398061wmo.7.2016.01.14.05.46.43 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 05:46:44 -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, 14 Jan 2016 14:45:57 +0100 Message-Id: X-Mailer: git-send-email 2.7.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 44/51] paaudio: get/put_buffer functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 b162c21..4b11f21 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -96,6 +96,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; @@ -134,6 +187,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; @@ -668,12 +747,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 };