diff options
| author | Volker Rümelin <vr_qemu@t-online.de> | 2020-04-05 09:50:17 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-04-06 13:29:53 +0200 |
| commit | 8d1439b692c5dc8edc4d4a1d334afd7070458029 (patch) | |
| tree | 17b273228418b880c09ecfbda53b58bc20fb848a /audio/audio.c | |
| parent | 174702986c04180e0c05cddbaf6b2547a07310eb (diff) | |
| download | qemu-8d1439b692c5dc8edc4d4a1d334afd7070458029.zip qemu-8d1439b692c5dc8edc4d4a1d334afd7070458029.tar.gz qemu-8d1439b692c5dc8edc4d4a1d334afd7070458029.tar.bz2 | |
dsoundaudio: dsound_get_buffer_in should honor *size
This patch prevents an underflow of variable samples in function
audio_pcm_hw_run_in(). See commit 599eac4e5a "audio:
audio_generic_get_buffer_in should honor *size". This time the
while loop in audio_pcm_hw_run_in() will terminate nevertheless,
because it seems the recording stream in Windows is always rate
limited.
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 20200405075017.9901-3-vr_qemu@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'audio/audio.c')
| -rw-r--r-- | audio/audio.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/audio/audio.c b/audio/audio.c index 9ac9a20..7a9e680 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1491,15 +1491,13 @@ size_t audio_generic_write(HWVoiceOut *hw, void *buf, size_t size) size_t audio_generic_read(HWVoiceIn *hw, void *buf, size_t size) { - size_t src_size, copy_size; - void *src = hw->pcm_ops->get_buffer_in(hw, &src_size); - copy_size = MIN(size, src_size); + void *src = hw->pcm_ops->get_buffer_in(hw, &size); - memcpy(buf, src, copy_size); - hw->pcm_ops->put_buffer_in(hw, src, copy_size); - return copy_size; -} + memcpy(buf, src, size); + hw->pcm_ops->put_buffer_in(hw, src, size); + return size; +} static int audio_driver_init(AudioState *s, struct audio_driver *drv, bool msg, Audiodev *dev) |