Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1726713/?format=api
{ "id": 1726713, "url": "http://patchwork.ozlabs.org/api/patches/1726713/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20230115131224.30751-14-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-14-volker.ruemelin@t-online.de>", "list_archive_url": null, "date": "2023-01-15T13:12:21", "name": "[14/17] audio: wire up st_rate_frames_out()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "2770170fe1f97cc6c423224780b89ec8d5159904", "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-14-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/1726713/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1726713/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 4NvwZl6HD3z23g1\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Jan 2023 00:13:35 +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 1pH2on-0004He-IL; Sun, 15 Jan 2023 08:13:01 -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 1pH2om-0004HM-9o\n for qemu-devel@nongnu.org; Sun, 15 Jan 2023 08:13:00 -0500", "from mailout05.t-online.de ([194.25.134.82])\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 1pH2ok-0005CN-Ff\n for qemu-devel@nongnu.org; Sun, 15 Jan 2023 08:12:59 -0500", "from fwd80.dcpf.telekom.de (fwd80.aul.t-online.de [10.223.144.106])\n by mailout05.t-online.de (Postfix) with SMTP id 732611D39D;\n Sun, 15 Jan 2023 14:12:56 +0100 (CET)", "from linpower.localnet ([79.208.25.151]) by fwd80.t-online.de\n with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted)\n esmtp id 1pH2og-1SDxvF0; Sun, 15 Jan 2023 14:12:54 +0100", "by linpower.localnet (Postfix, from userid 1000)\n id 740E32006C6; 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 14/17] audio: wire up st_rate_frames_out()", "Date": "Sun, 15 Jan 2023 14:12:21 +0100", "Message-Id": "<20230115131224.30751-14-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": "6bac1636-ee8b-4667-90e4-cafab4c05c36", "Received-SPF": "none client-ip=194.25.134.82;\n envelope-from=volker.ruemelin@t-online.de; helo=mailout05.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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01,\n SPF_HELO_NONE=0.001, 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\nWire up the st_rate_frames_out() function and replace\naudio_frontend_frames_in() to make audio packet length\ncalculation exact.\n\nSigned-off-by: Volker Rümelin <vr_qemu@t-online.de>\n---\n audio/audio.c | 29 ++++++++---------------------\n 1 file changed, 8 insertions(+), 21 deletions(-)", "diff": "diff --git a/audio/audio.c b/audio/audio.c\nindex b660569928..ecd5d31260 100644\n--- a/audio/audio.c\n+++ b/audio/audio.c\n@@ -577,7 +577,7 @@ static void audio_pcm_sw_resample_in(SWVoiceIn *sw,\n static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t buf_len)\n {\n HWVoiceIn *hw = sw->hw;\n- size_t live, frames_out_max, swlim, total_in, total_out;\n+ size_t live, frames_out_max, total_in, total_out;\n \n live = hw->total_samples_captured - sw->total_hw_samples_acquired;\n if (!live) {\n@@ -588,12 +588,10 @@ static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t buf_len)\n return 0;\n }\n \n- frames_out_max = buf_len / sw->info.bytes_per_frame;\n+ frames_out_max = MIN(buf_len / sw->info.bytes_per_frame,\n+ sw->resample_buf.size);\n \n- swlim = (live * sw->ratio) >> 32;\n- swlim = MIN(swlim, frames_out_max);\n-\n- audio_pcm_sw_resample_in(sw, live, swlim, &total_in, &total_out);\n+ audio_pcm_sw_resample_in(sw, live, frames_out_max, &total_in, &total_out);\n \n if (!hw->pcm_ops->volume_in) {\n mixeng_volume(sw->resample_buf.buffer, total_out, &sw->vol);\n@@ -977,18 +975,6 @@ void AUD_set_active_in (SWVoiceIn *sw, int on)\n }\n }\n \n-/**\n- * audio_frontend_frames_in() - returns the number of frames the resampling\n- * code generates from frames_in frames\n- *\n- * @sw: audio recording frontend\n- * @frames_in: number of frames\n- */\n-static size_t audio_frontend_frames_in(SWVoiceIn *sw, size_t frames_in)\n-{\n- return (int64_t)frames_in * sw->ratio >> 32;\n-}\n-\n static size_t audio_get_avail (SWVoiceIn *sw)\n {\n size_t live;\n@@ -1005,9 +991,9 @@ static size_t audio_get_avail (SWVoiceIn *sw)\n }\n \n ldebug (\n- \"%s: get_avail live %zu frontend frames %zu\\n\",\n+ \"%s: get_avail live %zu frontend frames %u\\n\",\n SW_NAME (sw),\n- live, audio_frontend_frames_in(sw, live)\n+ live, st_rate_frames_out(sw->rate, live)\n );\n \n return live;\n@@ -1312,8 +1298,9 @@ static void audio_run_in (AudioState *s)\n size_t sw_avail = audio_get_avail(sw);\n size_t avail;\n \n- avail = audio_frontend_frames_in(sw, sw_avail);\n+ avail = st_rate_frames_out(sw->rate, sw_avail);\n if (avail > 0) {\n+ avail = MIN(avail, sw->resample_buf.size);\n sw->callback.fn(sw->callback.opaque,\n avail * sw->info.bytes_per_frame);\n }\n", "prefixes": [ "14/17" ] }