[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/17] audio: rename variables in audio_pcm_sw_read()
From: |
Volker Rümelin |
Subject: |
[PATCH 12/17] audio: rename variables in audio_pcm_sw_read() |
Date: |
Sun, 15 Jan 2023 14:12:19 +0100 |
From: Volker Rümelin <vr_qemu@t-online.de>
The audio_pcm_sw_read() function uses a few very unspecific
variable names. Rename them for better readability.
ret => total_out
total => total_in
size => buf_len
samples => frames_out_max
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
audio/audio.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 83bac97fa4..b660569928 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -574,10 +574,10 @@ static void audio_pcm_sw_resample_in(SWVoiceIn *sw,
}
}
-static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t size)
+static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t buf_len)
{
HWVoiceIn *hw = sw->hw;
- size_t samples, live, ret, swlim, total;
+ size_t live, frames_out_max, swlim, total_in, total_out;
live = hw->total_samples_captured - sw->total_hw_samples_acquired;
if (!live) {
@@ -588,20 +588,20 @@ static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf,
size_t size)
return 0;
}
- samples = size / sw->info.bytes_per_frame;
+ frames_out_max = buf_len / sw->info.bytes_per_frame;
swlim = (live * sw->ratio) >> 32;
- swlim = MIN (swlim, samples);
+ swlim = MIN(swlim, frames_out_max);
- audio_pcm_sw_resample_in(sw, live, swlim, &total, &ret);
+ audio_pcm_sw_resample_in(sw, live, swlim, &total_in, &total_out);
if (!hw->pcm_ops->volume_in) {
- mixeng_volume(sw->resample_buf.buffer, ret, &sw->vol);
+ mixeng_volume(sw->resample_buf.buffer, total_out, &sw->vol);
}
+ sw->clip(buf, sw->resample_buf.buffer, total_out);
- sw->clip(buf, sw->resample_buf.buffer, ret);
- sw->total_hw_samples_acquired += total;
- return ret * sw->info.bytes_per_frame;
+ sw->total_hw_samples_acquired += total_in;
+ return total_out * sw->info.bytes_per_frame;
}
/*
--
2.35.3
- [PATCH 03/17] audio: make the resampling code greedy, (continued)
- [PATCH 03/17] audio: make the resampling code greedy, Volker Rümelin, 2023/01/15
- [PATCH 02/17] audio: change type and name of the resample buffer, Volker Rümelin, 2023/01/15
- [PATCH 04/17] audio: replace the resampling loop in audio_pcm_sw_write(), Volker Rümelin, 2023/01/15
- [PATCH 05/17] audio: remove sw == NULL check, Volker Rümelin, 2023/01/15
- [PATCH 07/17] audio: don't misuse audio_pcm_sw_write(), Volker Rümelin, 2023/01/15
- [PATCH 06/17] audio: rename variables in audio_pcm_sw_write(), Volker Rümelin, 2023/01/15
- [PATCH 08/17] audio: remove unused noop_conv() function, Volker Rümelin, 2023/01/15
- [PATCH 09/17] audio/mixeng: calculate number of input frames, Volker Rümelin, 2023/01/15
- [PATCH 10/17] audio: wire up st_rate_frames_in(), Volker Rümelin, 2023/01/15
- [PATCH 11/17] audio: replace the resampling loop in audio_pcm_sw_read(), Volker Rümelin, 2023/01/15
- [PATCH 12/17] audio: rename variables in audio_pcm_sw_read(),
Volker Rümelin <=
- [PATCH 14/17] audio: wire up st_rate_frames_out(), Volker Rümelin, 2023/01/15
- [PATCH 16/17] audio/audio_template: substitute sw->hw with hw, Volker Rümelin, 2023/01/15
- [PATCH 13/17] audio/mixeng: calculate number of output frames, Volker Rümelin, 2023/01/15
- [PATCH 15/17] audio: handle leftover audio frame from upsampling, Volker Rümelin, 2023/01/15
- [PATCH 17/17] audio: remove sw->ratio, Volker Rümelin, 2023/01/15
- Re: [PATCH 00/17] audio: improve callback interface for audio frontends, Volker Rümelin, 2023/01/15
- Re: [PATCH 00/17] audio: improve callback interface for audio frontends, Marc-André Lureau, 2023/01/31