From: "Volker Rümelin" <vr_qemu@t-online.de>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH v3 02/15] audio: move function audio_pcm_hw_clip_out()
Date: Tue, 1 Mar 2022 20:12:58 +0100 [thread overview]
Message-ID: <20220301191311.26695-2-vr_qemu@t-online.de> (raw)
In-Reply-To: <3d0bd2ac-e5b9-9cf6-c98f-c047390a3ec5@t-online.de>
Move the function audio_pcm_hw_clip_out() into the correct
section 'Hard voice (playback)'.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
audio/audio.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index e7a139e289..dfd32912da 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -548,25 +548,6 @@ static size_t audio_pcm_hw_get_live_in(HWVoiceIn *hw)
return live;
}
-static void audio_pcm_hw_clip_out(HWVoiceOut *hw, void *pcm_buf, size_t len)
-{
- size_t clipped = 0;
- size_t pos = hw->mix_buf->pos;
-
- while (len) {
- st_sample *src = hw->mix_buf->samples + pos;
- uint8_t *dst = advance(pcm_buf, clipped * hw->info.bytes_per_frame);
- size_t samples_till_end_of_buf = hw->mix_buf->size - pos;
- size_t samples_to_clip = MIN(len, samples_till_end_of_buf);
-
- hw->clip(dst, src, samples_to_clip);
-
- pos = (pos + samples_to_clip) % hw->mix_buf->size;
- len -= samples_to_clip;
- clipped += samples_to_clip;
- }
-}
-
/*
* Soft voice (capture)
*/
@@ -677,6 +658,25 @@ static size_t audio_pcm_hw_get_live_out (HWVoiceOut *hw, int *nb_live)
return 0;
}
+static void audio_pcm_hw_clip_out(HWVoiceOut *hw, void *pcm_buf, size_t len)
+{
+ size_t clipped = 0;
+ size_t pos = hw->mix_buf->pos;
+
+ while (len) {
+ st_sample *src = hw->mix_buf->samples + pos;
+ uint8_t *dst = advance(pcm_buf, clipped * hw->info.bytes_per_frame);
+ size_t samples_till_end_of_buf = hw->mix_buf->size - pos;
+ size_t samples_to_clip = MIN(len, samples_till_end_of_buf);
+
+ hw->clip(dst, src, samples_to_clip);
+
+ pos = (pos + samples_to_clip) % hw->mix_buf->size;
+ len -= samples_to_clip;
+ clipped += samples_to_clip;
+ }
+}
+
/*
* Soft voice (playback)
*/
--
2.34.1
next prev parent reply other threads:[~2022-03-01 19:28 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 19:11 [PATCH v3 00/15] reduce audio playback latency Volker Rümelin
2022-03-01 19:12 ` [PATCH v3 01/15] audio: replace open-coded buffer arithmetic Volker Rümelin
2022-03-02 0:12 ` Akihiko Odaki
2022-03-01 19:12 ` Volker Rümelin [this message]
2022-03-01 19:12 ` [PATCH v3 03/15] audio: add function audio_pcm_hw_conv_in() Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 04/15] audio: inline function audio_pcm_sw_get_rpos_in() Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 05/15] paaudio: increase default latency to 46ms Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 06/15] jackaudio: use more jack audio buffers Volker Rümelin
2022-03-02 18:11 ` Christian Schoenebeck
2022-03-02 20:51 ` Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 07/15] audio: copy playback stream in sequential order Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 08/15] audio: add pcm_ops function table for capture backend Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 09/15] Revert "audio: fix wavcapture segfault" Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 10/15] audio: restore mixing-engine playback buffer size Volker Rümelin
2022-03-02 0:13 ` Akihiko Odaki
2022-03-01 19:13 ` [PATCH v3 11/15] paaudio: reduce effective " Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 12/15] dsoundaudio: " Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 13/15] ossaudio: " Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 14/15] paaudio: fix samples vs. frames mix-up Volker Rümelin
2022-03-01 19:13 ` [PATCH v3 15/15] sdlaudio: " Volker Rümelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220301191311.26695-2-vr_qemu@t-online.de \
--to=vr_qemu@t-online.de \
--cc=f4bug@amsat.org \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).