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

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>
This commit is contained in:
Volker Rümelin 2020-04-05 09:50:17 +02:00 committed by Gerd Hoffmann
parent 174702986c
commit 8d1439b692
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/audio.c
View File

@ -1491,16 +1491,14 @@ 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)
{

2
audio/dsoundaudio.c
View File

@ -540,7 +540,7 @@ static void *dsound_get_buffer_in(HWVoiceIn *hw, size_t *size)
}
req_size = audio_ring_dist(cpos, hw->pos_emul, hw->size_emul);
req_size = MIN(req_size, hw->size_emul - hw->pos_emul);
req_size = MIN(*size, MIN(req_size, hw->size_emul - hw->pos_emul));
if (req_size == 0) {
*size = 0;