OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

audio: rename variables in audio_pcm_sw_read()

Browse Source 
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

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>
Message-Id: <20230224190555.7409-11-vr_qemu@t-online.de>
This commit is contained in:
Volker Rümelin 2023-02-24 20:05:51 +01:00 committed by Marc-André Lureau
parent 1c49c5f19e
commit fbde1edf06
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
audio/audio.c
View File

@ -576,10 +576,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) {
@ -590,20 +590,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;
}
/*