Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1726722/?format=api
{ "id": 1726722, "url": "http://patchwork.ozlabs.org/api/patches/1726722/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20230115131224.30751-7-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-7-volker.ruemelin@t-online.de>", "list_archive_url": null, "date": "2023-01-15T13:12:14", "name": "[07/17] audio: don't misuse audio_pcm_sw_write()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "1da66c8983e6dbb91792ccc6defab6764c626a89", "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-7-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/1726722/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1726722/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 4NvwcC5pjXz23g1\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Jan 2023 00:14:51 +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-00043p-Jm; 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 1pH2oW-00042t-2i\n for qemu-devel@nongnu.org; Sun, 15 Jan 2023 08:12:44 -0500", "from mailout03.t-online.de ([194.25.134.81])\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 1pH2oU-0005A2-FV\n for qemu-devel@nongnu.org; Sun, 15 Jan 2023 08:12:43 -0500", "from fwd87.dcpf.telekom.de (fwd87.aul.t-online.de [10.223.144.113])\n by mailout03.t-online.de (Postfix) with SMTP id 4D22D1281B;\n Sun, 15 Jan 2023 14:12:40 +0100 (CET)", "from linpower.localnet ([79.208.25.151]) by fwd87.t-online.de\n with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted)\n esmtp id 1pH2oQ-1T1Bg10; Sun, 15 Jan 2023 14:12:38 +0100", "by linpower.localnet (Postfix, from userid 1000)\n id 61E0E200638; 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 07/17] audio: don't misuse audio_pcm_sw_write()", "Date": "Sun, 15 Jan 2023 14:12:14 +0100", "Message-Id": "<20230115131224.30751-7-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": "a3a622b3-c675-4cb7-bd84-d1a17f678256", "Received-SPF": "none client-ip=194.25.134.81;\n envelope-from=volker.ruemelin@t-online.de; helo=mailout03.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\nThe audio_pcm_sw_write() function is intended to convert a\nPCM audio stream to the internal representation, adjust the\nvolume, and then mix it with the other audio streams with a\npossibly changed sample rate in mix_buf. In order for the\naudio_capture_mix_and_clear() function to use audio_pcm_sw_write(),\nit must bypass the first two tasks of audio_pcm_sw_write().\n\nSince patch \"audio: split out the resampling loop in\naudio_pcm_sw_write()\" this is no longer necessary, because now\nthe audio_pcm_sw_resample_out() function can be used instead of\naudio_pcm_sw_write().\n\nSigned-off-by: Volker Rümelin <vr_qemu@t-online.de>\n---\n audio/audio.c | 29 ++++++++++++++++++-----------\n 1 file changed, 18 insertions(+), 11 deletions(-)", "diff": "diff --git a/audio/audio.c b/audio/audio.c\nindex a8571100ff..0cfd56850f 100644\n--- a/audio/audio.c\n+++ b/audio/audio.c\n@@ -1054,26 +1054,33 @@ static void audio_capture_mix_and_clear(HWVoiceOut *hw, size_t rpos,\n \n for (sc = hw->cap_head.lh_first; sc; sc = sc->entries.le_next) {\n SWVoiceOut *sw = &sc->sw;\n- int rpos2 = rpos;\n+ size_t rpos2 = rpos;\n \n n = samples;\n while (n) {\n size_t till_end_of_hw = hw->mix_buf.size - rpos2;\n- size_t to_write = MIN(till_end_of_hw, n);\n- size_t bytes = to_write * hw->info.bytes_per_frame;\n- size_t written;\n+ size_t to_read = MIN(till_end_of_hw, n);\n+ size_t live, frames_in, frames_out;\n \n sw->resample_buf.buffer = hw->mix_buf.buffer + rpos2;\n- sw->resample_buf.size = to_write;\n- written = audio_pcm_sw_write (sw, NULL, bytes);\n- if (written - bytes) {\n- dolog(\"Could not mix %zu bytes into a capture \"\n+ sw->resample_buf.size = to_read;\n+ live = sw->total_hw_samples_mixed;\n+\n+ audio_pcm_sw_resample_out(sw,\n+ to_read, sw->hw->mix_buf.size - live,\n+ &frames_in, &frames_out);\n+\n+ sw->total_hw_samples_mixed += frames_out;\n+ sw->empty = sw->total_hw_samples_mixed == 0;\n+\n+ if (to_read - frames_in) {\n+ dolog(\"Could not mix %zu frames into a capture \"\n \"buffer, mixed %zu\\n\",\n- bytes, written);\n+ to_read, frames_in);\n break;\n }\n- n -= to_write;\n- rpos2 = (rpos2 + to_write) % hw->mix_buf.size;\n+ n -= to_read;\n+ rpos2 = (rpos2 + to_read) % hw->mix_buf.size;\n }\n }\n }\n", "prefixes": [ "07/17" ] }