aboutsummaryrefslogtreecommitdiff
path: root/audio/audio.c
diff options
context:
space:
mode:
authorVolker RĂ¼melin <vr_qemu@t-online.de>2022-03-01 20:12:57 +0100
committerGerd Hoffmann <kraxel@redhat.com>2022-03-04 11:05:13 +0100
commit18404ff111e43d218b36b69ae002cae58acef352 (patch)
treec9bdc100da5ea814ef10c2d5c6b0d7c43cd463a9 /audio/audio.c
parent3a4d06f26f2606dd5029b05b4aff97f198455249 (diff)
downloadqemu-18404ff111e43d218b36b69ae002cae58acef352.zip
qemu-18404ff111e43d218b36b69ae002cae58acef352.tar.gz
qemu-18404ff111e43d218b36b69ae002cae58acef352.tar.bz2
audio: replace open-coded buffer arithmetic
Replace open-coded buffer arithmetic with the new function audio_ring_posb(). That's the position in backward direction of a given point at a given distance. Signed-off-by: Volker RĂ¼melin <vr_qemu@t-online.de> Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com> Message-Id: <20220301191311.26695-1-vr_qemu@t-online.de> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'audio/audio.c')
-rw-r--r--audio/audio.c25
1 files changed, 7 insertions, 18 deletions
diff --git a/audio/audio.c b/audio/audio.c
index dc28685..e7a139e 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -574,19 +574,13 @@ static size_t audio_pcm_sw_get_rpos_in(SWVoiceIn *sw)
{
HWVoiceIn *hw = sw->hw;
ssize_t live = hw->total_samples_captured - sw->total_hw_samples_acquired;
- ssize_t rpos;
if (audio_bug(__func__, live < 0 || live > hw->conv_buf->size)) {
dolog("live=%zu hw->conv_buf->size=%zu\n", live, hw->conv_buf->size);
return 0;
}
- rpos = hw->conv_buf->pos - live;
- if (rpos >= 0) {
- return rpos;
- } else {
- return hw->conv_buf->size + rpos;
- }
+ return audio_ring_posb(hw->conv_buf->pos, live, hw->conv_buf->size);
}
static size_t audio_pcm_sw_read(SWVoiceIn *sw, void *buf, size_t size)
@@ -1394,12 +1388,10 @@ void audio_generic_run_buffer_in(HWVoiceIn *hw)
void *audio_generic_get_buffer_in(HWVoiceIn *hw, size_t *size)
{
- ssize_t start = (ssize_t)hw->pos_emul - hw->pending_emul;
+ size_t start;
- if (start < 0) {
- start += hw->size_emul;
- }
- assert(start >= 0 && start < hw->size_emul);
+ start = audio_ring_posb(hw->pos_emul, hw->pending_emul, hw->size_emul);
+ assert(start < hw->size_emul);
*size = MIN(*size, hw->pending_emul);
*size = MIN(*size, hw->size_emul - start);
@@ -1415,13 +1407,10 @@ void audio_generic_put_buffer_in(HWVoiceIn *hw, void *buf, size_t size)
void audio_generic_run_buffer_out(HWVoiceOut *hw)
{
while (hw->pending_emul) {
- size_t write_len, written;
- ssize_t start = ((ssize_t) hw->pos_emul) - hw->pending_emul;
+ size_t write_len, written, start;
- if (start < 0) {
- start += hw->size_emul;
- }
- assert(start >= 0 && start < hw->size_emul);
+ start = audio_ring_posb(hw->pos_emul, hw->pending_emul, hw->size_emul);
+ assert(start < hw->size_emul);
write_len = MIN(hw->pending_emul, hw->size_emul - start);