From patchwork Fri Aug 21 15:37:35 2015 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: 509571 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 0C6AB1402C8 for ; Sat, 22 Aug 2015 02:06:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=d4TeGsHY; dkim-atps=neutral Received: from localhost ([::1]:42375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSopl-0002SV-L3 for incoming@patchwork.ozlabs.org; Fri, 21 Aug 2015 12:06:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoOS-0002qe-FL for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSoOR-0002CT-HY for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:12 -0400 Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]:36556) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoOR-0002C6-Bd for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:11 -0400 Received: by wicja10 with SMTP id ja10so19037628wic.1 for ; Fri, 21 Aug 2015 08:38:10 -0700 (PDT) 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=Tt9SQzZRJBd4HCgL/UgOMe10E676Fk7YTjHJiIGzNzA=; b=d4TeGsHYq+MF/JgI8sd8o2iNkB+JVS8g6Bjrzq7lUU3bYTc7FxCIVqQynzZx7yXtdO C1eIolIGZMrnquscffNjiBovpsQ2apgEgsDglyv6h+QT9PnfqFepIVQFW6erRIow1dEz kOvtJe1Wqz/Kk+pir2xZCXBRoEtaF2IoiR2CFVDr4qJVsHIQVpkGDeTDcvCtEdfWe/HT SZr5ZX+dWrYAmMcyVYLwgFAGwDaSRNwZiZurta5i11Zwdx2DnV1fFpMOk5ucvuFw8cFl uRM4fMyxvmn/lXv7O+4Y3NdopBCiPl0KZKCaTFrP+tQPiGX0jZDItP3qiyUYiq4dU8Jy vZdw== X-Received: by 10.194.23.36 with SMTP id j4mr16673091wjf.105.1440171490774; Fri, 21 Aug 2015 08:38:10 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (178-164-172-216.pool.digikabel.hu. [178.164.172.216]) by smtp.gmail.com with ESMTPSA id v8sm10479895wjr.15.2015.08.21.08.38.10 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Aug 2015 08:38:10 -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: Fri, 21 Aug 2015 17:37:35 +0200 Message-Id: X-Mailer: git-send-email 2.5.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::232 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 39/49] noaudio: port to the new audio backend api 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 Signed-off-by: Kővágó, Zoltán --- audio/noaudio.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/audio/noaudio.c b/audio/noaudio.c index 28c72d5..c7e47ae 100644 --- a/audio/noaudio.c +++ b/audio/noaudio.c @@ -38,10 +38,9 @@ typedef struct NoVoiceIn { int64_t old_ticks; } NoVoiceIn; -static int no_run_out (HWVoiceOut *hw, int live) +static size_t no_write(HWVoiceOut *hw, void *buf, size_t len) { NoVoiceOut *no = (NoVoiceOut *) hw; - int decr, samples; int64_t now; int64_t ticks; int64_t bytes; @@ -49,13 +48,9 @@ static int no_run_out (HWVoiceOut *hw, int live) now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); ticks = now - no->old_ticks; bytes = muldiv64 (ticks, hw->info.bytes_per_second, get_ticks_per_sec ()); - bytes = MIN (bytes, INT_MAX); - samples = bytes >> hw->info.shift; no->old_ticks = now; - decr = MIN (live, samples); - hw->rpos = (hw->rpos + decr) % hw->samples; - return decr; + return MIN(len, bytes); } static int no_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque) @@ -89,25 +84,21 @@ static void no_fini_in (HWVoiceIn *hw) (void) hw; } -static int no_run_in (HWVoiceIn *hw) +static size_t no_read(HWVoiceIn *hw, void *buf, size_t size) { + size_t to_clear; NoVoiceIn *no = (NoVoiceIn *) hw; - int live = audio_pcm_hw_get_live_in (hw); - int dead = hw->samples - live; - int samples = 0; - if (dead) { - int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - int64_t ticks = now - no->old_ticks; - int64_t bytes = - muldiv64 (ticks, hw->info.bytes_per_second, get_ticks_per_sec ()); + int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + int64_t ticks = now - no->old_ticks; + int64_t bytes = + muldiv64 (ticks, hw->info.bytes_per_second, get_ticks_per_sec ()); - no->old_ticks = now; - bytes = MIN (bytes, INT_MAX); - samples = bytes >> hw->info.shift; - samples = MIN (samples, dead); - } - return samples; + no->old_ticks = now; + to_clear = MIN(bytes, size); + + audio_pcm_info_clear_buf(&hw->info, buf, to_clear >> hw->info.shift); + return to_clear; } static int no_ctl_in (HWVoiceIn *hw, int cmd, ...) @@ -130,12 +121,12 @@ static void no_audio_fini (void *opaque) static struct audio_pcm_ops no_pcm_ops = { .init_out = no_init_out, .fini_out = no_fini_out, - .run_out = no_run_out, + .write = no_write, .ctl_out = no_ctl_out, .init_in = no_init_in, .fini_in = no_fini_in, - .run_in = no_run_in, + .read = no_read, .ctl_in = no_ctl_in };