summary refs log tree commit diff stats
path: root/hw/audio/hda-codec.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2018-06-22 13:11:59 +0200
committerGerd Hoffmann <kraxel@redhat.com>2018-06-25 13:57:57 +0200
commit4501ee16c76e89e0a2b2beb95f3b93f965997391 (patch)
treea3ffcf0a81d849050f1648dc276b2ad90650edc6 /hw/audio/hda-codec.c
parent8ced0669237b2bbedac3e4ce6fcf7aaaafaae663 (diff)
downloadfocaccia-qemu-4501ee16c76e89e0a2b2beb95f3b93f965997391.tar.gz
focaccia-qemu-4501ee16c76e89e0a2b2beb95f3b93f965997391.zip
audio/hda: detect output buffer overruns
If some event caused some larger playback hickup the fine-grained timer
adjust isn't able to recover.  Use a buffer overruns as indicator for
that.  Reset timer adjust logic in case we detected one.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180622111200.30561-5-kraxel@redhat.com
Diffstat (limited to 'hw/audio/hda-codec.c')
-rw-r--r--hw/audio/hda-codec.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index 870448a687..ac67b9aada 100644
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -325,6 +325,15 @@ static void hda_audio_output_cb(void *opaque, int avail)
 
     int64_t to_transfer = audio_MIN(wpos - rpos, avail);
 
+    if (wpos - rpos == B_SIZE) {
+        /* drop buffer, reset timer adjust */
+        st->rpos = 0;
+        st->wpos = 0;
+        st->buft_start = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+        trace_hda_audio_overrun(st->node->name);
+        return;
+    }
+
     hda_timer_sync_adjust(st, (wpos - rpos) - to_transfer - (B_SIZE >> 1));
 
     while (to_transfer) {