summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.bin/aucat/aucat.c90
-rw-r--r--usr.bin/aucat/dsp.c17
-rw-r--r--usr.bin/aucat/dsp.h4
3 files changed, 57 insertions, 54 deletions
diff --git a/usr.bin/aucat/aucat.c b/usr.bin/aucat/aucat.c
index eb91028a31b..df423b0673d 100644
--- a/usr.bin/aucat/aucat.c
+++ b/usr.bin/aucat/aucat.c
@@ -423,38 +423,36 @@ slot_del(struct slot *s)
free(s);
}
-static int
-play_filt_resamp(struct slot *s, void *res_in, void *out, int todo)
+static void
+play_filt_resamp(struct slot *s, void *res_in, void *out, int *icnt, int *ocnt)
{
int i, offs, vol, nch;
void *in;
if (s->resampbuf) {
- todo = resamp_do(&s->resamp,
- res_in, s->resampbuf, todo);
+ resamp_do(&s->resamp, res_in, s->resampbuf, icnt, ocnt);
in = s->resampbuf;
} else
in = res_in;
nch = s->cmap.nch;
vol = s->vol / s->join; /* XXX */
- cmap_add(&s->cmap, in, out, vol, todo);
+ cmap_add(&s->cmap, in, out, vol, *ocnt);
offs = 0;
for (i = s->join - 1; i > 0; i--) {
offs += nch;
- cmap_add(&s->cmap, (adata_t *)in + offs, out, vol, todo);
+ cmap_add(&s->cmap, (adata_t *)in + offs, out, vol, *ocnt);
}
offs = 0;
for (i = s->expand - 1; i > 0; i--) {
offs += nch;
- cmap_add(&s->cmap, in, (adata_t *)out + offs, vol, todo);
+ cmap_add(&s->cmap, in, (adata_t *)out + offs, vol, *ocnt);
}
- return todo;
}
-static int
-play_filt_dec(struct slot *s, void *in, void *out, int todo)
+static void
+play_filt_dec(struct slot *s, void *in, void *out, int *icnt, int *ocnt)
{
void *tmp;
@@ -462,20 +460,21 @@ play_filt_dec(struct slot *s, void *in, void *out, int todo)
if (tmp) {
switch (s->afile.fmt) {
case AFILE_FMT_PCM:
- dec_do(&s->conv, in, tmp, todo);
+ dec_do(&s->conv, in, tmp, *icnt);
break;
case AFILE_FMT_ULAW:
- dec_do_ulaw(&s->conv, in, tmp, todo, 0);
+ dec_do_ulaw(&s->conv, in, tmp, *icnt, 0);
break;
case AFILE_FMT_ALAW:
- dec_do_ulaw(&s->conv, in, tmp, todo, 1);
+ dec_do_ulaw(&s->conv, in, tmp, *icnt, 1);
break;
case AFILE_FMT_FLOAT:
- dec_do_float(&s->conv, in, tmp, todo);
+ dec_do_float(&s->conv, in, tmp, *icnt);
break;
}
- }
- return play_filt_resamp(s, tmp ? tmp : in, out, todo);
+ } else
+ tmp = in;
+ play_filt_resamp(s, tmp, out, icnt, ocnt);
}
/*
@@ -487,25 +486,26 @@ static int
slot_mix_badd(struct slot *s, adata_t *odata)
{
adata_t *idata;
- int icount, todo, done;
+ int len, icnt, ocnt;
- idata = (adata_t *)abuf_rgetblk(&s->buf, &icount);
- todo = icount / s->bpf;
- if (todo > s->round)
- todo = s->round;
+ idata = (adata_t *)abuf_rgetblk(&s->buf, &len);
+ icnt = len / s->bpf;
+ if (icnt > s->round)
+ icnt = s->round;
#ifdef DEBUG
- if (todo == 0) {
+ if (icnt == 0) {
log_puts("slot_mix_badd: not enough data\n");
panic();
}
#endif
- done = play_filt_dec(s, idata, odata, todo);
- abuf_rdiscard(&s->buf, todo * s->bpf);
- return done;
+ ocnt = dev_round;
+ play_filt_dec(s, idata, odata, &icnt, &ocnt);
+ abuf_rdiscard(&s->buf, icnt * s->bpf);
+ return ocnt;
}
-static int
-rec_filt_resamp(struct slot *s, void *in, void *res_out, int todo)
+static void
+rec_filt_resamp(struct slot *s, void *in, void *res_out, int *icnt, int *ocnt)
{
int i, vol, offs, nch;
void *out = res_out;
@@ -514,35 +514,33 @@ rec_filt_resamp(struct slot *s, void *in, void *res_out, int todo)
nch = s->cmap.nch;
vol = ADATA_UNIT / s->join;
- cmap_copy(&s->cmap, in, out, vol, todo);
+ cmap_copy(&s->cmap, in, out, vol, *icnt);
offs = 0;
for (i = s->join - 1; i > 0; i--) {
offs += nch;
- cmap_add(&s->cmap, (adata_t *)in + offs, out, vol, todo);
+ cmap_add(&s->cmap, (adata_t *)in + offs, out, vol, *icnt);
}
offs = 0;
for (i = s->expand - 1; i > 0; i--) {
offs += nch;
- cmap_copy(&s->cmap, in, (adata_t *)out + offs, vol, todo);
- }
- if (s->resampbuf) {
- todo = resamp_do(&s->resamp,
- s->resampbuf, res_out, todo);
+ cmap_copy(&s->cmap, in, (adata_t *)out + offs, vol, *icnt);
}
- return todo;
+ if (s->resampbuf)
+ resamp_do(&s->resamp, s->resampbuf, res_out, icnt, ocnt);
+ else
+ *ocnt = *icnt;
}
-static int
-rec_filt_enc(struct slot *s, void *in, void *out, int todo)
+static void
+rec_filt_enc(struct slot *s, void *in, void *out, int *icnt, int *ocnt)
{
void *tmp;
tmp = s->convbuf;
- todo = rec_filt_resamp(s, in, tmp ? tmp : out, todo);
+ rec_filt_resamp(s, in, tmp ? tmp : out, icnt, ocnt);
if (tmp)
- enc_do(&s->conv, tmp, out, todo);
- return todo;
+ enc_do(&s->conv, tmp, out, *ocnt);
}
/*
@@ -553,17 +551,19 @@ static void
slot_sub_bcopy(struct slot *s, adata_t *idata, int todo)
{
adata_t *odata;
- int ocount;
+ int len, icnt, ocnt;
- odata = (adata_t *)abuf_wgetblk(&s->buf, &ocount);
+ odata = (adata_t *)abuf_wgetblk(&s->buf, &len);
#ifdef DEBUG
- if (ocount < s->round * s->bpf) {
+ if (len < s->round * s->bpf) {
log_puts("slot_sub_bcopy: not enough space\n");
panic();
}
#endif
- ocount = rec_filt_enc(s, idata, odata, todo);
- abuf_wcommit(&s->buf, ocount * s->bpf);
+ icnt = todo;
+ ocnt = len / s->bpf;
+ rec_filt_enc(s, idata, odata, &icnt, &ocnt);
+ abuf_wcommit(&s->buf, ocnt * s->bpf);
}
static int
diff --git a/usr.bin/aucat/dsp.c b/usr.bin/aucat/dsp.c
index 28d40bafe34..169cab1fb77 100644
--- a/usr.bin/aucat/dsp.c
+++ b/usr.bin/aucat/dsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsp.c,v 1.3 2016/01/10 11:06:44 ratchov Exp $ */
+/* $OpenBSD: dsp.c,v 1.4 2016/05/26 06:17:31 ratchov Exp $ */
/*
* Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
*
@@ -270,8 +270,8 @@ aparams_native(struct aparams *par)
/*
* resample the given number of frames
*/
-int
-resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
+void
+resamp_do(struct resamp *p, adata_t *in, adata_t *out, int *icnt, int *ocnt)
{
unsigned int nch;
adata_t *idata;
@@ -298,8 +298,8 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
ctxbuf = p->ctx;
ctx_start = p->ctx_start;
nch = p->nch;
- ifr = todo;
- ofr = oblksz;
+ ifr = *icnt;
+ ofr = *ocnt;
/*
* Start conversion.
@@ -307,9 +307,11 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
#ifdef DEBUG
if (log_level >= 4) {
log_puts("resamp: copying ");
- log_puti(todo);
+ log_puti(ifr);
log_puts(" frames, diff = ");
log_putu(diff);
+ log_puts(", max = ");
+ log_putu(ofr);
log_puts("\n");
}
#endif
@@ -359,7 +361,8 @@ resamp_do(struct resamp *p, adata_t *in, adata_t *out, int todo)
}
p->diff = diff;
p->ctx_start = ctx_start;
- return oblksz - ofr;
+ *icnt -= ifr;
+ *ocnt -= ofr;
}
/*
diff --git a/usr.bin/aucat/dsp.h b/usr.bin/aucat/dsp.h
index 1fc80c2f654..8ffc52da2f4 100644
--- a/usr.bin/aucat/dsp.h
+++ b/usr.bin/aucat/dsp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsp.h,v 1.1 2015/01/21 08:43:55 ratchov Exp $ */
+/* $OpenBSD: dsp.h,v 1.2 2016/05/26 06:17:31 ratchov Exp $ */
/*
* Copyright (c) 2012 Alexandre Ratchov <alex@caoua.org>
*
@@ -147,7 +147,7 @@ int aparams_strtoenc(struct aparams *, char *);
int aparams_enctostr(struct aparams *, char *);
int aparams_native(struct aparams *);
-int resamp_do(struct resamp *, adata_t *, adata_t *, int);
+void resamp_do(struct resamp *, adata_t *, adata_t *, int *, int *);
void resamp_init(struct resamp *, unsigned int, unsigned int, int);
void enc_do(struct conv *, unsigned char *, unsigned char *, int);
void enc_sil_do(struct conv *, unsigned char *, int);
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.