diff options
Diffstat (limited to 'dsp')
| -rw-r--r-- | dsp/defs.h | 29 | ||||
| -rw-r--r-- | dsp/dsp.c | 924 | ||||
| -rw-r--r-- | dsp/dsp.h | 163 |
3 files changed, 0 insertions, 1116 deletions
diff --git a/dsp/defs.h b/dsp/defs.h deleted file mode 100644 index 6cfc877..0000000 --- a/dsp/defs.h +++ /dev/null @@ -1,29 +0,0 @@ -/* $OpenBSD$ */ -/* - * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#ifndef DEFS_H -#define DEFS_H - -/* - * limits - */ -#define NCHAN_MAX 16 /* max channel in a stream */ -#define RATE_MIN 4000 /* min sample rate */ -#define RATE_MAX 192000 /* max sample rate */ -#define BITS_MIN 1 /* min bits per sample */ -#define BITS_MAX 32 /* max bits per sample */ - -#endif /* !defined(DEFS_H) */ diff --git a/dsp/dsp.c b/dsp/dsp.c deleted file mode 100644 index 62510b9..0000000 --- a/dsp/dsp.c +++ /dev/null @@ -1,924 +0,0 @@ -/* $OpenBSD$ */ -/* - * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#include <string.h> -#include "dsp.h" -#include "utils.h" - -int aparams_ctltovol[128] = { - 0, - 256, 266, 276, 287, 299, 310, 323, 335, - 348, 362, 376, 391, 406, 422, 439, 456, - 474, 493, 512, 532, 553, 575, 597, 621, - 645, 670, 697, 724, 753, 782, 813, 845, - 878, 912, 948, 985, 1024, 1064, 1106, 1149, - 1195, 1241, 1290, 1341, 1393, 1448, 1505, 1564, - 1625, 1689, 1756, 1825, 1896, 1971, 2048, 2128, - 2212, 2299, 2389, 2483, 2580, 2682, 2787, 2896, - 3010, 3128, 3251, 3379, 3511, 3649, 3792, 3941, - 4096, 4257, 4424, 4598, 4778, 4966, 5161, 5363, - 5574, 5793, 6020, 6256, 6502, 6757, 7023, 7298, - 7585, 7883, 8192, 8514, 8848, 9195, 9556, 9931, - 10321, 10726, 11148, 11585, 12040, 12513, 13004, 13515, - 14045, 14596, 15170, 15765, 16384, 17027, 17696, 18390, - 19112, 19863, 20643, 21453, 22295, 23170, 24080, 25025, - 26008, 27029, 28090, 29193, 30339, 31530, 32768 -}; - -short dec_ulawmap[256] = { - -32124, -31100, -30076, -29052, -28028, -27004, -25980, -24956, - -23932, -22908, -21884, -20860, -19836, -18812, -17788, -16764, - -15996, -15484, -14972, -14460, -13948, -13436, -12924, -12412, - -11900, -11388, -10876, -10364, -9852, -9340, -8828, -8316, - -7932, -7676, -7420, -7164, -6908, -6652, -6396, -6140, - -5884, -5628, -5372, -5116, -4860, -4604, -4348, -4092, - -3900, -3772, -3644, -3516, -3388, -3260, -3132, -3004, - -2876, -2748, -2620, -2492, -2364, -2236, -2108, -1980, - -1884, -1820, -1756, -1692, -1628, -1564, -1500, -1436, - -1372, -1308, -1244, -1180, -1116, -1052, -988, -924, - -876, -844, -812, -780, -748, -716, -684, -652, - -620, -588, -556, -524, -492, -460, -428, -396, - -372, -356, -340, -324, -308, -292, -276, -260, - -244, -228, -212, -196, -180, -164, -148, -132, - -120, -112, -104, -96, -88, -80, -72, -64, - -56, -48, -40, -32, -24, -16, -8, 0, - 32124, 31100, 30076, 29052, 28028, 27004, 25980, 24956, - 23932, 22908, 21884, 20860, 19836, 18812, 17788, 16764, - 15996, 15484, 14972, 14460, 13948, 13436, 12924, 12412, - 11900, 11388, 10876, 10364, 9852, 9340, 8828, 8316, - 7932, 7676, 7420, 7164, 6908, 6652, 6396, 6140, - 5884, 5628, 5372, 5116, 4860, 4604, 4348, 4092, - 3900, 3772, 3644, 3516, 3388, 3260, 3132, 3004, - 2876, 2748, 2620, 2492, 2364, 2236, 2108, 1980, - 1884, 1820, 1756, 1692, 1628, 1564, 1500, 1436, - 1372, 1308, 1244, 1180, 1116, 1052, 988, 924, - 876, 844, 812, 780, 748, 716, 684, 652, - 620, 588, 556, 524, 492, 460, 428, 396, - 372, 356, 340, 324, 308, 292, 276, 260, - 244, 228, 212, 196, 180, 164, 148, 132, - 120, 112, 104, 96, 88, 80, 72, 64, - 56, 48, 40, 32, 24, 16, 8, 0 -}; - -short dec_alawmap[256] = { - -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736, - -7552, -7296, -8064, -7808, -6528, -6272, -7040, -6784, - -2752, -2624, -3008, -2880, -2240, -2112, -2496, -2368, - -3776, -3648, -4032, -3904, -3264, -3136, -3520, -3392, - -22016, -20992, -24064, -23040, -17920, -16896, -19968, -18944, - -30208, -29184, -32256, -31232, -26112, -25088, -28160, -27136, - -11008, -10496, -12032, -11520, -8960, -8448, -9984, -9472, - -15104, -14592, -16128, -15616, -13056, -12544, -14080, -13568, - -344, -328, -376, -360, -280, -264, -312, -296, - -472, -456, -504, -488, -408, -392, -440, -424, - -88, -72, -120, -104, -24, -8, -56, -40, - -216, -200, -248, -232, -152, -136, -184, -168, - -1376, -1312, -1504, -1440, -1120, -1056, -1248, -1184, - -1888, -1824, -2016, -1952, -1632, -1568, -1760, -1696, - -688, -656, -752, -720, -560, -528, -624, -592, - -944, -912, -1008, -976, -816, -784, -880, -848, - 5504, 5248, 6016, 5760, 4480, 4224, 4992, 4736, - 7552, 7296, 8064, 7808, 6528, 6272, 7040, 6784, - 2752, 2624, 3008, 2880, 2240, 2112, 2496, 2368, - 3776, 3648, 4032, 3904, 3264, 3136, 3520, 3392, - 22016, 20992, 24064, 23040, 17920, 16896, 19968, 18944, - 30208, 29184, 32256, 31232, 26112, 25088, 28160, 27136, - 11008, 10496, 12032, 11520, 8960, 8448, 9984, 9472, - 15104, 14592, 16128, 15616, 13056, 12544, 14080, 13568, - 344, 328, 376, 360, 280, 264, 312, 296, - 472, 456, 504, 488, 408, 392, 440, 424, - 88, 72, 120, 104, 24, 8, 56, 40, - 216, 200, 248, 232, 152, 136, 184, 168, - 1376, 1312, 1504, 1440, 1120, 1056, 1248, 1184, - 1888, 1824, 2016, 1952, 1632, 1568, 1760, 1696, - 688, 656, 752, 720, 560, 528, 624, 592, - 944, 912, 1008, 976, 816, 784, 880, 848 -}; - -/* - * Generate a string corresponding to the encoding in par, - * return the length of the resulting string. - */ -int -aparams_enctostr(struct aparams *par, char *ostr) -{ - char *p = ostr; - - *p++ = par->sig ? 's' : 'u'; - if (par->bits > 9) - *p++ = '0' + par->bits / 10; - *p++ = '0' + par->bits % 10; - if (par->bps > 1) { - *p++ = par->le ? 'l' : 'b'; - *p++ = 'e'; - if (par->bps != APARAMS_BPS(par->bits) || - par->bits < par->bps * 8) { - *p++ = par->bps + '0'; - if (par->bits < par->bps * 8) { - *p++ = par->msb ? 'm' : 'l'; - *p++ = 's'; - *p++ = 'b'; - } - } - } - *p++ = '\0'; - return p - ostr - 1; -} - -/* - * Parse an encoding string, examples: s8, u8, s16, s16le, s24be ... - * set *istr to the char following the encoding. Return the number - * of bytes consumed. - */ -int -aparams_strtoenc(struct aparams *par, char *istr) -{ - char *p = istr; - int i, sig, bits, le, bps, msb; - -#define IS_SEP(c) \ - (((c) < 'a' || (c) > 'z') && \ - ((c) < 'A' || (c) > 'Z') && \ - ((c) < '0' || (c) > '9')) - - /* - * get signedness - */ - if (*p == 's') { - sig = 1; - } else if (*p == 'u') { - sig = 0; - } else - return 0; - p++; - - /* - * get number of bits per sample - */ - bits = 0; - for (i = 0; i < 2; i++) { - if (*p < '0' || *p > '9') - break; - bits = (bits * 10) + *p - '0'; - p++; - } - if (bits < BITS_MIN || bits > BITS_MAX) - return 0; - bps = APARAMS_BPS(bits); - msb = 1; - le = ADATA_LE; - - /* - * get (optional) endianness - */ - if (p[0] == 'l' && p[1] == 'e') { - le = 1; - p += 2; - } else if (p[0] == 'b' && p[1] == 'e') { - le = 0; - p += 2; - } else if (IS_SEP(*p)) { - goto done; - } else - return 0; - - /* - * get (optional) number of bytes - */ - if (*p >= '0' && *p <= '9') { - bps = *p - '0'; - if (bps < (bits + 7) / 8 || - bps > (BITS_MAX + 7) / 8) - return 0; - p++; - - /* - * get (optional) alignment - */ - if (p[0] == 'm' && p[1] == 's' && p[2] == 'b') { - msb = 1; - p += 3; - } else if (p[0] == 'l' && p[1] == 's' && p[2] == 'b') { - msb = 0; - p += 3; - } else if (IS_SEP(*p)) { - goto done; - } else - return 0; - } else if (!IS_SEP(*p)) - return 0; - -done: - par->msb = msb; - par->sig = sig; - par->bits = bits; - par->bps = bps; - par->le = le; - return p - istr; -} - -/* - * Initialise parameters structure with the defaults natively supported - * by the machine. - */ -void -aparams_init(struct aparams *par) -{ - par->bps = sizeof(adata_t); - par->bits = ADATA_BITS; - par->le = ADATA_LE; - par->sig = 1; - par->msb = 0; -} - -/* - * log the given format/channels/encoding - */ -void -aparams_log(struct aparams *par) -{ -#if DEBUG - char enc[ENCMAX]; - - aparams_enctostr(par, enc); - log_puts(enc); -#endif -} - -/* - * return true if encoding corresponds to what we store in adata_t - */ -int -aparams_native(struct aparams *par) -{ - return par->bps == sizeof(adata_t) && par->bits == ADATA_BITS && - (par->bps == 1 || par->le == ADATA_LE) && - (par->bits == par->bps * 8 || !par->msb); -} - -/* - * Return the number of input and output frame that would be consumed - * by resamp_do(p, *icnt, *ocnt). - */ -void -resamp_getcnt(struct resamp *p, int *icnt, int *ocnt) -{ - long long idiff, odiff; - int cdiff; - - cdiff = p->oblksz - p->diff; - idiff = (long long)*icnt * p->oblksz; - odiff = (long long)*ocnt * p->iblksz; - if (odiff - idiff >= cdiff) - *ocnt = (idiff + cdiff + p->iblksz - 1) / p->iblksz; - else - *icnt = (odiff + p->diff) / p->oblksz; -} - -/* - * Resample the given number of frames. The number of output frames - * must match the coresponding number of input frames. Either always - * use icnt and ocnt such that: - * - * icnt * oblksz = ocnt * iblksz - * - * or use resamp_getcnt() to calculate the proper numbers. - */ -void -resamp_do(struct resamp *p, adata_t *in, adata_t *out, int icnt, int ocnt) -{ - unsigned int nch; - adata_t *idata; - unsigned int oblksz; - unsigned int ifr; - int s, ds, diff; - adata_t *odata; - unsigned int iblksz; - unsigned int ofr; - unsigned int c; - adata_t *ctxbuf, *ctx; - unsigned int ctx_start; - - /* - * Partially copy structures into local variables, to avoid - * unnecessary indirections; this also allows the compiler to - * order local variables more "cache-friendly". - */ - idata = in; - odata = out; - diff = p->diff; - iblksz = p->iblksz; - oblksz = p->oblksz; - ctxbuf = p->ctx; - ctx_start = p->ctx_start; - nch = p->nch; - ifr = icnt; - ofr = ocnt; - - /* - * Start conversion. - */ -#ifdef DEBUG - if (log_level >= 4) { - log_puts("resamp: copying "); - log_puti(ifr); - log_puts(" -> "); - log_putu(ofr); - log_puts(" frames, diff = "); - log_puti(diff); - log_puts("\n"); - } -#endif - for (;;) { - if (diff >= (int)oblksz) { - if (ifr == 0) - break; - ctx_start ^= 1; - ctx = ctxbuf + ctx_start; - for (c = nch; c > 0; c--) { - *ctx = *idata++; - ctx += RESAMP_NCTX; - } - diff -= oblksz; - ifr--; - } else { - if (ofr == 0) - break; - ctx = ctxbuf; - for (c = nch; c > 0; c--) { - s = ctx[ctx_start ^ 1]; - ds = ctx[ctx_start] - s; - ctx += RESAMP_NCTX; - *odata++ = s + ADATA_MULDIV(ds, diff, oblksz); - } - diff += iblksz; - ofr--; - } - } - p->diff = diff; - p->ctx_start = ctx_start; -#ifdef DEBUG - if (ifr != 0) { - log_puts("resamp_do: "); - log_puti(ifr); - log_puts(": too many input frames\n"); - panic(); - } - if (ofr != 0) { - log_puts("resamp_do: "); - log_puti(ofr); - log_puts(": too many output frames\n"); - panic(); - } -#endif -} - -static unsigned int -uint_gcd(unsigned int a, unsigned int b) -{ - unsigned int r; - - while (b > 0) { - r = a % b; - a = b; - b = r; - } - return a; -} - -/* - * initialize resampler with ibufsz/obufsz factor and "nch" channels - */ -void -resamp_init(struct resamp *p, unsigned int iblksz, - unsigned int oblksz, int nch) -{ - unsigned int g; - - /* - * reduce iblksz/oblksz fraction - */ - g = uint_gcd(iblksz, oblksz); - iblksz /= g; - oblksz /= g; - - /* - * ensure weird rates don't cause integer overflow - */ - while (iblksz > ADATA_UNIT || oblksz > ADATA_UNIT) { - iblksz >>= 1; - oblksz >>= 1; - } - - p->iblksz = iblksz; - p->oblksz = oblksz; - p->diff = 0; - p->nch = nch; - p->ctx_start = 0; - memset(p->ctx, 0, sizeof(p->ctx)); -#ifdef DEBUG - if (log_level >= 3) { - log_puts("resamp: "); - log_putu(iblksz); - log_puts("/"); - log_putu(oblksz); - log_puts("\n"); - } -#endif -} - -/* - * encode "todo" frames from native to foreign encoding - */ -void -enc_do(struct conv *p, unsigned char *in, unsigned char *out, int todo) -{ - unsigned int f; - adata_t *idata; - unsigned int s; - unsigned int oshift; - unsigned int obias; - unsigned int obps; - unsigned int i; - unsigned char *odata; - int obnext; - int osnext; - -#ifdef DEBUG - if (log_level >= 4) { - log_puts("enc: copying "); - log_putu(todo); - log_puts(" frames\n"); - } -#endif - /* - * Partially copy structures into local variables, to avoid - * unnecessary indirections; this also allows the compiler to - * order local variables more "cache-friendly". - */ - idata = (adata_t *)in; - odata = out; - oshift = p->shift; - obias = p->bias; - obps = p->bps; - obnext = p->bnext; - osnext = p->snext; - - /* - * Start conversion. - */ - odata += p->bfirst; - for (f = todo * p->nch; f > 0; f--) { - /* convert adata to u32 */ - s = (int)*idata++ + ADATA_UNIT; - s <<= 32 - ADATA_BITS; - /* convert u32 to uN */ - s >>= oshift; - /* convert uN to sN */ - s -= obias; - /* packetize sN */ - for (i = obps; i > 0; i--) { - *odata = (unsigned char)s; - s >>= 8; - odata += obnext; - } - odata += osnext; - } -} - -/* - * store "todo" frames of silence in foreign encoding - */ -void -enc_sil_do(struct conv *p, unsigned char *out, int todo) -{ - unsigned int f; - unsigned int s; - unsigned int oshift; - int obias; - unsigned int obps; - unsigned int i; - unsigned char *odata; - int obnext; - int osnext; - -#ifdef DEBUG - if (log_level >= 4) { - log_puts("enc: silence "); - log_putu(todo); - log_puts(" frames\n"); - } -#endif - /* - * Partially copy structures into local variables, to avoid - * unnecessary indirections; this also allows the compiler to - * order local variables more "cache-friendly". - */ - odata = out; - oshift = p->shift; - obias = p->bias; - obps = p->bps; - obnext = p->bnext; - osnext = p->snext; - - /* - * Start conversion. - */ - odata += p->bfirst; - for (f = todo * p->nch; f > 0; f--) { - s = ((1U << 31) >> oshift) - obias; - for (i = obps; i > 0; i--) { - *odata = (unsigned char)s; - s >>= 8; - odata += obnext; - } - odata += osnext; - } -} - -/* - * initialize encoder from native to foreign encoding - */ -void -enc_init(struct conv *p, struct aparams *par, int nch) -{ - p->nch = nch; - p->bps = par->bps; - if (par->msb) { - p->shift = 32 - par->bps * 8; - } else { - p->shift = 32 - par->bits; - } - if (par->sig) { - p->bias = (1U << 31) >> p->shift; - } else { - p->bias = 0; - } - if (!par->le) { - p->bfirst = par->bps - 1; - p->bnext = -1; - p->snext = 2 * par->bps; - } else { - p->bfirst = 0; - p->bnext = 1; - p->snext = 0; - } -#ifdef DEBUG - if (log_level >= 3) { - log_puts("enc: "); - aparams_log(par); - log_puts(", "); - log_puti(p->nch); - log_puts(" channels\n"); - } -#endif -} - -/* - * decode "todo" frames from foreign to native encoding - */ -void -dec_do(struct conv *p, unsigned char *in, unsigned char *out, int todo) -{ - unsigned int f; - unsigned int ibps; - unsigned int i; - unsigned int s = 0xdeadbeef; - unsigned char *idata; - int ibnext; - int isnext; - unsigned int ibias; - unsigned int ishift; - adata_t *odata; - -#ifdef DEBUG - if (log_level >= 4) { - log_puts("dec: copying "); - log_putu(todo); - log_puts(" frames\n"); - } -#endif - /* - * Partially copy structures into local variables, to avoid - * unnecessary indirections; this also allows the compiler to - * order local variables more "cache-friendly". - */ - idata = in; - odata = (adata_t *)out; - ibps = p->bps; - ibnext = p->bnext; - ibias = p->bias; - ishift = p->shift; - isnext = p->snext; - - /* - * Start conversion. - */ - idata += p->bfirst; - for (f = todo * p->nch; f > 0; f--) { - for (i = ibps; i > 0; i--) { - s <<= 8; - s |= *idata; - idata += ibnext; - } - idata += isnext; - s += ibias; - s <<= ishift; - s >>= 32 - ADATA_BITS; - *odata++ = s - ADATA_UNIT; - } -} - -/* - * convert a 32-bit float to adata_t, clipping to -1:1, boundaries - * excluded - */ -static inline int -f32_to_adata(unsigned int x) -{ - unsigned int s, e, m, y; - - s = (x >> 31); - e = (x >> 23) & 0xff; - m = (x << 8) | 0x80000000; - - /* - * f32 exponent is (e - 127) and the point is after the 31-th - * bit, thus the shift is: - * - * 31 - (BITS - 1) - (e - 127) - * - * to ensure output is in the 0..(2^BITS)-1 range, the minimum - * shift is 31 - (BITS - 1), and maximum shift is 31 - */ - if (e < 127 - (ADATA_BITS - 1)) - y = 0; - else if (e > 127) - y = ADATA_UNIT - 1; - else - y = m >> (127 + (32 - ADATA_BITS) - e); - return (y ^ -s) + s; -} - -/* - * convert samples from little endian ieee 754 floats to adata_t - */ -void -dec_do_float(struct conv *p, unsigned char *in, unsigned char *out, int todo) -{ - unsigned int f; - unsigned int i; - unsigned int s = 0xdeadbeef; - unsigned char *idata; - int ibnext; - int isnext; - adata_t *odata; - -#ifdef DEBUG - if (log_level >= 4) { - log_puts("dec_float: copying "); - log_putu(todo); - log_puts(" frames\n"); - } -#endif - /* - * Partially copy structures into local variables, to avoid - * unnecessary indirections; this also allows the compiler to - * order local variables more "cache-friendly". - */ - idata = in; - odata = (adata_t *)out; - ibnext = p->bnext; - isnext = p->snext; - - /* - * Start conversion. - */ - idata += p->bfirst; - for (f = todo * p->nch; f > 0; f--) { - for (i = 4; i > 0; i--) { - s <<= 8; - s |= *idata; - idata += ibnext; - } - idata += isnext; - *odata++ = f32_to_adata(s); - } -} - -/* - * convert samples from ulaw/alaw to adata_t - */ -void -dec_do_ulaw(struct conv *p, unsigned char *in, - unsigned char *out, int todo, int is_alaw) -{ - unsigned int f; - unsigned char *idata; - adata_t *odata; - short *map; - -#ifdef DEBUG - if (log_level >= 4) { - log_puts("dec_ulaw: copying "); - log_putu(todo); - log_puts(" frames\n"); - } -#endif - map = is_alaw ? dec_alawmap : dec_ulawmap; - idata = in; - odata = (adata_t *)out; - for (f = todo * p->nch; f > 0; f--) - *odata++ = map[*idata++] << (ADATA_BITS - 16); -} - -/* - * initialize decoder from foreign to native encoding - */ -void -dec_init(struct conv *p, struct aparams *par, int nch) -{ - p->bps = par->bps; - p->nch = nch; - if (par->msb) { - p->shift = 32 - par->bps * 8; - } else { - p->shift = 32 - par->bits; - } - if (par->sig) { - p->bias = (1U << 31) >> p->shift; - } else { - p->bias = 0; - } - if (par->le) { - p->bfirst = par->bps - 1; - p->bnext = -1; - p->snext = 2 * par->bps; - } else { - p->bfirst = 0; - p->bnext = 1; - p->snext = 0; - } -#ifdef DEBUG - if (log_level >= 3) { - log_puts("dec: "); - aparams_log(par); - log_puts(", "); - log_puti(p->nch); - log_puts(" channels\n"); - } -#endif -} - -/* - * mix "todo" input frames on the output with the given volume - */ -void -cmap_add(struct cmap *p, void *in, void *out, int vol, int todo) -{ - adata_t *idata, *odata; - int i, j, nch, istart, inext, onext, ostart, y, v; - -#ifdef DEBUG - if (log_level >= 4) { - log_puts("cmap: adding "); - log_puti(todo); - log_puts(" frames\n"); - } -#endif - idata = in; - odata = out; - ostart = p->ostart; - onext = p->onext; - istart = p->istart; - inext = p->inext; - nch = p->nch; - v = vol; - - /* - * map/mix input on the output - */ - for (i = todo; i > 0; i--) { - odata += ostart; - idata += istart; - for (j = nch; j > 0; j--) { - y = *odata + ADATA_MUL(*idata, v); - if (y >= ADATA_UNIT) - y = ADATA_UNIT - 1; - else if (y < -ADATA_UNIT) - y = -ADATA_UNIT; - *odata = y; - idata++; - odata++; - } - odata += onext; - idata += inext; - } -} - -/* - * overwrite output with "todo" input frames with the given volume - */ -void -cmap_copy(struct cmap *p, void *in, void *out, int vol, int todo) -{ - adata_t *idata, *odata; - int i, j, nch, istart, inext, onext, ostart, v; - -#ifdef DEBUG - if (log_level >= 4) { - log_puts("cmap: copying "); - log_puti(todo); - log_puts(" frames\n"); - } -#endif - idata = in; - odata = out; - ostart = p->ostart; - onext = p->onext; - istart = p->istart; - inext = p->inext; - nch = p->nch; - v = vol; - - /* - * copy to the output buffer - */ - for (i = todo; i > 0; i--) { - idata += istart; - odata += ostart; - for (j = nch; j > 0; j--) { - *odata = ADATA_MUL(*idata, v); - odata++; - idata++; - } - odata += onext; - idata += inext; - } -} - -/* - * initialize channel mapper, to map a subset of input channel range - * into a subset of the output channel range - */ -void -cmap_init(struct cmap *p, - int imin, int imax, int isubmin, int isubmax, - int omin, int omax, int osubmin, int osubmax) -{ - int cmin, cmax; - - cmin = -NCHAN_MAX; - if (osubmin > cmin) - cmin = osubmin; - if (omin > cmin) - cmin = omin; - if (isubmin > cmin) - cmin = isubmin; - if (imin > cmin) - cmin = imin; - - cmax = NCHAN_MAX; - if (osubmax < cmax) - cmax = osubmax; - if (omax < cmax) - cmax = omax; - if (isubmax < cmax) - cmax = isubmax; - if (imax < cmax) - cmax = imax; - - p->ostart = cmin - omin; - p->onext = omax - cmax; - p->istart = cmin - imin; - p->inext = imax - cmax; - p->nch = cmax - cmin + 1; -#ifdef DEBUG - if (log_level >= 3) { - log_puts("cmap: nch = "); - log_puti(p->nch); - log_puts(", ostart = "); - log_puti(p->ostart); - log_puts(", onext = "); - log_puti(p->onext); - log_puts(", istart = "); - log_puti(p->istart); - log_puts(", inext = "); - log_puti(p->inext); - log_puts("\n"); - } -#endif -} diff --git a/dsp/dsp.h b/dsp/dsp.h deleted file mode 100644 index d057d37..0000000 --- a/dsp/dsp.h +++ /dev/null @@ -1,163 +0,0 @@ -/* $OpenBSD$ */ -/* - * Copyright (c) 2012 Alexandre Ratchov <alex@caoua.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#ifndef DSP_H -#define DSP_H - -#include <sys/types.h> -#include "defs.h" - -/* - * Samples are numbers in the interval [-1, 1[, note that 1, the upper - * boundary is excluded. We represent them as signed fixed point numbers - * of ADATA_BITS. We also assume that 2^(ADATA_BITS - 1) fits in a int. - */ -#ifndef ADATA_BITS -#define ADATA_BITS 16 -#endif -#define ADATA_LE (BYTE_ORDER == LITTLE_ENDIAN) -#define ADATA_UNIT (1 << (ADATA_BITS - 1)) - -#if ADATA_BITS == 16 - -#define ADATA_MUL(x,y) (((int)(x) * (int)(y)) >> (ADATA_BITS - 1)) -#define ADATA_MULDIV(x,y,z) ((int)(x) * (int)(y) / (int)(z)) - -typedef short adata_t; - -#elif ADATA_BITS == 24 - -#if defined(__i386__) && defined(__GNUC__) - -static inline int -fp24_mul(int x, int a) -{ - int res; - - asm volatile ( - "imull %2\n\t" - "shrdl $23, %%edx, %%eax\n\t" - : "=a" (res) - : "a" (x), "r" (a) - : "%edx" - ); - return res; -} - -static inline int -fp24_muldiv(int x, int a, int b) -{ - int res; - - asm volatile ( - "imull %2\n\t" - "idivl %3\n\t" - : "=a" (res) - : "a" (x), "d" (a), "r" (b) - ); - return res; -} - -#define ADATA_MUL(x,y) fp24_mul(x, y) -#define ADATA_MULDIV(x,y,z) fp24_muldiv(x, y, z); - -#elif defined(__amd64__) || defined(__sparc64__) - -#define ADATA_MUL(x,y) \ - ((int)(((long long)(x) * (long long)(y)) >> (ADATA_BITS - 1))) -#define ADATA_MULDIV(x,y,z) \ - ((int)((long long)(x) * (long long)(y) / (long long)(z))) - -#else -#error "no 24-bit code for this architecture" -#endif - -typedef int adata_t; - -#else -#error "only 16-bit and 24-bit precisions are supported" -#endif - -/* - * Maximum size of the encording string (the longest possible - * encoding is ``s24le3msb''). - */ -#define ENCMAX 10 - -/* - * Default bytes per sample for the given bits per sample. - */ -#define APARAMS_BPS(bits) (((bits) <= 8) ? 1 : (((bits) <= 16) ? 2 : 4)) - -struct aparams { - unsigned int bps; /* bytes per sample */ - unsigned int bits; /* actually used bits */ - unsigned int le; /* 1 if little endian, 0 if big endian */ - unsigned int sig; /* 1 if signed, 0 if unsigned */ - unsigned int msb; /* 1 if msb justified, 0 if lsb justified */ -}; - -struct resamp { -#define RESAMP_NCTX 2 - unsigned int ctx_start; - adata_t ctx[NCHAN_MAX * RESAMP_NCTX]; - unsigned int iblksz, oblksz; - int diff; - int nch; -}; - -struct conv { - int bfirst; /* bytes to skip at startup */ - unsigned int bps; /* bytes per sample */ - unsigned int shift; /* shift to get 32bit MSB */ - unsigned int bias; /* bias of unsigned samples */ - int bnext; /* to reach the next byte */ - int snext; /* to reach the next sample */ - int nch; -}; - -struct cmap { - int istart; - int inext; - int onext; - int ostart; - int nch; -}; - -#define MIDI_TO_ADATA(m) (aparams_ctltovol[m] << (ADATA_BITS - 16)) -extern int aparams_ctltovol[128]; - -void aparams_init(struct aparams *); -void aparams_log(struct aparams *); -int aparams_strtoenc(struct aparams *, char *); -int aparams_enctostr(struct aparams *, char *); -int aparams_native(struct aparams *); - -void resamp_getcnt(struct resamp *, int *, 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); -void enc_init(struct conv *, struct aparams *, int); -void dec_do(struct conv *, unsigned char *, unsigned char *, int); -void dec_do_float(struct conv *, unsigned char *, unsigned char *, int); -void dec_do_ulaw(struct conv *, unsigned char *, unsigned char *, int, int); -void dec_init(struct conv *, struct aparams *, int); -void cmap_add(struct cmap *, void *, void *, int, int); -void cmap_copy(struct cmap *, void *, void *, int, int); -void cmap_init(struct cmap *, int, int, int, int, int, int, int, int); - -#endif /* !defined(DSP_H) */ |