Skip to content

Commit

Permalink
mixausrc: fix ausrc resampling
Browse files Browse the repository at this point in the history
  • Loading branch information
@cspiel1 @sreimers
cspiel1 authored and sreimers committed Apr 2, 2024
1 parent 50b70b4 commit 8f8b3a0
Showing 1 changed file with 77 additions and 36 deletions.
113 changes: 77 additions & 36 deletions modules/mixausrc/mixausrc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,9 @@ static int init_aubuf(struct mixstatus *st)
uint32_t v = 2;
size_t maxsz;
size_t wishsz;
size_t num_bytes = st->sampc * aufmt_sample_size(st->prm.fmt);

conf_get_u32(conf_cur(), "mixausrc_wish_size", &v);
wishsz = v * num_bytes;
wishsz = v * st->nbytes;
maxsz = 2 * wishsz;

st->aubuf = mem_deref(st->aubuf);
Expand All @@ -144,10 +143,11 @@ static int init_aubuf(struct mixstatus *st)
goto out;
}

aubuf_set_live(st->aubuf, false);
if (st->rbuf)
return 0;

st->rbuf = mem_zalloc(sizeof(int16_t)*st->sampc, NULL);
st->rbuf = mem_zalloc(st->nbytes, NULL);
if (!st->rbuf) {
warning("mixausrc: Could not allocate rbuf.\n");
goto out;
Expand All @@ -158,13 +158,14 @@ static int init_aubuf(struct mixstatus *st)
}


