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

Merge branch 'master' into mixer

This commit is contained in:
Alexandre Ratchov 2020-01-10 21:12:12 +01:00
parent ddf18ab3e1 6d02c2e7a2
commit 8653038e1d
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sndiod/dev.c
View File

@ -1582,6 +1582,7 @@ dev_mmcloc(struct dev *d, unsigned int origin)
void
slot_initconv(struct slot *s)
{
unsigned int dev_nch;
struct dev *d = s->dev;
if (s->mode & MODE_PLAY) {
@ -1599,17 +1600,23 @@ slot_initconv(struct slot *s)
}
s->mix.join = 1;
s->mix.expand = 1;
if (s->opt->dup) {
if (s->mix.cmap.nch > s->mix.nch)
s->mix.expand = s->mix.cmap.nch / s->mix.nch;
else if (s->mix.cmap.nch > 0)
s->mix.join = s->mix.nch / s->mix.cmap.nch;
if (s->opt->dup && s->mix.cmap.nch > 0) {
dev_nch = d->pchan < (s->opt->pmax + 1) ?
d->pchan - s->opt->pmin :
s->opt->pmax - s->opt->pmin + 1;
if (dev_nch > s->mix.nch)
s->mix.expand = dev_nch / s->mix.nch;
else if (s->mix.nch > dev_nch)
s->mix.join = s->mix.nch / dev_nch;
}
}
if (s->mode & MODE_RECMASK) {
unsigned int outchan = (s->mode & MODE_MON) ?
d->pchan : d->rchan;
cmap_init(&s->sub.cmap,
0, ((s->mode & MODE_MON) ? d->pchan : d->rchan) - 1,
0, outchan - 1,
s->opt->rmin, s->opt->rmax,
s->opt->rmin, s->opt->rmin + s->sub.nch - 1,
s->opt->rmin, s->opt->rmin + s->sub.nch - 1);
@ -1622,11 +1629,14 @@ slot_initconv(struct slot *s)
}
s->sub.join = 1;
s->sub.expand = 1;
if (s->opt->dup) {
if (s->sub.cmap.nch > s->sub.nch)
s->sub.join = s->sub.cmap.nch / s->sub.nch;
else if (s->sub.cmap.nch > 0)
s->sub.expand = s->sub.nch / s->sub.cmap.nch;
if (s->opt->dup && s->sub.cmap.nch > 0) {
dev_nch = outchan < (s->opt->rmax + 1) ?
outchan - s->opt->rmin :
s->opt->rmax - s->opt->rmin + 1;
if (dev_nch > s->sub.nch)
s->sub.join = dev_nch / s->sub.nch;
else if (s->sub.nch > dev_nch)
s->sub.expand = s->sub.nch / dev_nch;
}
/*