[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/5] ohci: set effectively usb frame rate to 1kHz
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 5/5] ohci: set effectively usb frame rate to 1kHz |
Date: |
Mon, 1 Oct 2018 11:28:48 +0200 |
From: Miguel GAIO <address@hidden>
USB frame rate is slightly lower than 1kHz: ie. ~950Hz.
Thus usb-audio device is not able to perform a simple audio playback
without underruns on audio backend.
eg. "-device pci-ohci,id=ohci -device usb-audio,bus=ohci.0" vs PulseAudio
backend. more than 50 underruns are observed per second.
Update ohci_sof_time computation, using QEMU_CLOCK_VIRTUAL in
ohci_usb_start(), and increment by usb_frame_time in ohci_sof()
makes USB frame rate close to 1kHz.
This way, no audio underrun are observed during audio playback.
Signed-off-by: Miguel GAIO <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-ohci.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index 98da5f0f04..66656a1133 100644
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -1253,12 +1253,12 @@ static int ohci_service_ed_list(OHCIState *ohci,
uint32_t head, int completion)
/* set a timer for EOF */
static void ohci_eof_timer(OHCIState *ohci)
{
- ohci->sof_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
timer_mod(ohci->eof_timer, ohci->sof_time + usb_frame_time);
}
/* Set a timer for EOF and generate a SOF event */
static void ohci_sof(OHCIState *ohci)
{
+ ohci->sof_time += usb_frame_time;
ohci_eof_timer(ohci);
ohci_set_interrupt(ohci, OHCI_INTR_SF);
}
@@ -1362,6 +1362,7 @@ static int ohci_bus_start(OHCIState *ohci)
* can meet some race conditions
*/
+ ohci->sof_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
ohci_eof_timer(ohci);
return 1;
@@ -1476,6 +1477,9 @@ static uint32_t ohci_get_frame_remaining(OHCIState *ohci)
* set already.
*/
tks = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - ohci->sof_time;
+ if (tks < 0) {
+ tks = 0;
+ }
/* avoid muldiv if possible */
if (tks >= usb_frame_time)
--
2.9.3
- [Qemu-devel] [PULL 0/5] Usb 20181001 patches, Gerd Hoffmann, 2018/10/01
- [Qemu-devel] [PULL 4/5] usb-hub: clear suspend on detach, Gerd Hoffmann, 2018/10/01
- [Qemu-devel] [PULL 1/5] usb-mtp: fix error conditions for write operation, Gerd Hoffmann, 2018/10/01
- [Qemu-devel] [PULL 5/5] ohci: set effectively usb frame rate to 1kHz,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 3/5] usb-mtp: reset ObjectInfo dataset size on cleanup, Gerd Hoffmann, 2018/10/01
- [Qemu-devel] [PULL 2/5] doc: replace x-root with rootdir for usb-mtp, Gerd Hoffmann, 2018/10/01
- Re: [Qemu-devel] [PULL 0/5] Usb 20181001 patches, Peter Maydell, 2018/10/01