[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 06/15] audio: rename variables in audio_pcm_sw_write()
From: |
Volker Rümelin |
Subject: |
[PATCH v3 06/15] audio: rename variables in audio_pcm_sw_write() |
Date: |
Fri, 24 Feb 2023 20:05:46 +0100 |
The audio_pcm_sw_write() function uses a lot of very unspecific
variable names. Rename them for better readability.
ret => total_in
total => total_out
size => buf_len
hwsamples => hw->mix_buf.size
samples => frames_in_max
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
audio/audio.c | 45 ++++++++++++++++++++++-----------------------
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 8f1c0e77b0..cd10f1ec10 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -706,56 +706,55 @@ static void audio_pcm_sw_resample_out(SWVoiceOut *sw,
}
}
-static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t size)
+static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t buf_len)
{
- size_t hwsamples, samples, live, dead;
- size_t hw_free;
- size_t ret, total;
-
- hwsamples = sw->hw->mix_buf.size;
+ HWVoiceOut *hw = sw->hw;
+ size_t live, dead, hw_free;
+ size_t frames_in_max, total_in, total_out;
live = sw->total_hw_samples_mixed;
- if (audio_bug(__func__, live > hwsamples)) {
- dolog("live=%zu hw->mix_buf.size=%zu\n", live, hwsamples);
+ if (audio_bug(__func__, live > hw->mix_buf.size)) {
+ dolog("live=%zu hw->mix_buf.size=%zu\n", live, hw->mix_buf.size);
return 0;
}
- if (live == hwsamples) {
+ if (live == hw->mix_buf.size) {
#ifdef DEBUG_OUT
dolog ("%s is full %zu\n", sw->name, live);
#endif
return 0;
}
- dead = hwsamples - live;
- hw_free = audio_pcm_hw_get_free(sw->hw);
+ dead = hw->mix_buf.size - live;
+ hw_free = audio_pcm_hw_get_free(hw);
hw_free = hw_free > live ? hw_free - live : 0;
- samples = ((int64_t)MIN(dead, hw_free) << 32) / sw->ratio;
- samples = MIN(samples, size / sw->info.bytes_per_frame);
- if (samples) {
- sw->conv(sw->resample_buf.buffer, buf, samples);
+ frames_in_max = ((int64_t)MIN(dead, hw_free) << 32) / sw->ratio;
+ frames_in_max = MIN(frames_in_max, buf_len / sw->info.bytes_per_frame);
+ if (frames_in_max) {
+ sw->conv(sw->resample_buf.buffer, buf, frames_in_max);
if (!sw->hw->pcm_ops->volume_out) {
- mixeng_volume(sw->resample_buf.buffer, samples, &sw->vol);
+ mixeng_volume(sw->resample_buf.buffer, frames_in_max, &sw->vol);
}
}
- audio_pcm_sw_resample_out(sw, samples, MIN(dead, hw_free), &ret, &total);
+ audio_pcm_sw_resample_out(sw, frames_in_max, MIN(dead, hw_free),
+ &total_in, &total_out);
- sw->total_hw_samples_mixed += total;
+ sw->total_hw_samples_mixed += total_out;
sw->empty = sw->total_hw_samples_mixed == 0;
#ifdef DEBUG_OUT
dolog (
- "%s: write size %zu ret %zu total sw %zu\n",
- SW_NAME (sw),
- size / sw->info.bytes_per_frame,
- ret,
+ "%s: write size %zu written %zu total mixed %zu\n",
+ SW_NAME(sw),
+ buf_len / sw->info.bytes_per_frame,
+ total_in,
sw->total_hw_samples_mixed
);
#endif
- return ret * sw->info.bytes_per_frame;
+ return total_in * sw->info.bytes_per_frame;
}
#ifdef DEBUG_AUDIO
--
2.35.3
- [PATCH v3 02/15] audio: change type and name of the resample buffer, (continued)
- [PATCH v3 02/15] audio: change type and name of the resample buffer, Volker Rümelin, 2023/02/24
- [PATCH v3 01/15] audio: change type of mix_buf and conv_buf, Volker Rümelin, 2023/02/24
- [PATCH v3 03/15] audio: make the resampling code greedy, Volker Rümelin, 2023/02/24
- [PATCH v3 04/15] audio: replace the resampling loop in audio_pcm_sw_write(), Volker Rümelin, 2023/02/24
- [PATCH v3 05/15] audio: remove sw == NULL check, Volker Rümelin, 2023/02/24
- [PATCH v3 07/15] audio: don't misuse audio_pcm_sw_write(), Volker Rümelin, 2023/02/24
- [PATCH v3 08/15] audio: remove unused noop_conv() function, Volker Rümelin, 2023/02/24
- [PATCH v3 09/15] audio: make playback packet length calculation exact, Volker Rümelin, 2023/02/24
- [PATCH v3 10/15] audio: replace the resampling loop in audio_pcm_sw_read(), Volker Rümelin, 2023/02/24
- [PATCH v3 11/15] audio: rename variables in audio_pcm_sw_read(), Volker Rümelin, 2023/02/24
- [PATCH v3 06/15] audio: rename variables in audio_pcm_sw_write(),
Volker Rümelin <=
- [PATCH v3 13/15] audio: handle leftover audio frame from upsampling, Volker Rümelin, 2023/02/24
- [PATCH v3 12/15] audio: make recording packet length calculation exact, Volker Rümelin, 2023/02/24
- [PATCH v3 14/15] audio/audio_template: substitute sw->hw with hw, Volker Rümelin, 2023/02/24
- [PATCH v3 15/15] audio: remove sw->ratio, Volker Rümelin, 2023/02/24