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

ao_sndio: change p->delay to samples 

This was in bytes, but it's more convenient to use samples (or frames;
in any case the smallest unit of audio that includes all channels).

Remove the ao->bps line too; it will be set after init() returns.
This commit is contained in:
wm4 2014-09-26 15:46:33 +02:00
parent 12d93fdfef
commit 3208f8c445
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
audio/out/ao_sndio.c
View File

@ -74,7 +74,7 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg)
static void movecb(void *addr, int delta)
{
struct priv *p = addr;
p->delay -= delta * (int)(p->par.bps * p->par.pchan);
p->delay -= delta;
}
/*
@ -186,10 +186,8 @@ static int init(struct ao *ao)
goto error;
}
ao->bps = p->par.bps * p->par.pchan * p->par.rate;
p->havevol = sio_onvol(p->hdl, volcb, p);
sio_onmove(p->hdl, movecb, p);
p->delay = 0;
if (!sio_start(p->hdl))
MP_ERR(ao, "init: couldn't start\n");
@ -241,11 +239,11 @@ static int play(struct ao *ao, void **data, int samples, int flags)
struct priv *p = ao->priv;
int n;
n = sio_write(p->hdl, data[0], samples * ao->sstride);
n = sio_write(p->hdl, data[0], samples * ao->sstride) / ao->sstride;
p->delay += n;
if (flags & AOPLAY_FINAL_CHUNK)
reset(ao);
return n / ao->sstride;
return n;
}
/*
@ -265,7 +263,7 @@ static int get_space(struct ao *ao)
; /* nothing */
sio_revents(p->hdl, p->pfd);
int samples = (p->par.bufsz * p->par.pchan * p->par.bps - p->delay) / ao->sstride;
int samples = p->par.bufsz - p->delay;
return samples / p->par.round * p->par.round;
}
@ -275,7 +273,7 @@ static int get_space(struct ao *ao)
static float get_delay(struct ao *ao)
{
struct priv *p = ao->priv;
return (float)p->delay / (p->par.bps * p->par.pchan * p->par.rate);
return p->delay / (double)p->par.rate;
}
/*