Module Name: src
Committed By: nat
Date: Wed Apr 12 14:15:51 UTC 2017
Modified Files:
src/sys/dev: audio.c
Log Message:
Insert silence into the mix ring if there is no audio (or audio cannot
keep up) from the channels.
Addresses PR kern/34647.
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/sys/dev/audio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.321 src/sys/dev/audio.c:1.322
--- src/sys/dev/audio.c:1.321 Tue Apr 11 23:49:17 2017
+++ src/sys/dev/audio.c Wed Apr 12 14:15:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.321 2017/04/11 23:49:17 nat Exp $ */
+/* $NetBSD: audio.c,v 1.322 2017/04/12 14:15:50 nat Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <[email protected]>
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.321 2017/04/11 23:49:17 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.322 2017/04/12 14:15:50 nat Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -3789,9 +3789,13 @@ audio_mix(void *v)
if (sc->sc_saturate == true && sc->sc_opens > 1)
saturate_func(sc);
+ vc = SIMPLEQ_FIRST(&sc->sc_audiochan)->vc;
cb = &sc->sc_pr;
- if (sc->sc_writeme == true)
- cb->s.inp = audio_stream_add_inp(&cb->s, cb->s.inp, blksize);
+ inp = cb->s.inp;
+ cc = blksize - (inp - cb->s.start) % blksize;
+ if (sc->sc_writeme == false)
+ audio_pint_silence(sc, cb, inp, cc, vc);
+ cb->s.inp = audio_stream_add_inp(&cb->s, cb->s.inp, blksize);
mutex_exit(sc->sc_intr_lock);
kpreempt_disable();
