Idefisk
Tools
Tutorials
Reviews
VoIP Providers
Archives
AsteriskGuru Archives
Mailing List Archives
FAQ
Search
Memberlist
Usergroups
Register
Profile
Log in to check your private messages
Log in
[Asterisk-cvs] asterisk/codecs/lpc10 analys.c,1.1.1.1,1.2 de
AsteriskGuru Archives Forum Index
->
Asterisk-CVS
View previous topic
::
View next topic
Author
Message
markster at lists.digium.
Guest
Posted: Fri Sep 19, 2003 1:19 am
Post subject: [Asterisk-cvs] asterisk/codecs/lpc10 analys.c,1.1.1.1,1.2 de
Update of /usr/cvsroot/asterisk/codecs/lpc10
In directory mongoose.digium.com:/tmp/cvs-serv26315/codecs/lpc10
Modified Files:
analys.c decode.c ivfilt.c placea.c
Log Message:
Code cleanups (bug #66)
Index: analys.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/analys.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- analys.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ analys.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -1,6 +1,9 @@
/*
$Log$
+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
@@ -79,6 +82,9 @@
/* ANALYS Version 55 */
/* $Log$
+/* 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
/*
@@ -222,9 +228,11 @@
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;
@@ -246,6 +254,9 @@
real phi[100] /* was [10][10] */, psi[10];
/* $Log$
+/* 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
/*
@@ -277,6 +288,9 @@
/* Frame size, Prediction order, Pitch period */
/* Arguments to ANALYS */
/* $Log$
+/* 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
/*
@@ -476,10 +490,10 @@
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
@@ -492,7 +506,7 @@
/* 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) {
Index: decode.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/decode.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- decode.c 12 Feb 2003 13:59:14 -0000 1.1.1.1
+++ decode.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -1,6 +1,9 @@
/*
$Log$
+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
@@ -53,6 +56,9 @@
/* DECODE Version 54 */
/* $Log$
+/* 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
/*
@@ -188,6 +194,9 @@
integer ishift, errcnt, lsb;
/* $Log$
+/* 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
/*
@@ -219,6 +228,9 @@
/* Frame size, Prediction order, Pitch period */
/* Arguments */
/* $Log$
+/* 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
/*
@@ -506,9 +518,9 @@
}
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]);
}
Index: ivfilt.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/ivfilt.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ivfilt.c 12 Feb 2003 13:59:15 -0000 1.1.1.1
+++ ivfilt.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -1,6 +1,9 @@
/*
$Log$
+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
@@ -29,6 +32,9 @@
/* IVFILT Version 48 */
/* $Log$
+/* 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
/*
@@ -91,7 +97,7 @@
/* 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];
Index: placea.c
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/lpc10/placea.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- placea.c 12 Feb 2003 13:59:15 -0000 1.1.1.1
+++ placea.c 19 Sep 2003 01:20:22 -0000 1.2
@@ -1,6 +1,9 @@
/*
$Log$
+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,6 +35,9 @@
/* PLACEA Version 48 */
/* $Log$
+/* 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
/*
@@ -152,7 +158,7 @@
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;
Back to top
Display posts from previous:
All Posts
1 Day
7 Days
2 Weeks
1 Month
3 Months
6 Months
1 Year
Oldest First
Newest First
AsteriskGuru Archives Forum Index
->
Asterisk-CVS
All times are GMT
Page
1
of
1
Jump to:
Select a forum
Asterisk Mailing Lists
----------------
Asterisk-Users
Asterisk-Dev
Asterisk-CVS
Asterisk-Biz
Asterisk-Doc
Asterisk-BSD
Asterisk-Announce
Asterisk Call Centers
Asterisk-Video
Asterisk-Speech-Rec
Bristuff-Users
You
cannot
post new topics in this forum
You
cannot
reply to topics in this forum
You
cannot
edit your posts in this forum
You
cannot
delete your posts in this forum
You
cannot
vote in polls in this forum
Powered by
phpBB
© 2001, 2005 phpBB Group