static int process_resamp(struct mixstatus *st, const struct auframe *af)
static int process_resamp(struct mixstatus *st, const struct auframe *afsrc)
{
int err = 0;
size_t nbytes = auframe_size(af);
size_t sampc = st->sampc;
if (af->fmt != AUFMT_S16LE)
if (afsrc->fmt != AUFMT_S16LE) {
warning("mixausrc: sample format %s not supported\n",
aufmt_name(afsrc->fmt));
return EINVAL;
}

if (!st->resamp.resample) {
debug("mixausrc: resample ausrc %u/%u -> %u/%u\n",
Expand All @@ -180,22 +181,18 @@ static int process_resamp(struct mixstatus *st, const struct auframe *af)
}

st->sampvrs = mem_deref(st->sampvrs);
if (st->nbytes > nbytes)
nbytes = st->nbytes;

st->sampvrs = mem_zalloc(nbytes, NULL);
st->sampvrs = mem_zalloc(st->nbytes, NULL);
if (!st->sampvrs) {
warning("mixausrc: could not alloc resample buffer\n");
return ENOMEM;
}
}

if (st->resamp.resample) {
if (af->sampc > sampc)
sampc = af->sampc;

size_t sampc = st->sampc;
err = auresamp(&st->resamp, st->sampvrs, &sampc,
af->sampv, af->sampc);
afsrc->sampv, afsrc->sampc);

if (sampc != st->sampc) {
warning("mixausrc: unexpected sample count "
"%u vs. %u\n", sampc, st->sampc);
Expand All @@ -206,29 +203,64 @@ static int process_resamp(struct mixstatus *st, const struct auframe *af)
if (err)
warning("mixausrc: could not resample frame (%m)\n", err);


return err;
}


static void ausrc_read_handler(struct auframe *af, void *arg)
static void ausrc_prm_af(struct ausrc_prm *ausprm, struct auframe *afsrc)
{
ausprm->srate = afsrc->srate;
ausprm->ch = afsrc->ch;
ausprm->fmt = afsrc->fmt;
}


static void ausrc_prm_aufilt(struct ausrc_prm *ausprm,
struct aufilt_prm *filprm)
{
ausprm->srate = filprm->srate;
ausprm->ch = filprm->ch;
ausprm->fmt = filprm->fmt;
}


static void ausrc_read_handler(struct auframe *afsrc, void *arg)
{
struct mixstatus *st = arg;
size_t num_bytes;
int err = 0;

if (!st->prm.srate || !st->prm.ch)
return;

ausrc_prm_af(&st->ausrc_prm, afsrc);
if (!st->ausrc_prm.srate || !st->ausrc_prm.ch)
return;

if (!st->sampc || !st->nbytes)
return;

if (st->ausrc_prm.srate != st->prm.srate ||
st->ausrc_prm.ch != st->prm.ch)
err = process_resamp(st, af);
err = process_resamp(st, afsrc);

if (err)
if (err) {
st->nextmode = FM_FADEIN;
return;
}

if (!st->aubuf) {
err = init_aubuf(st);
if (err) {
st->nextmode = FM_FADEIN;
return;
}
}

num_bytes = st->sampc * aufmt_sample_size(st->prm.fmt);
if (st->sampvrs)
aubuf_write(st->aubuf, st->sampvrs, num_bytes);
if (st->sampvrs) {
aubuf_write(st->aubuf, st->sampvrs, st->nbytes);
}
else
aubuf_write(st->aubuf, af->sampv, num_bytes);
aubuf_write(st->aubuf, afsrc->sampv, st->nbytes);
}


Expand All @@ -247,10 +279,6 @@ static int start_ausrc(struct mixstatus *st)
{
int err;

err = init_aubuf(st);
if (err)
goto out;

auresamp_init(&st->resamp);
err = ausrc_alloc(&st->ausrc, baresip_ausrcl(), st->module,
&st->ausrc_prm, st->param, ausrc_read_handler,
Expand All @@ -263,7 +291,6 @@ static int start_ausrc(struct mixstatus *st)
st->mode = FM_FADEIN;
}

out:
/* now we are ready for next start_process */
st->module = mem_deref(st->module);
st->param = mem_deref(st->param);
Expand All @@ -276,20 +303,20 @@ static int stop_ausrc(struct mixstatus *st)
{
st->ausrc = mem_deref(st->ausrc);
st->aubuf = mem_deref(st->aubuf);
st->rbuf = mem_deref(st->rbuf);
st->sampvrs = mem_deref(st->sampvrs);
st->sampc = 0;
st->nbytes = 0;
st->aubuf_started = false;
return 0;
}


static void destruct(struct mixstatus *st)
{
stop_ausrc(st);
mem_deref(st->module);
mem_deref(st->param);
mem_deref(st->ausrc);
mem_deref(st->aubuf);
mem_deref(st->rbuf);
mem_deref(st->sampvrs);
}


Expand Down Expand Up @@ -320,6 +347,8 @@ static void mixstatus_init(struct mixstatus *st, struct aufilt_prm *prm)
st->minvol = 1.;
st->ausvol = 1.;
st->i_fade = 0;

/* initialize with configured values */
st->prm = *prm;
st->ausrc_prm.ch = prm->ch;
st->ausrc_prm.fmt = prm->fmt;
Expand All @@ -334,6 +363,7 @@ static int encode_update(struct aufilt_enc_st **stp, void **ctx,
struct mixausrc_enc *st;
(void)au;
(void)af;
(void)prm;

if (!stp || !ctx || !prm)
return EINVAL;
Expand Down Expand Up @@ -498,6 +528,14 @@ static int mixframe(struct mixstatus *st, struct auframe *af)
}


static void aufilt_prm_update(struct aufilt_prm *prm, struct auframe *af)
{
prm->srate = af->srate;
prm->ch = af->ch;
prm->fmt = af->fmt;
}


static int process(struct mixstatus *st, struct auframe *af)
{
size_t n = af->sampc;
Expand All @@ -507,17 +545,18 @@ static int process(struct mixstatus *st, struct auframe *af)
if (!st->sampc) {
st->sampc = n;
st->ausrc_prm.ptime = (uint32_t) n * 1000 /
st->ausrc_prm.srate / st->ausrc_prm.ch;
(af->srate * af->ch);
}
else if (st->sampc != n) {
warning("mixausrc: sampc changed %lu --> %lu.\n",
st->sampc, n);
st->sampc, n);
stop_ausrc(st);
st->nextmode = FM_FADEIN;
st->sampc = 0;
return EINVAL;
}

aufilt_prm_update(&st->prm, af);
if (st->mode == FM_FADEOUT && st->i_fade == st->n_fade)
st->mode = FM_MIX;

Expand All @@ -532,7 +571,7 @@ static int process(struct mixstatus *st, struct auframe *af)
/* a command was invoked */
/* process nextmode */
if (st->mode != st->nextmode) {
debug("mixausrc: mode %s --> %s",
debug("mixausrc: mode %s --> %s\n",
str_mixmode(st->mode),
str_mixmode(st->nextmode));
if (st->mode == FM_MIX)
Expand Down Expand Up @@ -672,6 +711,8 @@ static int start_process(struct mixstatus* st, const char *name,
st->n_fade = (DEFAULT_FADE_TIME * st->ausrc_prm.srate) / 1000;
st->delta_fade = (1.0 - st->minvol) / st->n_fade;

stop_ausrc(st);
ausrc_prm_aufilt(&st->ausrc_prm, &st->prm);
st->nextmode = FM_FADEOUT;

return err;
Expand Down

0 comments on commit 8f8b3a0

Please sign in to comment.