[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/9] audio: align audio_generic_read with audio_pcm_hw_run_in
From: |
Volker Rümelin |
Subject: |
[PATCH 4/9] audio: align audio_generic_read with audio_pcm_hw_run_in |
Date: |
Sun, 20 Sep 2020 19:17:24 +0200 |
The function audio_generic_read should work exactly like
audio_pcm_hw_run_in. It's a very similar function working
on a different buffer.
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
audio/audio.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index ba52259050..f1f0d72389 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1495,12 +1495,23 @@ size_t audio_generic_write(HWVoiceOut *hw, void *buf,
size_t size)
size_t audio_generic_read(HWVoiceIn *hw, void *buf, size_t size)
{
- void *src = hw->pcm_ops->get_buffer_in(hw, &size);
+ size_t total = 0;
- memcpy(buf, src, size);
- hw->pcm_ops->put_buffer_in(hw, src, size);
+ while (total < size) {
+ size_t src_size = size - total;
+ void *src = hw->pcm_ops->get_buffer_in(hw, &src_size);
- return size;
+ if (src_size == 0) {
+ hw->pcm_ops->put_buffer_in(hw, src, src_size);
+ break;
+ }
+
+ memcpy((char *)buf + total, src, src_size);
+ hw->pcm_ops->put_buffer_in(hw, src, src_size);
+ total += src_size;
+ }
+
+ return total;
}
static int audio_driver_init(AudioState *s, struct audio_driver *drv,
--
2.26.2
- [PATCH 0/9] Audio fixes and improvements, Volker Rümelin, 2020/09/20
- [PATCH 1/9] audio: handle buf == NULL in put_buffer_out(), Volker Rümelin, 2020/09/20
- [PATCH 3/9] audio/spiceaudio: always rate limit playback stream, Volker Rümelin, 2020/09/20
- [PATCH 2/9] audio/audio: fix video playback slowdown with spiceaudio, Volker Rümelin, 2020/09/20
- [PATCH 4/9] audio: align audio_generic_read with audio_pcm_hw_run_in,
Volker Rümelin <=
- [PATCH 7/9] audio: run downstream playback queue unconditionally, Volker Rümelin, 2020/09/20
- [PATCH 8/9] audio: restore mixing-engine playback buffer size, Volker Rümelin, 2020/09/20
- [PATCH 6/9] audio: align audio_generic_write with audio_pcm_hw_run_out, Volker Rümelin, 2020/09/20
- [PATCH 5/9] audio: remove unnecessary calls to put_buffer_in, Volker Rümelin, 2020/09/20
- [PATCH 9/9] audio: revert tests for pcm_ops table, Volker Rümelin, 2020/09/20
- Re: [PATCH 0/9] Audio fixes and improvements, Gerd Hoffmann, 2020/09/23