From patchwork Fri Aug 21 15:37:41 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: 509572 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 CF6301402C8 for ; Sat, 22 Aug 2015 02:07:30 +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=c1He9wIO; dkim-atps=neutral Received: from localhost ([::1]:42388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoqm-00049Z-Bj for incoming@patchwork.ozlabs.org; Fri, 21 Aug 2015 12:07:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoOW-0002yO-RL for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSoOV-0002Ek-Pf for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:16 -0400 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:33414) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSoOV-0002EU-GD for qemu-devel@nongnu.org; Fri, 21 Aug 2015 11:38:15 -0400 Received: by wijp15 with SMTP id p15so23068495wij.0 for ; Fri, 21 Aug 2015 08:38:15 -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=RXbMOyave8sYwR9YXKl48+GRMfpJXGgGnlsQ1tbrIe4=; b=c1He9wIORnrtZk5u0hXAcybSJn0xlrzcAdki2FsLPLqyB9ejzMjnWgT1AitkSiEaLZ a1mJATsDzHApxT1NNxWOUSU9h9oigrvWlECShZl/wE7PjLTzLWG00GLFZpDbTepHWiRi QVzAmgHB2R/OUQBPFAmFQ7+0WczuJZ7EcOUdridlzFbFqR5fBkG9YQOUKhCeFahUk1aX 1OeK0itNaSBRaVp+Wyy7oaECgqQSwosAj6dD2J/PpSLSpgT3FbT6SthtAW5VE983i2AI kvCH2S/xxtkWjZQgSX6aP2QNdhAolPUUTbsta/Akm8KPYf2Ju+34UOr4+BHTEQ6r04IV NCBg== X-Received: by 10.180.88.162 with SMTP id bh2mr7267084wib.16.1440171494954; Fri, 21 Aug 2015 08:38:14 -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.14 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Aug 2015 08:38:14 -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:41 +0200 Message-Id: <844b5b351a435f991310b87f1727dc37fb27d1e4.1440171025.git.DirtY.iCE.hu@gmail.com> 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::229 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2 45/49] audio: remove remains of the old 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/audio.c | 42 ++++++------------------------------------ audio/audio_int.h | 7 ------- 2 files changed, 6 insertions(+), 43 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index f24d0a1..584400c 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -512,7 +512,7 @@ static size_t audio_pcm_hw_find_min_in (HWVoiceIn *hw) return m; } -size_t audio_pcm_hw_get_live_in(HWVoiceIn *hw) +static size_t audio_pcm_hw_get_live_in(HWVoiceIn *hw) { size_t live = hw->total_samples_captured - audio_pcm_hw_find_min_in (hw); if (audio_bug(AUDIO_FUNC, live > hw->samples)) { @@ -522,29 +522,7 @@ size_t audio_pcm_hw_get_live_in(HWVoiceIn *hw) return live; } -size_t audio_pcm_hw_clip_out(HWVoiceOut *hw, void *pcm_buf, - size_t live, size_t pending) -{ - size_t left = hw->samples - pending; - size_t len = MIN (left, live); - size_t clipped = 0; - - while (len) { - struct st_sample *src = hw->mix_buf + hw->rpos; - uint8_t *dst = advance (pcm_buf, hw->rpos << hw->info.shift); - size_t samples_till_end_of_buf = hw->samples - hw->rpos; - size_t samples_to_clip = MIN (len, samples_till_end_of_buf); - - hw->clip (dst, src, samples_to_clip); - - hw->rpos = (hw->rpos + samples_to_clip) % hw->samples; - len -= samples_to_clip; - clipped += samples_to_clip; - } - return clipped; -} - -static void audio_pcm_hw_clip_out2(HWVoiceOut *hw, void *pcm_buf, size_t len) +static void audio_pcm_hw_clip_out(HWVoiceOut *hw, void *pcm_buf, size_t len) { size_t clipped = 0; size_t pos = hw->rpos; @@ -1033,7 +1011,7 @@ static size_t audio_pcm_hw_run_out(HWVoiceOut *hw, size_t live) void *buf = hw->pcm_ops->get_buffer_out(hw, &size); decr = MIN(size >> hw->info.shift, live); - audio_pcm_hw_clip_out2(hw, buf, decr); + audio_pcm_hw_clip_out(hw, buf, decr); proc = hw->pcm_ops->put_buffer_out(hw, buf, decr << hw->info.shift) >> hw->info.shift; @@ -1096,11 +1074,7 @@ static void audio_run_out (AudioState *s) } prev_rpos = hw->rpos; - if (hw->pcm_ops->run_out) { - played = hw->pcm_ops->run_out(hw, live); - } else { - played = audio_pcm_hw_run_out(hw, live); - } + played = audio_pcm_hw_run_out(hw, live); if (audio_bug(AUDIO_FUNC, hw->rpos >= hw->samples)) { dolog("rpos=%zu samples=%zu played=%zu\n", hw->rpos, hw->samples, played); @@ -1195,12 +1169,8 @@ static void audio_run_in (AudioState *s) SWVoiceIn *sw; size_t captured, min; - if (hw->pcm_ops->run_in) { - captured = hw->pcm_ops->run_in(hw); - } else { - captured = audio_pcm_hw_run_in( - hw, hw->samples - audio_pcm_hw_get_live_in(hw)); - } + captured = audio_pcm_hw_run_in( + hw, hw->samples - audio_pcm_hw_get_live_in(hw)); min = audio_pcm_hw_find_min_in (hw); hw->total_samples_captured += captured - min; diff --git a/audio/audio_int.h b/audio/audio_int.h index 469fe5e..487867c 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -149,7 +149,6 @@ struct audio_driver { struct audio_pcm_ops { int (*init_out)(HWVoiceOut *hw, audsettings *as, void *drv_opaque); void (*fini_out)(HWVoiceOut *hw); - int (*run_out) (HWVoiceOut *hw, int live); size_t (*write) (HWVoiceOut *hw, void *buf, size_t size); /* get a buffer that after later can be passed to put_buffer_out; optional * returns the buffer, and writes it's size to size (in bytes) @@ -163,7 +162,6 @@ struct audio_pcm_ops { int (*init_in) (HWVoiceIn *hw, audsettings *as, void *drv_opaque); void (*fini_in) (HWVoiceIn *hw); - int (*run_in) (HWVoiceIn *hw); size_t (*read) (HWVoiceIn *hw, void *buf, size_t size); void *(*get_buffer_in)(HWVoiceIn *hw, size_t *size); void (*put_buffer_in)(HWVoiceIn *hw, void *buf, size_t size); @@ -232,11 +230,6 @@ extern struct audio_driver *drvtab[]; void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as); void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len); -size_t audio_pcm_hw_get_live_in(HWVoiceIn *hw); - -size_t audio_pcm_hw_clip_out(HWVoiceOut *hw, void *pcm_buf, - size_t live, size_t pending); - int audio_bug (const char *funcname, int cond); void *audio_calloc (const char *funcname, int nmemb, size_t size);