[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 02/15] audio: move function audio_pcm_hw_clip_out()
From: |
Volker Rümelin |
Subject: |
[PATCH v3 02/15] audio: move function audio_pcm_hw_clip_out() |
Date: |
Tue, 1 Mar 2022 20:12:58 +0100 |
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
- [PATCH v3 00/15] reduce audio playback latency, Volker Rümelin, 2022/03/01
- [PATCH v3 01/15] audio: replace open-coded buffer arithmetic, Volker Rümelin, 2022/03/01
- [PATCH v3 02/15] audio: move function audio_pcm_hw_clip_out(),
Volker Rümelin <=
- [PATCH v3 03/15] audio: add function audio_pcm_hw_conv_in(), Volker Rümelin, 2022/03/01
- [PATCH v3 05/15] paaudio: increase default latency to 46ms, Volker Rümelin, 2022/03/01
- [PATCH v3 07/15] audio: copy playback stream in sequential order, Volker Rümelin, 2022/03/01
- [PATCH v3 06/15] jackaudio: use more jack audio buffers, Volker Rümelin, 2022/03/01
- [PATCH v3 04/15] audio: inline function audio_pcm_sw_get_rpos_in(), Volker Rümelin, 2022/03/01
- [PATCH v3 08/15] audio: add pcm_ops function table for capture backend, Volker Rümelin, 2022/03/01
- [PATCH v3 09/15] Revert "audio: fix wavcapture segfault", Volker Rümelin, 2022/03/01
- [PATCH v3 14/15] paaudio: fix samples vs. frames mix-up, Volker Rümelin, 2022/03/01