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:
parent
174702986c
commit
8d1439b692
|
@ -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 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, &size);
|
||||||
void *src = hw->pcm_ops->get_buffer_in(hw, &src_size);
|
|
||||||
copy_size = MIN(size, src_size);
|
|
||||||
|
|
||||||
memcpy(buf, src, copy_size);
|
memcpy(buf, src, size);
|
||||||
hw->pcm_ops->put_buffer_in(hw, src, copy_size);
|
hw->pcm_ops->put_buffer_in(hw, src, size);
|
||||||
return copy_size;
|
|
||||||
|
return size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int audio_driver_init(AudioState *s, struct audio_driver *drv,
|
static int audio_driver_init(AudioState *s, struct audio_driver *drv,
|
||||||
bool msg, Audiodev *dev)
|
bool msg, Audiodev *dev)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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 = 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) {
|
if (req_size == 0) {
|
||||||
*size = 0;
|
*size = 0;
|
||||||
|
|
Loading…
Reference in New Issue