]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
dsoundaudio: fix "Could not lock capture buffer" warning
authorVolker Rümelin <vr_qemu@t-online.de>
Sun, 5 Apr 2020 07:50:16 +0000 (09:50 +0200)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 6 Apr 2020 11:29:53 +0000 (13:29 +0200)
IDirectSoundCaptureBuffer_Lock() fails on Windows when called
with len = 0. Return early from dsound_get_buffer_in() in this
case.

To reproduce the warning start a linux guest. In the guest
start Audacity and you will see a lot of "Could not lock
capture buffer" warnings.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 20200405075017.9901-2-vr_qemu@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
audio/dsoundaudio.c

index 9e621c88995455bf0d1dfeede38f21262b0dff2b..a08d519cae6ad8d4895543a211cc6c3735aebeee 100644 (file)
@@ -542,6 +542,11 @@ 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);
 
+    if (req_size == 0) {
+        *size = 0;
+        return NULL;
+    }
+
     err = dsound_lock_in(dscb, &hw->info, hw->pos_emul, req_size, &ret, NULL,
                          &act_size, NULL, false, ds->s);
     if (err) {