From patchwork Thu Jan 14 13:45:50 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: 567459 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 80A4F14032F for ; Fri, 15 Jan 2016 01:00:52 +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=0+5j3uDM; dkim-atps=neutral Received: from localhost ([::1]:42652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiSI-0007UW-Db for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2016 09:00:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEa-0001gP-JG for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJiEZ-0003YG-Fy for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:40 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:36637) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEZ-0003Y0-7y for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:39 -0500 Received: by mail-wm0-x241.google.com with SMTP id l65so43662959wmf.3 for ; Thu, 14 Jan 2016 05:46:39 -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=NZcvcEtagX9Tq0Pb2LEh7yj78ceziZ7f1b8pAuEjNbk=; b=0+5j3uDMV7w4izLoxhX7KzzXkPXwjaAcPfcq5h6PbC+vF8KBsiGk67M5QK1sqTHm0T prqDpIdKTcSeRGXtUk0IWs2QVM9VSC8Yj1/gpmQ69RsviaKM7yNCYAo7p6YXqU/Fx53l fnYL+vWZVZxyrtsIlt0ed2hbe3efzhOdQmL88W5scEQmmhnEMvx82wJrv4rcukHBr3M2 UZ9OTtwcoeVls4o/342krMwF1qtTpRX9oA0UTXzo+mQzMaCU7C3yq+DWvhmWtB/wqNU+ cUIqkf/qy/sFG6qNL2Si+k/ya5B1LDFB2BO9yw6fefAv4/5k/uKX2Zc8K1rYRbi5RPfv NpWg== 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=NZcvcEtagX9Tq0Pb2LEh7yj78ceziZ7f1b8pAuEjNbk=; b=HdQN3s8tE/9DJ0sew+ff7mYrH4WHfN/e8nD/G7JyOdz9ugBok01BYffbUspFDl8ZGP BMvgHowglalfSGDUvZLme9dXl+PdgAjD5dwy9WObC0EV8hBykMc2Ckn4gMzhy+ug+6Wn hnz/pQmWSSvXCTUf8fGk2BqvKD5K5l5c5ddSi2smpNoKeMxOo33sy82UALDQYRsSDZt3 OnLnNkHBMHZHeljaGRIWgZnRWB/7Ti4fcl5KIOyxJnzJu8wLhSLnuWyiT2ZAOg85eyap 8YP+EXDm8u48Nl2iYbhpXhIbSQzvOX7uzLbEqYkmrDEbg9KI3drqHLbiQOCYdGV4mLB1 8gkQ== X-Gm-Message-State: ALoCoQmsFjfuOKhVH2BAT9jJvIo52i9s1Otpm58o4G4DvJo+6Yldo+q3few8T/CUwRWPNrLRT141RkljRoPt/IIaJ8CJTmYhjA== X-Received: by 10.194.79.8 with SMTP id f8mr4255245wjx.6.1452779198751; Thu, 14 Jan 2016 05:46:38 -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.38 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 05:46:38 -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:50 +0100 Message-Id: <94071192cf9b90be4c60dfbf51226f2f0e1da0e6.1452776884.git.DirtY.iCE.hu@gmail.com> 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::241 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 37/51] 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 0823170..f7d8d30 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);