Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1726724/?format=api
{ "id": 1726724, "url": "http://patchwork.ozlabs.org/api/patches/1726724/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20230115131224.30751-17-volker.ruemelin@t-online.de/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20230115131224.30751-17-volker.ruemelin@t-online.de>", "list_archive_url": null, "date": "2023-01-15T13:12:24", "name": "[17/17] audio: remove sw->ratio", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "9e17bfb67660bddd6c4cbbcba673659708e132ff", "submitter": { "id": 83211, "url": "http://patchwork.ozlabs.org/api/people/83211/?format=api", "name": "Volker Rümelin", "email": "volker.ruemelin@t-online.de" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20230115131224.30751-17-volker.ruemelin@t-online.de/mbox/", "series": [ { "id": 336714, "url": "http://patchwork.ozlabs.org/api/series/336714/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=336714", "date": "2023-01-15T13:08:29", "name": "[01/17] audio: change type of mix_buf and conv_buf", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/336714/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1726724/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1726724/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=<UNKNOWN>)", "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4NvwcF1x5Lz23gX\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Jan 2023 00:14:53 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1pH2ov-0004iL-3P; Sun, 15 Jan 2023 08:13:09 -0500", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <volker.ruemelin@t-online.de>)\n id 1pH2os-0004Ux-IZ\n for qemu-devel@nongnu.org; Sun, 15 Jan 2023 08:13:06 -0500", "from mailout10.t-online.de ([194.25.134.21])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <volker.ruemelin@t-online.de>)\n id 1pH2oq-0005Dz-LG\n for qemu-devel@nongnu.org; Sun, 15 Jan 2023 08:13:06 -0500", "from fwd77.dcpf.telekom.de (fwd77.aul.t-online.de [10.223.144.103])\n by mailout10.t-online.de (Postfix) with SMTP id 154C524B34;\n Sun, 15 Jan 2023 14:13:02 +0100 (CET)", "from linpower.localnet ([79.208.25.151]) by fwd77.t-online.de\n with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted)\n esmtp id 1pH2on-0gcIwz0; Sun, 15 Jan 2023 14:13:01 +0100", "by linpower.localnet (Postfix, from userid 1000)\n id 7BEC72006C9; Sun, 15 Jan 2023 14:12:24 +0100 (CET)" ], "From": "=?utf-8?q?Volker_R=C3=BCmelin?= <volker.ruemelin@t-online.de>", "To": "Gerd Hoffmann <kraxel@redhat.com>", "Cc": "qemu-devel@nongnu.org", "Subject": "[PATCH 17/17] audio: remove sw->ratio", "Date": "Sun, 15 Jan 2023 14:12:24 +0100", "Message-Id": "<20230115131224.30751-17-volker.ruemelin@t-online.de>", "X-Mailer": "git-send-email 2.35.3", "In-Reply-To": "<61bd351f-0683-7f58-b746-66c9578a7cdc@t-online.de>", "References": "<61bd351f-0683-7f58-b746-66c9578a7cdc@t-online.de>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-TOI-MSGID": "9eaa5b86-7b91-45d1-828e-0936903caca1", "Received-SPF": "none client-ip=194.25.134.21;\n envelope-from=volker.ruemelin@t-online.de; helo=mailout10.t-online.de", "X-Spam_score_int": "-25", "X-Spam_score": "-2.6", "X-Spam_bar": "--", "X-Spam_report": "(-2.6 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001,\n RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001,\n SPF_NONE=0.001 autolearn=ham autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "From: Volker Rümelin <vr_qemu@t-online.de>\n\nSimplify the resample buffer size calculation.\n\nFor audio playback we have\nsw->ratio = ((int64_t)sw->hw->info.freq << 32) / sw->info.freq;\nsamples = ((int64_t)sw->HWBUF.size << 32) / sw->ratio;\n\nThis can be simplified to\nsamples = muldiv64(sw->HWBUF.size, sw->info.freq, sw->hw->info.freq);\n\nFor audio recording we have\nsw->ratio = ((int64_t)sw->info.freq << 32) / sw->hw->info.freq;\nsamples = (int64_t)sw->HWBUF.size * sw->ratio >> 32;\n\nThis can be simplified to\nsamples = muldiv64(sw->HWBUF.size, sw->info.freq, sw->hw->info.freq);\n\nWith hw = sw->hw this becomes in both cases\nsamples = muldiv64(HWBUF.size, sw->info.freq, hw->info.freq);\n\nNow that sw->ratio is no longer needed, remove sw->ratio.\n\nSigned-off-by: Volker Rümelin <vr_qemu@t-online.de>\n---\n audio/audio.c | 1 -\n audio/audio_int.h | 2 --\n audio/audio_template.h | 9 +--------\n 3 files changed, 1 insertion(+), 11 deletions(-)", "diff": "diff --git a/audio/audio.c b/audio/audio.c\nindex b846b89a27..b68ed4eb68 100644\n--- a/audio/audio.c\n+++ b/audio/audio.c\n@@ -476,7 +476,6 @@ static int audio_attach_capture (HWVoiceOut *hw)\n sw->info = hw->info;\n sw->empty = 1;\n sw->active = hw->enabled;\n- sw->ratio = ((int64_t) hw_cap->info.freq << 32) / sw->info.freq;\n sw->vol = nominal_volume;\n sw->rate = st_rate_start (sw->info.freq, hw_cap->info.freq);\n QLIST_INSERT_HEAD (&hw_cap->sw_head, sw, entries);\ndiff --git a/audio/audio_int.h b/audio/audio_int.h\nindex f4ec5dcf11..3cd3539bd4 100644\n--- a/audio/audio_int.h\n+++ b/audio/audio_int.h\n@@ -108,7 +108,6 @@ struct SWVoiceOut {\n AudioState *s;\n struct audio_pcm_info info;\n t_sample *conv;\n- int64_t ratio;\n STSampleBuffer resample_buf;\n void *rate;\n size_t total_hw_samples_mixed;\n@@ -126,7 +125,6 @@ struct SWVoiceIn {\n AudioState *s;\n int active;\n struct audio_pcm_info info;\n- int64_t ratio;\n void *rate;\n size_t total_hw_samples_acquired;\n STSampleBuffer resample_buf;\ndiff --git a/audio/audio_template.h b/audio/audio_template.h\nindex 0cdf57760e..c053792da3 100644\n--- a/audio/audio_template.h\n+++ b/audio/audio_template.h\n@@ -114,11 +114,7 @@ static int glue (audio_pcm_sw_alloc_resources_, TYPE) (SW *sw)\n return 0;\n }\n \n-#ifdef DAC\n- samples = ((int64_t)sw->HWBUF.size << 32) / sw->ratio;\n-#else\n- samples = (int64_t)sw->HWBUF.size * sw->ratio >> 32;\n-#endif\n+ samples = muldiv64(HWBUF.size, sw->info.freq, hw->info.freq);\n if (samples == 0) {\n size_t f_fe_min;\n \n@@ -159,11 +155,8 @@ static int glue (audio_pcm_sw_init_, TYPE) (\n sw->hw = hw;\n sw->active = 0;\n #ifdef DAC\n- sw->ratio = ((int64_t) sw->hw->info.freq << 32) / sw->info.freq;\n sw->total_hw_samples_mixed = 0;\n sw->empty = 1;\n-#else\n- sw->ratio = ((int64_t) sw->info.freq << 32) / sw->hw->info.freq;\n #endif\n \n if (sw->info.is_float) {\n", "prefixes": [ "17/17" ] }