diff options
Diffstat (limited to 'codecs/lpc10/analys.c')
| -rwxr-xr-x | codecs/lpc10/analys.c | 44 |
1 files changed, 29 insertions, 15 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) { |