diff options
| author | Gerd Hoffmann | 2018-06-22 13:11:59 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2018-06-25 13:57:57 +0200 |
| commit | 4501ee16c76e89e0a2b2beb95f3b93f965997391 (patch) | |
| tree | a3ffcf0a81d849050f1648dc276b2ad90650edc6 /hw/audio | |
| parent | audio/hda: tweak timer adjust logic (diff) | |
| download | qemu-4501ee16c76e89e0a2b2beb95f3b93f965997391.tar.gz qemu-4501ee16c76e89e0a2b2beb95f3b93f965997391.tar.xz 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')
| -rw-r--r-- | hw/audio/hda-codec.c | 9 | ||||
| -rw-r--r-- | hw/audio/trace-events | 1 |
2 files changed, 10 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) { diff --git a/hw/audio/trace-events b/hw/audio/trace-events index 30112d97c4..5891b4e2b9 100644 --- a/hw/audio/trace-events +++ b/hw/audio/trace-events @@ -22,3 +22,4 @@ milkymist_ac97_out_cb_transferred(int transferred) "transferred %d" hda_audio_running(const char *stream, int nr, bool running) "st %s, nr %d, run %d" hda_audio_format(const char *stream, int chan, const char *fmt, int freq) "st %s, %d x %s @ %d Hz" hda_audio_adjust(const char *stream, int pos) "st %s, pos %d" +hda_audio_overrun(const char *stream) "st %s" |