diff options
Diffstat (limited to 'codecs/lpc10')
| -rwxr-xr-x | codecs/lpc10/analys.c | 44 | ||||
| -rwxr-xr-x | codecs/lpc10/decode.c | 32 | ||||
| -rwxr-xr-x | codecs/lpc10/ivfilt.c | 16 | ||||
| -rwxr-xr-x | codecs/lpc10/placea.c | 16 |
4 files changed, 73 insertions, 35 deletions
diff --git a/codecs/lpc10/analys.c b/codecs/lpc10/analys.c index c9d078a85..3ebaed7bb 100755 --- a/codecs/lpc10/analys.c +++ b/codecs/lpc10/analys.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.14 2003/02/12 13:59:14 matteo -mer feb 12 14:56:57 CET 2003 +Revision 1.15 2003/09/19 01:20:22 markster +Code cleanups (bug #66) + +Revision 1.2 2003/09/19 01:20:22 markster +Code cleanups (bug #66) Revision 1.1.1.1 2003/02/12 13:59:14 matteo mer feb 12 14:56:57 CET 2003 @@ -82,9 +85,12 @@ static integer c__1 = 1; /* ANALYS Version 55 */ /* $Log$ - * Revision 1.14 2003/02/12 13:59:14 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/09/19 01:20:22 markster + * Code cleanups (bug #66) * +/* Revision 1.2 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* mer feb 12 14:56:57 CET 2003 /* @@ -228,9 +234,11 @@ static integer c__1 = 1; extern /* Subroutine */ int onset_(real *, integer *, integer *, integer * , integer *, integer *, integer *, struct lpc10_encoder_state *); integer *osptr; - extern /* Subroutine */ placea_(integer *, integer * + extern /* Subroutine */ void placea_(integer *, integer * , integer *, integer *, integer *, integer *, integer *, integer * - , integer *), dcbias_(integer *, real *, real *), placev_(integer + , integer *); + extern void dcbias_(integer *, real *, real *); + extern void placev_(integer *, integer *, integer *, integer *, integer *, integer *, integer *, integer *, integer *, integer *, integer *); integer ipitch; @@ -252,9 +260,12 @@ static integer c__1 = 1; real phi[100] /* was [10][10] */, psi[10]; /* $Log$ - * Revision 1.14 2003/02/12 13:59:14 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/09/19 01:20:22 markster + * Code cleanups (bug #66) * +/* Revision 1.2 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* mer feb 12 14:56:57 CET 2003 /* @@ -286,9 +297,12 @@ static integer c__1 = 1; /* Frame size, Prediction order, Pitch period */ /* Arguments to ANALYS */ /* $Log$ - * Revision 1.14 2003/02/12 13:59:14 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/09/19 01:20:22 markster + * Code cleanups (bug #66) * +/* Revision 1.2 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* mer feb 12 14:56:57 CET 2003 /* @@ -488,10 +502,10 @@ static integer c__1 = 1; voibuf[0] = voibuf[2]; voibuf[1] = voibuf[3]; for (i__ = 1; i__ <= 2; ++i__) { - vwin[(i__ << 1) - 2] = vwin[(i__ + 1 << 1) - 2] - contrl_1.lframe; - vwin[(i__ << 1) - 1] = vwin[(i__ + 1 << 1) - 1] - contrl_1.lframe; - awin[(i__ << 1) - 2] = awin[(i__ + 1 << 1) - 2] - contrl_1.lframe; - awin[(i__ << 1) - 1] = awin[(i__ + 1 << 1) - 1] - contrl_1.lframe; + vwin[(i__ << 1) - 2] = vwin[((i__ + 1) << 1) - 2] - contrl_1.lframe; + vwin[(i__ << 1) - 1] = vwin[((i__ + 1) << 1) - 1] - contrl_1.lframe; + awin[(i__ << 1) - 2] = awin[((i__ + 1) << 1) - 2] - contrl_1.lframe; + awin[(i__ << 1) - 1] = awin[((i__ + 1) << 1) - 1] - contrl_1.lframe; /* EWIN(*,J) is unused for J .NE. AF, so the following shift is */ /* unnecessary. It also causes error messages when the C versio @@ -504,7 +518,7 @@ n */ /* EWIN(2,I) = EWIN(2,I+1) - LFRAME */ obound[i__ - 1] = obound[i__]; voibuf[i__ * 2] = voibuf[(i__ + 1) * 2]; - voibuf[(i__ << 1) + 1] = voibuf[(i__ + 1 << 1) + 1]; + voibuf[(i__ << 1) + 1] = voibuf[((i__ + 1) << 1) + 1]; rmsbuf[i__ - 1] = rmsbuf[i__]; i__1 = contrl_1.order; for (j = 1; j <= i__1; ++j) { diff --git a/codecs/lpc10/decode.c b/codecs/lpc10/decode.c index 3e7b5747a..6d129b360 100755 --- a/codecs/lpc10/decode.c +++ b/codecs/lpc10/decode.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.14 2003/02/12 13:59:14 matteo -mer feb 12 14:56:57 CET 2003 +Revision 1.15 2003/09/19 01:20:22 markster +Code cleanups (bug #66) + +Revision 1.2 2003/09/19 01:20:22 markster +Code cleanups (bug #66) Revision 1.1.1.1 2003/02/12 13:59:14 matteo mer feb 12 14:56:57 CET 2003 @@ -56,9 +59,12 @@ static integer c__2 = 2; /* DECODE Version 54 */ /* $Log$ - * Revision 1.14 2003/02/12 13:59:14 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/09/19 01:20:22 markster + * Code cleanups (bug #66) * +/* Revision 1.2 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* mer feb 12 14:56:57 CET 2003 /* @@ -194,9 +200,12 @@ static integer c__2 = 2; integer ishift, errcnt, lsb; /* $Log$ - * Revision 1.14 2003/02/12 13:59:14 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/09/19 01:20:22 markster + * Code cleanups (bug #66) * +/* Revision 1.2 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* mer feb 12 14:56:57 CET 2003 /* @@ -228,9 +237,12 @@ static integer c__2 = 2; /* Frame size, Prediction order, Pitch period */ /* Arguments */ /* $Log$ - * Revision 1.14 2003/02/12 13:59:14 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/09/19 01:20:22 markster + * Code cleanups (bug #66) * +/* Revision 1.2 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.1.1.1 2003/02/12 13:59:14 matteo /* mer feb 12 14:56:57 CET 2003 /* @@ -518,9 +530,9 @@ static integer c__2 = 2; } for (i__ = 1; i__ <= 6; ++i__) { if ((i__1 = drc[i__ * 3 - 2] - drc[i__ * 3 - 3], (real) abs(i__1)) - >= corth[ixcor + (i__ + 2 << 2) - 5] && (i__2 = drc[i__ * + >= corth[ixcor + ((i__ + 2) << 2) - 5] && (i__2 = drc[i__ * 3 - 2] - drc[i__ * 3 - 1], (real) abs(i__2)) >= corth[ - ixcor + (i__ + 2 << 2) - 5]) { + ixcor + ((i__ + 2) << 2) - 5]) { irc[i__] = median_(&drc[i__ * 3 - 1], &drc[i__ * 3 - 2], &drc[ i__ * 3 - 3]); } diff --git a/codecs/lpc10/ivfilt.c b/codecs/lpc10/ivfilt.c index 98184e4f0..fc8adcc29 100755 --- a/codecs/lpc10/ivfilt.c +++ b/codecs/lpc10/ivfilt.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.14 2003/02/12 13:59:15 matteo -mer feb 12 14:56:57 CET 2003 +Revision 1.15 2003/09/19 01:20:22 markster +Code cleanups (bug #66) + +Revision 1.2 2003/09/19 01:20:22 markster +Code cleanups (bug #66) Revision 1.1.1.1 2003/02/12 13:59:15 matteo mer feb 12 14:56:57 CET 2003 @@ -32,9 +35,12 @@ extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real /* IVFILT Version 48 */ /* $Log$ - * Revision 1.14 2003/02/12 13:59:15 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/09/19 01:20:22 markster + * Code cleanups (bug #66) * +/* Revision 1.2 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.1.1.1 2003/02/12 13:59:15 matteo /* mer feb 12 14:56:57 CET 2003 /* @@ -97,7 +103,7 @@ extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real /* Function Body */ for (i__ = 1; i__ <= 3; ++i__) { r__[i__ - 1] = 0.f; - k = i__ - 1 << 2; + k = (i__ - 1) << 2; i__1 = *len; for (j = (i__ << 2) + *len - *nsamp; j <= i__1; j += 2) { r__[i__ - 1] += lpbuf[j] * lpbuf[j - k]; diff --git a/codecs/lpc10/placea.c b/codecs/lpc10/placea.c index 7e705e7f1..3408f29a6 100755 --- a/codecs/lpc10/placea.c +++ b/codecs/lpc10/placea.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.14 2003/02/12 13:59:15 matteo -mer feb 12 14:56:57 CET 2003 +Revision 1.15 2003/09/19 01:20:22 markster +Code cleanups (bug #66) + +Revision 1.2 2003/09/19 01:20:22 markster +Code cleanups (bug #66) Revision 1.1.1.1 2003/02/12 13:59:15 matteo mer feb 12 14:56:57 CET 2003 @@ -35,9 +38,12 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a /* PLACEA Version 48 */ /* $Log$ - * Revision 1.14 2003/02/12 13:59:15 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/09/19 01:20:22 markster + * Code cleanups (bug #66) * +/* Revision 1.2 2003/09/19 01:20:22 markster +/* Code cleanups (bug #66) +/* /* Revision 1.1.1.1 2003/02/12 13:59:15 matteo /* mer feb 12 14:56:57 CET 2003 /* @@ -158,7 +164,7 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a allv = allv && voibuf[(*af << 1) + 1] == 1; allv = allv && voibuf[(*af << 1) + 2] == 1; winv = voibuf[(*af << 1) + 1] == 1 || voibuf[(*af << 1) + 2] == 1; - if (allv || winv && *obound == 0) { + if (allv || (winv && *obound == 0)) { /* APHASE: Phase synchronous window placement. */ /* Get minimum lower index of the window. */ i__ = (lrange + *ipitch - 1 - awin[((*af - 1) << 1) + 1]) / *ipitch; |