Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1726715/?format=api
{ "id": 1726715, "url": "http://patchwork.ozlabs.org/api/patches/1726715/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20230115131224.30751-6-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-6-volker.ruemelin@t-online.de>", "list_archive_url": null, "date": "2023-01-15T13:12:13", "name": "[06/17] audio: rename variables in audio_pcm_sw_write()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a17556d4f8b82421f6b33bc960fa24870a4d809c", "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-6-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/1726715/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1726715/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 4NvwZs43qlz23g1\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Jan 2023 00:13:41 +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 1pH2oX-00043j-3T; Sun, 15 Jan 2023 08:12:45 -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 1pH2oU-000407-IU\n for qemu-devel@nongnu.org; Sun, 15 Jan 2023 08:12:42 -0500", "from mailout08.t-online.de ([194.25.134.20])\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 1pH2oS-00059w-Uy\n for qemu-devel@nongnu.org; Sun, 15 Jan 2023 08:12:42 -0500", "from fwd85.dcpf.telekom.de (fwd85.aul.t-online.de [10.223.144.111])\n by mailout08.t-online.de (Postfix) with SMTP id 39D1D29F8A;\n Sun, 15 Jan 2023 14:12:39 +0100 (CET)", "from linpower.localnet ([79.208.25.151]) by fwd85.t-online.de\n with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted)\n esmtp id 1pH2oO-239C4n0; Sun, 15 Jan 2023 14:12:36 +0100", "by linpower.localnet (Postfix, from userid 1000)\n id 5F409200635; 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 06/17] audio: rename variables in audio_pcm_sw_write()", "Date": "Sun, 15 Jan 2023 14:12:13 +0100", "Message-Id": "<20230115131224.30751-6-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": "db8a8fd3-60c7-4624-80d1-3557b8a4ca4f", "Received-SPF": "none client-ip=194.25.134.20;\n envelope-from=volker.ruemelin@t-online.de; helo=mailout08.t-online.de", "X-Spam_score_int": "-18", "X-Spam_score": "-1.9", "X-Spam_bar": "-", "X-Spam_report": "(-1.9 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001,\n RCVD_IN_DNSWL_NONE=-0.0001, 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\nThe audio_pcm_sw_write() function uses a lot of very unspecific\nvariable names. Rename them for better readability.\n\nret => total_in\ntotal => total_out\nsize => buf_len\nhwsamples => hw->mix_buf.size\nsamples => frames_in_max\n\nSigned-off-by: Volker Rümelin <vr_qemu@t-online.de>\n---\n audio/audio.c | 45 ++++++++++++++++++++++-----------------------\n 1 file changed, 22 insertions(+), 23 deletions(-)", "diff": "diff --git a/audio/audio.c b/audio/audio.c\nindex 9d6ffa500a..a8571100ff 100644\n--- a/audio/audio.c\n+++ b/audio/audio.c\n@@ -704,56 +704,55 @@ static void audio_pcm_sw_resample_out(SWVoiceOut *sw,\n }\n }\n \n-static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t size)\n+static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t buf_len)\n {\n- size_t hwsamples, samples, live, dead;\n- size_t hw_free;\n- size_t ret, total;\n-\n- hwsamples = sw->hw->mix_buf.size;\n+ HWVoiceOut *hw = sw->hw;\n+ size_t live, dead, hw_free;\n+ size_t frames_in_max, total_in, total_out;\n \n live = sw->total_hw_samples_mixed;\n- if (audio_bug(__func__, live > hwsamples)) {\n- dolog(\"live=%zu hw->mix_buf.size=%zu\\n\", live, hwsamples);\n+ if (audio_bug(__func__, live > hw->mix_buf.size)) {\n+ dolog(\"live=%zu hw->mix_buf.size=%zu\\n\", live, hw->mix_buf.size);\n return 0;\n }\n \n- if (live == hwsamples) {\n+ if (live == hw->mix_buf.size) {\n #ifdef DEBUG_OUT\n dolog (\"%s is full %zu\\n\", sw->name, live);\n #endif\n return 0;\n }\n \n- dead = hwsamples - live;\n- hw_free = audio_pcm_hw_get_free(sw->hw);\n+ dead = hw->mix_buf.size - live;\n+ hw_free = audio_pcm_hw_get_free(hw);\n hw_free = hw_free > live ? hw_free - live : 0;\n- samples = ((int64_t)MIN(dead, hw_free) << 32) / sw->ratio;\n- samples = MIN(samples, size / sw->info.bytes_per_frame);\n- if (samples) {\n- sw->conv(sw->resample_buf.buffer, buf, samples);\n+ frames_in_max = ((int64_t)MIN(dead, hw_free) << 32) / sw->ratio;\n+ frames_in_max = MIN(frames_in_max, buf_len / sw->info.bytes_per_frame);\n+ if (frames_in_max) {\n+ sw->conv(sw->resample_buf.buffer, buf, frames_in_max);\n \n if (!sw->hw->pcm_ops->volume_out) {\n- mixeng_volume(sw->resample_buf.buffer, samples, &sw->vol);\n+ mixeng_volume(sw->resample_buf.buffer, frames_in_max, &sw->vol);\n }\n }\n \n- audio_pcm_sw_resample_out(sw, samples, MIN(dead, hw_free), &ret, &total);\n+ audio_pcm_sw_resample_out(sw, frames_in_max, MIN(dead, hw_free),\n+ &total_in, &total_out);\n \n- sw->total_hw_samples_mixed += total;\n+ sw->total_hw_samples_mixed += total_out;\n sw->empty = sw->total_hw_samples_mixed == 0;\n \n #ifdef DEBUG_OUT\n dolog (\n- \"%s: write size %zu ret %zu total sw %zu\\n\",\n- SW_NAME (sw),\n- size / sw->info.bytes_per_frame,\n- ret,\n+ \"%s: write size %zu written %zu total mixed %zu\\n\",\n+ SW_NAME(sw),\n+ buf_len / sw->info.bytes_per_frame,\n+ total_in,\n sw->total_hw_samples_mixed\n );\n #endif\n \n- return ret * sw->info.bytes_per_frame;\n+ return total_in * sw->info.bytes_per_frame;\n }\n \n #ifdef DEBUG_AUDIO\n", "prefixes": [ "06/17" ] }