ericonr
/
sndio
mirror of https://github.com/ericonr/sndio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

copy the right number of channels during join/expand

This commit is contained in:
Alexandre Ratchov 2014-02-08 16:00:54 +01:00
parent 6f415698f8
commit 236d573f93
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sndiod/dev.c
View File

@ -604,22 +604,18 @@ play_filt_resamp(struct slot *s, void *res_in, void *out, int todo)
} else
in = res_in;
nch = s->mix.slot_cmax - s->mix.slot_cmin + 1;
nch = s->mix.cmap.nch;
vol = ADATA_MUL(s->mix.weight, s->mix.vol) / s->mix.join;
cmap_add(&s->mix.cmap, in, out, vol, todo);
offs = 0;
for (i = s->mix.join - 1; i > 0; i--) {
offs += nch;
if (offs > s->mix.cmap.inext)
break;
cmap_add(&s->mix.cmap, (adata_t *)in + offs, out, vol, todo);
}
offs = 0;
for (i = s->mix.expand - 1; i > 0; i--) {
offs += nch;
if (offs > s->mix.cmap.onext)
break;
cmap_add(&s->mix.cmap, in, (adata_t *)out + offs, vol, todo);
}
return todo;
@ -822,7 +818,7 @@ rec_filt_resamp(struct slot *s, void *in, void *res_out, int todo)
out = (s->sub.resampbuf) ? s->sub.resampbuf : res_out;
nch = s->sub.slot_cmax - s->sub.slot_cmin + 1;
nch = s->sub.cmap.nch;
vol = ADATA_UNIT / s->sub.join;
cmap_copy(&s->sub.cmap, in, out, vol, todo);