RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ao_sndio: open device in blocking mode, don't inflate buffer artificially 

The code actually uses blocking mode, so opening sound device in non-blocking
mode results in choppy sound.  Also, inflating the buffer isn't necessary in
blocking mode, so the function may simply return without doing anything.
This commit is contained in:
Dmitrij D. Czarkoff 2015-03-25 23:43:37 +01:00 committed by wm4
parent a60e725113
commit 58e0292a9f
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/out/ao_sndio.c
View File

@ -125,7 +125,7 @@ static int init(struct ao *ao)
const struct af_to_par *ap; const struct af_to_par *ap;
int i; int i;
p->hdl = sio_open(p->dev, SIO_PLAY, 1); p->hdl = sio_open(p->dev, SIO_PLAY, 0);
if (p->hdl == NULL) { if (p->hdl == NULL) {
MP_ERR(ao, "can't open sndio %s\n", p->dev); MP_ERR(ao, "can't open sndio %s\n", p->dev);
goto error; goto error;
@ -304,25 +304,7 @@ static void audio_pause(struct ao *ao)
*/ */
static void audio_resume(struct ao *ao) static void audio_resume(struct ao *ao)
{ {
struct priv *p = ao->priv; return;
int n, count, todo;
/*
* we want to start with buffers full, because mpv uses
* get_delay() as clock, which would cause video to
* accelerate while buffers are filled.
*/
todo = p->par.bufsz * p->par.pchan * p->par.bps;
while (todo > 0) {
count = todo;
if (count > SILENCE_NMAX)
count = SILENCE_NMAX;
n = sio_write(p->hdl, p->silence, count);
if (n == 0)
break;
todo -= n;
p->delay += n;
}
} }
#define OPT_BASE_STRUCT struct priv #define OPT_BASE_STRUCT struct priv