[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/15] audio: move function audio_pcm_hw_clip_out()
|
From: |
Volker Rümelin |
|
Subject: |
[PATCH 02/15] audio: move function audio_pcm_hw_clip_out() |
|
Date: |
Thu, 6 Jan 2022 10:23:19 +0100 |
From: Volker Rümelin <vr_qemu@t-online.de>
Move the function audio_pcm_hw_clip_out() into the correct
section 'Hard voice (playback)'.
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.31.1
- [PATCH 09/15] audio: revert tests for pcm_ops table, (continued)
- [PATCH 09/15] audio: revert tests for pcm_ops table, Volker Rümelin, 2022/01/06
- [PATCH 13/15] ossaudio: reduce effective playback buffer size, Volker Rümelin, 2022/01/06
- [PATCH 01/15] audio: replace open-coded buffer arithmetic, Volker Rümelin, 2022/01/06
- [PATCH 04/15] audio: inline function audio_pcm_sw_get_rpos_in(), Volker Rümelin, 2022/01/06
- [PATCH 12/15] dsoundaudio: reduce effective playback buffer size, Volker Rümelin, 2022/01/06
- [PATCH 07/15] audio: copy playback stream in sequential order, Volker Rümelin, 2022/01/06
- [PATCH 02/15] audio: move function audio_pcm_hw_clip_out(),
Volker Rümelin <=
- [PATCH 06/15] jackaudio: use more jack audio buffers, Volker Rümelin, 2022/01/06
- [PATCH 14/15] paaudio: fix samples vs. frames mix-up, Volker Rümelin, 2022/01/06
- [PATCH 10/15] audio: restore mixing-engine playback buffer size, Volker Rümelin, 2022/01/06
- [PATCH 05/15] paaudio: increase default latency to 46ms, Volker Rümelin, 2022/01/06
- [PATCH 15/15] sdlaudio: fix samples vs. frames mix-up, Volker Rümelin, 2022/01/06
- [PATCH 03/15] audio: add function audio_pcm_hw_conv_in(), Volker Rümelin, 2022/01/06
- [PATCH 11/15] paaudio: reduce effective playback buffer size, Volker Rümelin, 2022/01/06
- Re: [PATCH 00/15] reduce audio playback latency, Christian Schoenebeck, 2022/01/09