update ilbc and lpc10 codecs from openh323 sources.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@211 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/codec/ilbc/FrameClassify.c

@@ -11,7 +11,6 @@
    ******************************************************************/
    
    #include "iLBC_define.h"
-#include "FrameClassify.h"
    
    /*---------------------------------------------------------------*
     *  Classification of subframes to localize start state

libs/codec/ilbc/LPCdecode.c

@@ -16,7 +16,6 @@
    #include "helpfun.h"
    #include "lsf.h"
    #include "iLBC_define.h"
-#include "LPCdecode.h"
    #include "constants.h"
    
    /*---------------------------------------------------------------*

libs/codec/ilbc/LPCencode.c

@@ -15,7 +15,6 @@
    
    
    #include "iLBC_define.h"
-#include "LPCencode.h"
    #include "helpfun.h"
    #include "lsf.h"
    #include "constants.h"
@@ -24,7 +23,7 @@
     *  lpc analysis (subrutine to LPCencode)
     *---------------------------------------------------------------*/
    
-static void SimpleAnalysis(
+   void SimpleAnalysis(
        float *lsf,         /* (o) lsf coefficients */
        float *data,    /* (i) new data vector */
        iLBC_Enc_Inst_t *iLBCenc_inst 
@@ -74,7 +73,7 @@ static void SimpleAnalysis(
     *  (subrutine to SimpleInterpolateLSF)
     *---------------------------------------------------------------*/
    
-static void LSFinterpolate2a_enc(
+   void LSFinterpolate2a_enc(
        float *a,       /* (o) lpc coefficients */ 
        float *lsf1,/* (i) first set of lsf coefficients */
        float *lsf2,/* (i) second set of lsf coefficients */
@@ -92,7 +91,7 @@ static void LSFinterpolate2a_enc(
     *  lsf interpolator (subrutine to LPCencode)
     *---------------------------------------------------------------*/
    
-static void SimpleInterpolateLSF(
+   void SimpleInterpolateLSF(
        float *syntdenum,   /* (o) the synthesis filter denominator 
                                   resulting from the quantized 
                                   interpolated lsf */
@@ -175,7 +174,7 @@ static void SimpleInterpolateLSF(
     *  lsf quantizer (subrutine to LPCencode)
     *---------------------------------------------------------------*/
    
-static void SimplelsfQ(
+   void SimplelsfQ(
        float *lsfdeq,    /* (o) dequantized lsf coefficients
                               (dimension FILTERORDER) */
        int *index,     /* (o) quantization index */

libs/codec/ilbc/StateConstructW.c

@@ -16,7 +16,6 @@
    #include <string.h>
    
    #include "iLBC_define.h"
-#include "StateConstructW.h"
    #include "constants.h"
    #include "filter.h"
    

libs/codec/ilbc/StateSearchW.c

@@ -14,7 +14,6 @@
    #include <string.h>
    
    #include "iLBC_define.h"
-#include "StateSearchW.h"
    #include "constants.h"
    #include "filter.h"
    #include "helpfun.h"

libs/codec/ilbc/anaFilter.c

@@ -11,7 +11,6 @@
    ******************************************************************/
    
    #include <string.h>
-#include "anaFilter.h"
    #include "iLBC_define.h"
    
    /*----------------------------------------------------------------*

libs/codec/ilbc/createCB.c

@@ -13,7 +13,6 @@
    ******************************************************************/
    
    #include "iLBC_define.h"
-#include "createCB.h"
    #include "constants.h"
    #include <string.h>
    #include <math.h>

libs/codec/ilbc/doCPLC.c

@@ -15,14 +15,13 @@
    #include <stdio.h>
    
    #include "iLBC_define.h"
-#include "doCPLC.h"
    
    /*----------------------------------------------------------------*
     *  Compute cross correlation and pitch gain for pitch prediction
     *  of last subframe at given lag.
     *---------------------------------------------------------------*/
    
-static void compCorr(
+   void compCorr(
        float *cc,      /* (o) cross correlation coefficient */
        float *gc,      /* (o) gain */
        float *pm,

libs/codec/ilbc/enhancer.c

@@ -13,7 +13,6 @@
    #include <math.h>
    #include <string.h>
    #include "iLBC_define.h"
-#include "enhancer.h"
    #include "constants.h"
    #include "filter.h"
    
@@ -25,7 +24,7 @@
     * according to the squared-error criterion
     *---------------------------------------------------------------*/
    
-static void NearestNeighbor(
+   void NearestNeighbor(
        int   *index,   /* (o) index of array element closest 
                               to value */
        float *array,   /* (i) data array */
@@ -53,7 +52,7 @@ static void NearestNeighbor(
     * compute cross correlation between sequences
     *---------------------------------------------------------------*/
    
-static void mycorr1( 
+   void mycorr1( 
        float* corr,    /* (o) correlation of seq1 and seq2 */
        float* seq1,    /* (i) first sequence */
        int dim1,           /* (i) dimension first seq1 */
@@ -76,7 +75,7 @@ static void mycorr1(
    
    
    
-static void enh_upsample( 
+   void enh_upsample( 
        float* useq1,   /* (o) upsampled output sequence */
        float* seq1,/* (i) unupsampled sequence */
        int dim1,       /* (i) dimension seq1 */
@@ -161,7 +160,7 @@ static void enh_upsample(
     * sampling rate
     *---------------------------------------------------------------*/
    
-static void refiner(
+   void refiner(
        float *seg,         /* (o) segment array */
        float *updStartPos, /* (o) updated start point */
        float* idata,       /* (i) original data buffer */
@@ -251,7 +250,7 @@ static void refiner(
     * find the smoothed output data
     *---------------------------------------------------------------*/
    
-static void smath(
+   void smath(
        float *odata,   /* (o) smoothed output */
        float *sseq,/* (i) said second sequence of waveforms */
        int hl,         /* (i) 2*hl+1 is sseq dimension */
@@ -348,7 +347,7 @@ static void smath(
     * get the pitch-synchronous sample sequence
     *---------------------------------------------------------------*/
    
-static void getsseq(
+   void getsseq(
        float *sseq,    /* (o) the pitch-synchronous sequence */
        float *idata,       /* (i) original data */
        int idatal,         /* (i) dimension of data */
@@ -426,7 +425,7 @@ static void getsseq(
     * idata+centerStartPos+ENH_BLOCKL-1
     *---------------------------------------------------------------*/
    
-static void enhancer(
+   void enhancer(
        float *odata,       /* (o) smoothed block, dimension blockl */
        float *idata,       /* (i) data buffer used for enhancing */
        int idatal,         /* (i) dimension idata */

libs/codec/ilbc/extract-cfile.awk

@@ -0,0 +1,17 @@
+BEGIN { srcname = "nothing"; }
+{ if (/^A\.[0-9][0-9]* [a-zA-Z][a-zA-Z_0-9]*\.[ch]/) {
+    if (srcname != "nothing")
+      close(srcname);
+    srcname = $2;
+    printf("creating source file %s\n", srcname);
+  }else if (srcname != "nothing") {
+    if (/Andersen et\. al\./ || /Internet Low Bit Rate Codec *May 04/)
+      printf("skipping %s\n", $0);
+    else
+      print $0 >> srcname;
+  }
+}
+END {
+  printf("ending file %s\n", srcname);
+  close(srcname);
+}

libs/codec/ilbc/filter.c

@@ -13,7 +13,6 @@
    
    
    #include "iLBC_define.h"
-#include "filter.h"
    
    /*----------------------------------------------------------------*
     *  all-pole filter

libs/codec/ilbc/gainquant.c

@@ -15,7 +15,6 @@
    #include <string.h>
    #include <math.h>
    #include "constants.h"
-#include "gainquant.h"
    #include "filter.h"
    
    /*----------------------------------------------------------------*

libs/codec/ilbc/getCBvec.c

@@ -11,7 +11,6 @@
    ******************************************************************/
    
    #include "iLBC_define.h"
-#include "getCBvec.h"
    #include "constants.h"
    #include <string.h>
    

libs/codec/ilbc/helpfun.c

@@ -13,7 +13,6 @@
    #include <math.h>
    
    #include "iLBC_define.h"
-#include "helpfun.h"
    #include "constants.h"
    
    /*----------------------------------------------------------------*

libs/codec/ilbc/hpInput.c

@@ -11,7 +11,6 @@
    ******************************************************************/
    
    #include "constants.h"
-#include "hpInput.h"
    
    /*----------------------------------------------------------------*
     *  Input high-pass filter                          

libs/codec/ilbc/hpOutput.c

@@ -13,7 +13,7 @@
    ******************************************************************/
    
    #include "constants.h"
-#include "hpOutput.h"
+   
    /*----------------------------------------------------------------*
     *  Output high-pass filter                          
     *---------------------------------------------------------------*/

libs/codec/ilbc/iCBConstruct.c

@@ -13,7 +13,6 @@
    #include <math.h>
    
    #include "iLBC_define.h"
-#include "iCBConstruct.h"
    #include "gainquant.h"
    #include "getCBvec.h"
    

libs/codec/ilbc/iCBSearch.c

@@ -14,7 +14,6 @@
    #include <string.h>
    
    #include "iLBC_define.h"
-#include "iCBSearch.h"
    #include "gainquant.h"
    #include "createCB.h"
    #include "filter.h"
@@ -122,8 +121,7 @@ void iCBSearch(
                *ppe=0.0;
                pp=buf+LPC_FILTERORDER+lMem-lTarget;
                for (j=0; j<lTarget; j++) {
-                *ppe+=(*pp)*(*pp);
+                   *ppe+=(*pp)*(*pp++);
-				pp++;
                }
                
                if (*ppe>0.0) {
@@ -305,8 +303,7 @@ void iCBSearch(
    
                pp=cbvectors+lMem-lTarget;
                for (j=0; j<lTarget; j++) {
-                *ppe+=(*pp)*(*pp);
+                   *ppe+=(*pp)*(*pp++);
-				pp++;
                }
    
                ppi = cbvectors + lMem - 1 - lTarget;

libs/codec/ilbc/iLBC_decode.c

@@ -14,7 +14,6 @@
    #include <stdlib.h>
    
    #include "iLBC_define.h"
-#include "iLBC_decode.h"
    #include "StateConstructW.h"
    #include "LPCdecode.h"
    #include "iCBConstruct.h"
@@ -111,7 +110,7 @@ short initDecode(                   /* (o) Number of decoded
     *  frame residual decoder function (subrutine to iLBC_decode) 
     *---------------------------------------------------------------*/
    
-static void Decode(
+   void Decode(
        iLBC_Dec_Inst_t *iLBCdec_inst,  /* (i/o) the decoder state 
                                                 structure */
        float *decresidual,             /* (o) decoded residual frame */
@@ -241,7 +240,7 @@ static void Decode(
    
                /* update memory */
    
-            memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
                memcpy(mem+CB_MEML-SUBL, 
                    &decresidual[(start+1+subframe)*SUBL],
                    SUBL*sizeof(float));
@@ -286,7 +285,7 @@ static void Decode(
    
                /* update memory */
    
-            memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
                memcpy(mem+CB_MEML-SUBL, 
                    &reverseDecresidual[subframe*SUBL],
                    SUBL*sizeof(float));

libs/codec/ilbc/iLBC_define.h

@@ -45,6 +45,7 @@
    #define LPC_WN                  (float)1.0001
    #define LSF_NSPLIT              3
    
+   
    #define LSF_NUMBER_OF_STEPS     4
    #define LPC_HALFORDER           (LPC_FILTERORDER/2)
    
@@ -100,6 +101,7 @@
    /* help parameters */
    
    
+   
    #define FLOAT_MAX               (float)1.0e37
    #define EPS                     (float)2.220446049250313e-016
    #define PI                      (float)3.14159265358979323846
@@ -155,6 +157,7 @@ typedef struct iLBC_Enc_Inst_t_ {
    typedef struct iLBC_Dec_Inst_t_ {
    
    
+   
        /* flag for frame size mode */
        int mode;
    

libs/codec/ilbc/iLBC_encode.c

@@ -15,7 +15,6 @@
    #include <string.h>
    
    #include "iLBC_define.h"
-#include "iLBC_encode.h"
    #include "LPCencode.h"
    #include "FrameClassify.h"
    #include "StateSearchW.h"
@@ -294,7 +293,7 @@ void iLBC_encode(
    
                /* update memory */
    
-            memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
                memcpy(mem+CB_MEML-SUBL, 
                    &decresidual[(start+1+subframe)*SUBL], 
                    SUBL*sizeof(float));
@@ -364,7 +363,7 @@ void iLBC_encode(
    
                /* update memory */
    
-            memmove(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
+               memcpy(mem, mem+SUBL, (CB_MEML-SUBL)*sizeof(float));
                memcpy(mem+CB_MEML-SUBL, 
                    &reverseDecresidual[subframe*SUBL],
                    SUBL*sizeof(float));

libs/codec/ilbc/lsf.c

@@ -14,7 +14,6 @@
    #include <math.h>
    
    #include "iLBC_define.h"
-#include "lsf.h"
    
    /*----------------------------------------------------------------*
     *  conversion from lpc coefficients to lsf coefficients 

libs/codec/ilbc/packing.c

@@ -16,7 +16,6 @@
    #include "iLBC_define.h"
    #include "constants.h"
    #include "helpfun.h"
-#include "packing.h"
    #include "string.h"
    
    /*----------------------------------------------------------------*

libs/codec/ilbc/syntFilter.c

@@ -11,7 +11,6 @@
    ******************************************************************/
    
    #include "iLBC_define.h"
-#include "syntFilter.h"
    
    /*----------------------------------------------------------------*
     *  LP synthesis filter.

libs/codec/lpc10/Makefile

@@ -3,7 +3,7 @@
 # 
 
 # default C compiler
-CC?= gcc
+CC= gcc
 
 # 
 # These definitions for CFLAGS and LIB_TARGET_DIR are used when one
@@ -14,62 +14,57 @@ CC?= gcc
 # definitions.
 # 
 
-LIB_TARGET_DIR = .
+LIB_TARGET_DIR = ..
 
 # 
 # -I$(LIB_TARGET_DIR) option needed so that #include "machine.h"
 # directives can find the machine.h file.
 # 
 
-WARNINGS = -Wall -Wno-comment -Wno-error
+WARNINGS = -Wall
-CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS)
+CFLAGS = -O3 -I$(LIB_TARGET_DIR) $(WARNINGS)
-ifneq (${OSARCH},CYGWIN)
-CFLAGS += -fPIC
-endif
-#CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
-
-#fix for PPC processors and ALPHA, And UltraSparc too
-ifneq ($(OSARCH),Darwin)
-ifneq ($(findstring BSD,${OSARCH}),BSD)
-ifneq ($(PROC),ppc)
-ifneq ($(PROC),x86_64)
-ifneq ($(PROC),alpha)
-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
-#This works for even old (2.96) versions of gcc and provides a small boost either way.
-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it.
-#So we go lowest common available by gcc and go a step down, still a step up from
-#the default as we now have a better instruction set to work with. - Belgarath
-ifeq ($(PROC),ultrasparc)
-        CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
-else
-ifneq ($(OSARCH),SunOS)
-ifneq  ($(OSARCH),arm)
-#        CFLAGS+= -march=$(PROC)
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
 
 LIB = $(LIB_TARGET_DIR)/liblpc10.a
 
 .PHONY: all clean
 
 all:	$(LIB)
+	ranlib $(LIB)
 
-OBJ=	f2clib.o analys.o bsynz.o chanwr.o dcbias.o decode.o \
+$(LIB):		$(LIB)(f2clib.o)	\
-		deemp.o difmag.o dyptrk.o encode.o energy.o ham84.o \
+		$(LIB)(analys.o)	\
-		hp100.o invert.o irc2pc.o ivfilt.o lpcdec.o lpcenc.o \
+		$(LIB)(bsynz.o)		\
-		lpcini.o lpfilt.o median.o mload.o onset.o pitsyn.o \
+		$(LIB)(chanwr.o)	\
-		placea.o placev.o preemp.o prepro.o random.o rcchk.o \
+		$(LIB)(dcbias.o)	\
-		synths.o tbdm.o voicin.o vparms.o
+		$(LIB)(decode.o)	\
-
+		$(LIB)(deemp.o)		\
-$(LIB): $(OBJ)
+		$(LIB)(difmag.o)	\
-	$(AR) cr $@ $(OBJ)
+		$(LIB)(dyptrk.o)	\
-	ranlib $@
+		$(LIB)(encode.o)	\
+		$(LIB)(energy.o)	\
+		$(LIB)(ham84.o)		\
+		$(LIB)(hp100.o)		\
+		$(LIB)(invert.o)	\
+		$(LIB)(irc2pc.o)	\
+		$(LIB)(ivfilt.o)	\
+		$(LIB)(lpcdec.o)	\
+		$(LIB)(lpcenc.o)	\
+		$(LIB)(lpcini.o)	\
+		$(LIB)(lpfilt.o)	\
+		$(LIB)(median.o)	\
+		$(LIB)(mload.o)		\
+		$(LIB)(onset.o)		\
+		$(LIB)(pitsyn.o)	\
+		$(LIB)(placea.o)	\
+		$(LIB)(placev.o)	\
+		$(LIB)(preemp.o)	\
+		$(LIB)(prepro.o)	\
+		$(LIB)(random.o)	\
+		$(LIB)(rcchk.o)		\
+		$(LIB)(synths.o)	\
+		$(LIB)(tbdm.o)		\
+		$(LIB)(voicin.o)	\
+		$(LIB)(vparms.o)
 
 clean:
-	-rm -f *.o $(LIB)
+	-rm -f *.o

libs/codec/lpc10/analys.c

@@ -1,20 +1,14 @@
 /*
 
-$Log$
+$Log: analys.c,v $
-Revision 1.16  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.15  2003/09/19 01:20:22  markster
+Revision 1.2  2002/02/15 03:57:55  yurik
-Code cleanups (bug #66)
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.2  2003/09/19 01:20:22  markster
+Revision 1.1  2000/06/05 04:45:12  robertj
-Code cleanups (bug #66)
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:14  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:16:01  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -30,8 +24,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-#include "f2c.h"
-
 #ifdef P_R_O_T_O_T_Y_P_E_S
 extern int analys_(real *speech, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_encoder_state *st);
 /* comlen contrl_ 12 */
@@ -60,6 +52,8 @@ extern int analys_(real *speech, integer *voice, integer *pitch, real *rms, real
 	-lf2c -lm   (in that order)
 */
 
+#include "f2c.h"
+
 /* Common Block Declarations */
 
 extern struct {
@@ -87,21 +81,15 @@ static integer c__1 = 1;
 
 /* 	ANALYS Version 55 */
 
-/* $Log$
+/* $Log: analys.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/19 01:20:22  markster
-/* Code cleanups (bug #66)
 /*
-/* Revision 1.2  2003/09/19 01:20:22  markster
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* Code cleanups (bug #66)
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:16:01  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -240,7 +228,11 @@ static integer c__1 = 1;
     extern /* Subroutine */ int onset_(real *, integer *, integer *, integer *
 	    , integer *, integer *, integer *, struct lpc10_encoder_state *);
     integer *osptr;
-    extern int dcbias_(integer *, real *, real *);
+    extern /* Subroutine */ placea_(integer *, integer *
+	    , integer *, integer *, integer *, integer *, integer *, integer *
+	    , integer *), dcbias_(integer *, real *, real *), placev_(integer 
+	    *, integer *, integer *, integer *, integer *, integer *, integer 
+	    *, integer *, integer *, integer *, integer *);
     integer ipitch;
     integer *obound;
     extern /* Subroutine */ int preemp_(real *, real *, integer *, real *, 
@@ -259,21 +251,15 @@ static integer c__1 = 1;
 	    *, integer *, integer *, struct lpc10_encoder_state *);
     real phi[100]	/* was [10][10] */, psi[10];
 
-/* $Log$
+/* $Log: analys.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/19 01:20:22  markster
-/* Code cleanups (bug #66)
 /*
-/* Revision 1.2  2003/09/19 01:20:22  markster
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* Code cleanups (bug #66)
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:16:01  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -299,21 +285,15 @@ static integer c__1 = 1;
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments to ANALYS */
-/* $Log$
+/* $Log: analys.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/19 01:20:22  markster
-/* Code cleanups (bug #66)
 /*
-/* Revision 1.2  2003/09/19 01:20:22  markster
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* Code cleanups (bug #66)
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:16:01  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -508,10 +488,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) - 2] = vwin[(i__ + (1 << 1)) - 2] - contrl_1.lframe;
-	vwin[(i__ << 1) - 1] = vwin[((i__ + 1) << 1) - 1] - 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) - 2] = awin[(i__ + (1 << 1)) - 2] - contrl_1.lframe;
-	awin[(i__ << 1) - 1] = awin[((i__ + 1) << 1) - 1] - 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
@@ -524,7 +504,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) {

libs/codec/lpc10/bsynz.c

@@ -1,17 +1,14 @@
 /*
 
-$Log$
+$Log: bsynz.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:14  matteo
+Revision 1.2  2002/02/15 03:57:55  yurik
-mer feb 12 14:56:57 CET 2003
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:18:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -27,6 +24,12 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, real *ratio, real *g2pass, struct lpc10_decoder_state *st);
+/* comlen contrl_ 12 */
+/*:ref: random_ 4 0 */
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -34,12 +37,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, real *ratio, real *g2pass, struct lpc10_decoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: random_ 4 0 */
-#endif
-
 /* Common Block Declarations */
 
 extern struct {
@@ -53,18 +50,15 @@ extern struct {
 
 /* 	BSYNZ Version 54 */
 
-/* $Log$
+/* $Log: bsynz.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:14  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.2  1996/08/20  20:18:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -155,18 +149,15 @@ extern struct {
     real xy, sum, ssq;
     real lpi0, hpi0;
 
-/* $Log$
+/* $Log: bsynz.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:14  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.2  1996/08/20  20:18:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -192,18 +183,15 @@ extern struct {
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
-/* $Log$
+/* $Log: bsynz.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:14  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.2  1996/08/20  20:18:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/chanwr.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: chanwr.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:14  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:14  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:20:24  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -24,6 +18,11 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int chanwr_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits, struct lpc10_encoder_state *st);
+extern int chanrd_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -35,18 +34,12 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 /* 	CHANL Version 49 */
 
-/* $Log$
+/* $Log: chanwr.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:14  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:20:24  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/dcbias.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: dcbias.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:14  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:14  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:40:23  jaf
  * Initial revision
@@ -19,6 +13,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int dcbias_(integer *len, real *speech, real *sigout);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +24,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int dcbias_(integer *len, real *speech, real *sigout);
-#endif
-
 /* ********************************************************************* */
 
 /* 	DCBIAS Version 50 */
 
-/* $Log$
+/* $Log: dcbias.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:14  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:40:23  jaf
  * Initial revision

libs/codec/lpc10/decode.c

@@ -1,20 +1,14 @@
 /*
 
-$Log$
+$Log: decode_.c,v $
-Revision 1.16  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.15  2003/09/19 01:20:22  markster
+Revision 1.2  2002/02/15 03:57:55  yurik
-Code cleanups (bug #66)
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.2  2003/09/19 01:20:22  markster
+Revision 1.1  2000/06/05 04:45:12  robertj
-Code cleanups (bug #66)
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:14  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:22:39  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -30,13 +24,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-/*  -- translated by f2c (version 19951025).
-   You must link the resulting object file with the libraries:
-	-lf2c -lm   (in that order)
-*/
-
-#include "f2c.h"
-
 #ifdef P_R_O_T_O_T_Y_P_E_S
 extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st);
 /* comlen contrl_ 12 */
@@ -44,6 +31,13 @@ extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice,
 /*:ref: median_ 4 3 4 4 4 */
 #endif
 
+/*  -- translated by f2c (version 19951025).
+   You must link the resulting object file with the libraries:
+	-lf2c -lm   (in that order)
+*/
+
+#include "f2c.h"
+
 /* Common Block Declarations */
 
 extern struct {
@@ -61,21 +55,15 @@ static integer c__2 = 2;
 
 /* 	DECODE Version 54 */
 
-/* $Log$
+/* $Log: decode_.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/19 01:20:22  markster
-/* Code cleanups (bug #66)
 /*
-/* Revision 1.2  2003/09/19 01:20:22  markster
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* Code cleanups (bug #66)
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:22:39  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -205,21 +193,15 @@ static integer c__2 = 2;
     extern integer median_(integer *, integer *, integer *);
     integer ishift, errcnt, lsb;
 
-/* $Log$
+/* $Log: decode_.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/19 01:20:22  markster
-/* Code cleanups (bug #66)
 /*
-/* Revision 1.2  2003/09/19 01:20:22  markster
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* Code cleanups (bug #66)
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:22:39  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -245,21 +227,15 @@ static integer c__2 = 2;
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
-/* $Log$
+/* $Log: decode_.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/19 01:20:22  markster
-/* Code cleanups (bug #66)
 /*
-/* Revision 1.2  2003/09/19 01:20:22  markster
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* Code cleanups (bug #66)
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:22:39  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -542,9 +518,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]);
 	    }

libs/codec/lpc10/deemp.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: deemp.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:14  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:14  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:23:46  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -27,6 +21,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -34,26 +32,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st);
-#endif
-
 /* ***************************************************************** */
 
 /* 	DEEMP Version 48 */
 
-/* $Log$
+/* $Log: deemp.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:14  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:23:46  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/difmag.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: difmag.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:14  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:14  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:32:31  jaf
  * Initial revision
@@ -19,6 +13,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, integer *maxlag, real *amdf, integer *minptr, integer *maxptr);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +24,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, integer *maxlag, real *amdf, integer *minptr, integer *maxptr);
-#endif
-
 /* ********************************************************************** */
 
 /* 	DIFMAG Version 49 */
 
-/* $Log$
+/* $Log: difmag.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:14  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:14  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:32:31  jaf
  * Initial revision

libs/codec/lpc10/dyptrk.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: dyptrk.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:25:29  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -27,6 +21,11 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, integer *pitch, integer *midx, struct lpc10_encoder_state *st);
+/* comlen contrl_ 12 */
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -34,11 +33,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int dyptrk_(real *amdf, integer *ltau, integer *minptr, integer *voice, integer *pitch, integer *midx, struct lpc10_encoder_state *st);
-/* comlen contrl_ 12 */
-#endif
-
 /* Common Block Declarations */
 
 extern struct {
@@ -52,18 +46,12 @@ extern struct {
 
 /* 	DYPTRK Version 52 */
 
-/* $Log$
+/* $Log: dyptrk.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:25:29  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -147,18 +135,12 @@ extern struct {
     real alpha, minsc, maxsc;
 
 /*       Arguments */
-/* $Log$
+/* $Log: dyptrk.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:25:29  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/encode.c

@@ -1,17 +1,14 @@
 /*
 
-$Log$
+$Log: encode_.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.2  2002/02/15 03:57:55  yurik
-mer feb 12 14:56:57 CET 2003
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:32:21  jaf
  * Initial revision
@@ -19,6 +16,11 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer *ipitch, integer *irms, integer *irc);
+/* comlen contrl_ 12 */
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,11 +28,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int encode_(integer *voice, integer *pitch, real *rms, real *rc, integer *ipitch, integer *irms, integer *irc);
-/* comlen contrl_ 12 */
-#endif
-
 /* Common Block Declarations */
 
 extern struct {
@@ -48,18 +45,15 @@ static integer c__2 = 2;
 
 /* 	ENCODE Version 54 */
 
-/* $Log$
+/* $Log: encode_.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.1  1996/08/19  22:32:21  jaf
  * Initial revision
@@ -139,18 +133,15 @@ static integer c__2 = 2;
     /* Local variables */
     integer idel, nbit, i__, j, i2, i3, mrk;
 
-/* $Log$
+/* $Log: encode_.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.1  1996/08/19  22:32:21  jaf
  * Initial revision
@@ -168,18 +159,15 @@ static integer c__2 = 2;
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
-/* $Log$
+/* $Log: encode_.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.1  1996/08/19  22:32:21  jaf
  * Initial revision

libs/codec/lpc10/energy.c

@@ -1,17 +1,14 @@
 /*
 
-$Log$
+$Log: energy.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.2  2002/02/15 03:57:55  yurik
-mer feb 12 14:56:57 CET 2003
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:32:17  jaf
  * Initial revision
@@ -19,6 +16,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int energy_(integer *len, real *speech, real *rms);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +27,19 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int energy_(integer *len, real *speech, real *rms);
-#endif
-
 /* ********************************************************************* */
 
 /* 	ENERGY Version 50 */
 
-/* $Log$
+/* $Log: energy.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.1  1996/08/19  22:32:17  jaf
  * Initial revision

libs/codec/lpc10/f2c.h

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: f2c.h,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:26:28  jaf
  * Any typedef defining a type that was used in lpc10_encoder_state or
@@ -215,17 +209,17 @@ typedef shortlogical (*K_fp)(...);
 typedef /* Character */ VOID (*H_fp)(...);
 typedef /* Subroutine */ int (*S_fp)(...);
 #else
-typedef int /* Unknown procedure type */ (*U_fp)(VOID);
+typedef int /* Unknown procedure type */ (*U_fp)();
-typedef shortint (*J_fp)(VOID);
+typedef shortint (*J_fp)();
-typedef integer (*I_fp)(VOID);
+typedef integer (*I_fp)();
-typedef real (*R_fp)(VOID);
+typedef real (*R_fp)();
-typedef doublereal (*D_fp)(VOID), (*E_fp)(VOID);
+typedef doublereal (*D_fp)(), (*E_fp)();
-typedef /* Complex */ VOID (*C_fp)(VOID);
+typedef /* Complex */ VOID (*C_fp)();
-typedef /* Double Complex */ VOID (*Z_fp)(VOID);
+typedef /* Double Complex */ VOID (*Z_fp)();
-typedef logical (*L_fp)(VOID);
+typedef logical (*L_fp)();
-typedef shortlogical (*K_fp)(VOID);
+typedef shortlogical (*K_fp)();
-typedef /* Character */ VOID (*H_fp)(VOID);
+typedef /* Character */ VOID (*H_fp)();
-typedef /* Subroutine */ int (*S_fp)(VOID);
+typedef /* Subroutine */ int (*S_fp)();
 #endif
 /* E_fp is for real functions when -R is not specified */
 typedef VOID C_f;	/* complex function */
@@ -255,71 +249,4 @@ typedef doublereal E_f;	/* real function with -R not specified */
 #undef unix
 #undef vax
 #endif
-
-#ifdef KR_headers
-extern integer pow_ii(ap, bp);
-extern double r_sign(a,b);
-extern integer i_nint(x);
-#else
-extern integer pow_ii(integer *ap, integer *bp);
-extern double r_sign(real *a, real *b);
-extern integer i_nint(real *x);
-
 #endif
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int bsynz_(real *coef, integer *ip, integer *iv, 
-                  real *sout, real *rms, real *ratio, real *g2pass,
-                  struct lpc10_decoder_state *st);
-extern int chanwr_(integer *order, integer *ipitv, integer *irms,
-                   integer *irc, integer *ibits, struct lpc10_encoder_state *st);
-extern int chanrd_(integer *order, integer *ipitv, integer *irms,
-                   integer *irc, integer *ibits);
-extern int chanwr_0_(int n__, integer *order, integer *ipitv, 
-                     integer *irms, integer *irc, integer *ibits,
-                     struct lpc10_encoder_state *st);
-extern int dcbias_(integer *len, real *speech, real *sigout);
-extern int decode_(integer *ipitv, integer *irms, integer *irc, 
-                   integer *voice, integer *pitch, real *rms,
-                   real *rc, struct lpc10_decoder_state *st);
-extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st);
-extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau,
-                   integer *maxlag, real *amdf, integer *minptr, integer *maxptr);
-extern int dyptrk_(real *amdf, integer *ltau, integer *
-                   minptr, integer *voice, integer *pitch, integer *midx,
-                   struct lpc10_encoder_state *st);
-extern int encode_(integer *voice, integer *pitch, real *rms, real *rc,
-                   integer *ipitch, integer *irms, integer *irc);
-extern int energy_(integer *len, real *speech, real *rms);
-extern int ham84_(integer *input, integer *output, integer *errcnt);
-extern int hp100_(real *speech, integer *start, integer *end,
-		  struct lpc10_encoder_state *st);
-extern int inithp100_(void);
-extern int invert_(integer *order, real *phi, real *psi, real *rc);
-extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass);
-extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc);
-extern int lpcdec_(integer *bits, real *speech);
-extern int initlpcdec_(void);
-extern int lpcenc_(real *speech, integer *bits);
-extern int initlpcenc_(void);
-extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp);
-extern integer median_(integer *d1, integer *d2, integer *d3);
-extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi);
-extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st);
-extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st);
-extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin);
-extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh);
-extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__);
-extern int prepro_(real *speech, integer *length,
-		   struct lpc10_encoder_state *st);
-extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st);
-extern integer random_(struct lpc10_decoder_state *st);
-extern int rcchk_(integer *order, real *rc1f, real *rc2f);
-extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *speech, integer *k, struct lpc10_decoder_state *st);
-extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau);
-extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st);
-extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__);
-
-#endif
-
-
-#endif /* ! defined F2C_INCLUDE */

libs/codec/lpc10/f2clib.c

@@ -1,14 +1,20 @@
 /*
 
-$Log$
+$Log: f2clib.c,v $
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.2  2004/05/05 13:25:38  rjongbloed
-mer feb 12 14:56:57 CET 2003
+Fixed clearly incorrect code (dived by zero) found with an MSVC warning
 
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-mer feb 12 14:56:57 CET 2003
+Initial version
 
-Revision 1.2  2000/01/05 08:20:39  markster
+Revision 1.3  2004/02/17 09:21:45  csoutheren
-Some OSS fixes and a few lpc changes to make it actually work
+Fix for GM bug 134591
+
+Revision 1.2  2002/02/15 03:57:55  yurik
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
+
+Revision 1.1  2000/06/05 04:45:12  robertj
+Added LPC-10 2400bps codec
 
  * Revision 1.1  1996/08/19  22:32:10  jaf
  * Initial revision
@@ -40,7 +46,7 @@ integer pow_ii(integer *ap, integer *bp)
 		if (n == 0 || x == 1)
 			return 1;
 		if (x != -1)
-			return x == 0 ? 0 : 1/x;
+			return x != 0 ? 1/x : 0;
 		n = -n;
 		}
 	u = n;
@@ -80,6 +86,6 @@ integer i_nint(x) real *x;
 integer i_nint(real *x)
 #endif
 {
-return( (integer)((*x)>=0 ?
+return (integer)( (*x)>=0 ?
-	floor(*x + .5) : -floor(.5 - *x)) );
+	floor(*x + .5) : -(floor(.5 - *x)) );
 }

libs/codec/lpc10/ham84.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: ham84.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:32:07  jaf
  * Initial revision
@@ -19,6 +13,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int ham84_(integer *input, integer *output, integer *errcnt);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +24,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int ham84_(integer *input, integer *output, integer *errcnt);
-#endif
-
 /* ***************************************************************** */
 
 /* 	HAM84 Version 45G */
 
-/* $Log$
+/* $Log: ham84.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:32:07  jaf
  * Initial revision

libs/codec/lpc10/hp100.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: hp100.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:28:05  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -27,6 +21,12 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int hp100_(real *speech, integer *start, integer *end,
+		  struct lpc10_encoder_state *st);
+extern int inithp100_(void);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -34,28 +34,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int hp100_(real *speech, integer *start, integer *end,
-		  struct lpc10_encoder_state *st);
-extern int inithp100_(void);
-#endif
-
 /* ********************************************************************* */
 
 /*      HP100 Version 55 */
 
-/* $Log$
+/* $Log: hp100.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:28:05  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/invert.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: invert.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:42  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:32:00  jaf
  * Initial revision
@@ -19,6 +13,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int invert_(integer *order, real *phi, real *psi, real *rc);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +24,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int invert_(integer *order, real *phi, real *psi, real *rc);
-#endif
-
 /* **************************************************************** */
 
 /* 	INVERT Version 45G */
 
-/* $Log$
+/* $Log: invert.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:32:00  jaf
  * Initial revision
@@ -102,18 +90,12 @@ extern int invert_(integer *order, real *phi, real *psi, real *rc);
     real v[100]	/* was [10][10] */;
 
 /*       Arguments */
-/* $Log$
+/* $Log: invert.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:42  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:32:00  jaf
  * Initial revision

libs/codec/lpc10/irc2pc.c

@@ -1,17 +1,14 @@
 /*
 
-$Log$
+$Log: irc2pc.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.2  2002/02/15 03:57:55  yurik
-mer feb 12 14:56:57 CET 2003
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:31:56  jaf
  * Initial revision
@@ -19,6 +16,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +27,19 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pass);
-#endif
-
 /* ***************************************************************** */
 
 /* 	IRC2PC Version 48 */
 
-/* $Log$
+/* $Log: irc2pc.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.1  1996/08/19  22:31:56  jaf
  * Initial revision
@@ -93,18 +87,15 @@ extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pas
     integer i__, j;
 
 /* 	Arguments */
-/* $Log$
+/* $Log: irc2pc.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.1  1996/08/19  22:31:56  jaf
  * Initial revision
@@ -132,7 +123,7 @@ extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pas
     for (i__ = 1; i__ <= i__1; ++i__) {
 	*g2pass *= 1.f - rc[i__] * rc[i__];
     }
-    *g2pass = *gprime * (real)sqrt(*g2pass);
+    *g2pass = (real)(*gprime * sqrt(*g2pass));
     pc[1] = rc[1];
     i__1 = *order;
     for (i__ = 2; i__ <= i__1; ++i__) {

libs/codec/lpc10/ivfilt.c

@@ -1,20 +1,14 @@
 /*
 
-$Log$
+$Log: ivfilt.c,v $
-Revision 1.16  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.15  2003/09/19 01:20:22  markster
+Revision 1.2  2002/02/15 03:57:55  yurik
-Code cleanups (bug #66)
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.2  2003/09/19 01:20:22  markster
+Revision 1.1  2000/06/05 04:45:12  robertj
-Code cleanups (bug #66)
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:31:53  jaf
  * Initial revision
@@ -22,6 +16,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -29,29 +27,19 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real *ivrc);
-#endif
-
 /* ********************************************************************* */
 
 /* 	IVFILT Version 48 */
 
-/* $Log$
+/* $Log: ivfilt.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/19 01:20:22  markster
-/* Code cleanups (bug #66)
 /*
-/* Revision 1.2  2003/09/19 01:20:22  markster
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* Code cleanups (bug #66)
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:31:53  jaf
  * Initial revision
@@ -109,7 +97,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];

libs/codec/lpc10/liblpc10.vcproj

@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="liblpc10"
 	ProjectGUID="{FF1D238A-9D59-4850-838E-78182E05736B}"
+	RootNamespace="liblpc10"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -38,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;P_R_O_T_O_T_Y_P_E_S"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -98,7 +99,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;P_R_O_T_O_T_Y_P_E_S"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

libs/codec/lpc10/lpc10.h

@@ -1,26 +1,11 @@
 /*
 
-$Log$
+$Log: lpc10.h,v $
-Revision 1.18  2004/08/31 13:32:11  markster
+Revision 1.1  2004/05/04 11:30:49  csoutheren
-Merge NetBSD and Courtesty tone with modifications (bug #2329)
+Initial version
 
-Revision 1.17  2003/10/26 18:50:49  markster
+Revision 1.1  2000/06/05 04:45:11  robertj
-Make it build and run on MacOS X
+Added LPC-10 2400bps codec
-
-Revision 1.3  2003/10/26 18:50:49  markster
-Make it build and run on MacOS X
-
-Revision 1.2  2003/04/23 19:13:35  markster
-More OpenBSD patches
-
-Revision 1.1.1.2  2003/03/16 22:37:30  matteo
-dom mar 16 23:37:23 CET 2003
-
-Revision 1.2  2003/03/16 16:09:48  markster
-Mere James's cleanups for fewer build warnings
-
-Revision 1.1  2000/01/05 00:20:06  markster
-Add broken lpc10 code...  It's not too far from working I don't think...
 
  * Revision 1.1  1996/08/19  22:47:31  jaf
  * Initial revision
@@ -35,36 +20,8 @@ Add broken lpc10 code...  It's not too far from working I don't think...
 #define LPC10_BITS_IN_COMPRESSED_FRAME 54
 
 
-/*
-
-  The "#if defined"'s in this file are by no means intended to be
-  complete.  They are what Nautilus uses, which has been successfully
-  compiled under DOS with the Microsoft C compiler, and under a few
-  versions of Unix with the GNU C compiler.
-
- */
-
-#if defined(unix) || defined(__unix__) || defined(__NetBSD__)
 typedef short		INT16;
 typedef int		INT32;
-#endif
-
-
-#if defined(__MSDOS__) || defined(MSDOS)
-typedef int			INT16;
-typedef long		INT32;
-#endif
-
-#if defined(__APPLE__)
-typedef short		INT16;
-typedef int			INT32;
-#endif
-
-#if defined(WIN32) && defined(_MSC_VER)
-typedef __int16		INT16;
-typedef __int32		INT32;
-#pragma warning(disable: 4005)
-#endif
 
 
 /* The initial values for every member of this structure is 0, except
@@ -243,11 +200,11 @@ struct lpc10_decoder_state {
   
   */
 
-struct lpc10_encoder_state * create_lpc10_encoder_state (void);
+struct lpc10_encoder_state * create_lpc10_encoder_state ();
 void init_lpc10_encoder_state (struct lpc10_encoder_state *st);
 int lpc10_encode (real *speech, INT32 *bits, struct lpc10_encoder_state *st);
 
-struct lpc10_decoder_state * create_lpc10_decoder_state (void);
+struct lpc10_decoder_state * create_lpc10_decoder_state ();
 void init_lpc10_decoder_state (struct lpc10_decoder_state *st);
 int lpc10_decode (INT32 *bits, real *speech, struct lpc10_decoder_state *st);
 

libs/codec/lpc10/lpcdec.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: lpcdec.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:30:11  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -30,13 +24,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-/*  -- translated by f2c (version 19951025).
-   You must link the resulting object file with the libraries:
-	-lf2c -lm   (in that order)
-*/
-
-#include "f2c.h"
-
 #ifdef P_R_O_T_O_T_Y_P_E_S
 extern int lpcdec_(integer *bits, real *speech);
 extern int initlpcdec_(void);
@@ -48,6 +35,13 @@ extern int initlpcdec_(void);
 /*:ref: initsynths_ 14 0 */
 #endif
 
+/*  -- translated by f2c (version 19951025).
+   You must link the resulting object file with the libraries:
+	-lf2c -lm   (in that order)
+*/
+
+#include "f2c.h"
+
 /* Common Block Declarations */
 
 extern struct {
@@ -63,18 +57,12 @@ static integer c__10 = 10;
 
 /* ***************************************************************** */
 
-/* $Log$
+/* $Log: lpcdec.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:30:11  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -124,18 +112,12 @@ static integer c__10 = 10;
     integer irc[10], len;
     real rms;
 
-/* $Log$
+/* $Log: lpcdec.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:30:11  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -164,18 +146,12 @@ static integer c__10 = 10;
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
-/* $Log$
+/* $Log: lpcdec.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:30:11  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/lpcenc.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: lpcenc.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:31:21  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -30,13 +24,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-/*  -- translated by f2c (version 19951025).
-   You must link the resulting object file with the libraries:
-	-lf2c -lm   (in that order)
-*/
-
-#include "f2c.h"
-
 #ifdef P_R_O_T_O_T_Y_P_E_S
 extern int lpcenc_(real *speech, integer *bits);
 extern int initlpcenc_(void);
@@ -48,6 +35,13 @@ extern int initlpcenc_(void);
 /*:ref: initanalys_ 14 0 */
 #endif
 
+/*  -- translated by f2c (version 19951025).
+   You must link the resulting object file with the libraries:
+	-lf2c -lm   (in that order)
+*/
+
+#include "f2c.h"
+
 /* Table of constant values */
 
 static integer c__180 = 180;
@@ -55,18 +49,12 @@ static integer c__10 = 10;
 
 /* ***************************************************************** */
 
-/* $Log$
+/* $Log: lpcenc.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:31:21  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -120,18 +108,12 @@ static integer c__10 = 10;
     real rms;
 
 /*       Arguments */
-/* $Log$
+/* $Log: lpcenc.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:31:21  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/lpcini.c

@@ -1,23 +1,17 @@
 /*
 
-$Log$
+$Log: lpcini.c,v $
-Revision 1.18  2003/10/21 18:08:11  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Fix include order
+Initial version
 
-Revision 1.5  2003/10/21 18:08:11  markster
+Revision 1.3  2002/10/10 05:29:04  robertj
-Fix include order
+Removed non-ansi-C comments to maximise portability, thanks Martijn Roest
 
-Revision 1.4  2003/10/21 02:57:29  markster
+Revision 1.2  2001/02/24 14:00:10  rogerh
-FreeBSD patch, take 2
+Select the correct header file for malloc (stdlib.h or malloc.h)
 
-Revision 1.3  2003/10/16 21:11:30  martinp
+Revision 1.1  2000/06/05 04:45:12  robertj
-Revert the previous patch since it's braking compilation
+Added LPC-10 2400bps codec
-
-Revision 1.1  2003/02/12 13:59:15  matteo
-Initial revision
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:35:41  jaf
  * Added functions for allocating and initializing lpc10_encoder_state
@@ -41,9 +35,19 @@ extern int lpcini_(void);
 	-lf2c -lm   (in that order)
 */
 
-#include <stdlib.h>
 #include "f2c.h"
 
+/* malloc is now defined in stdlib.h in serveral systems */
+#ifdef  HAS_STDLIB_H
+#       include <stdlib.h>
+#else
+#       ifdef   HAS_MALLOC_H
+#               include         <malloc.h>
+#       else
+                extern char * malloc();
+#       endif
+#endif
+
 /* Common Block Declarations */
 
 struct {
@@ -55,24 +59,18 @@ struct {
 
 /* ***************************************************************** */
 
-/* $Log$
+/* $Log: lpcini.c,v $
- * Revision 1.18  2003/10/21 18:08:11  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Fix include order
+/* Initial version
- *
-/* Revision 1.5  2003/10/21 18:08:11  markster
-/* Fix include order
 /*
-/* Revision 1.4  2003/10/21 02:57:29  markster
+/* Revision 1.3  2002/10/10 05:29:04  robertj
-/* FreeBSD patch, take 2
+/* Removed non-ansi-C comments to maximise portability, thanks Martijn Roest
 /*
-/* Revision 1.3  2003/10/16 21:11:30  martinp
+/* Revision 1.2  2001/02/24 14:00:10  rogerh
-/* Revert the previous patch since it's braking compilation
+/* Select the correct header file for malloc (stdlib.h or malloc.h)
 /*
-/* Revision 1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Initial revision
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:35:41  jaf
  * Added functions for allocating and initializing lpc10_encoder_state
@@ -93,24 +91,18 @@ struct {
 /* Subroutine */ int lpcini_(void)
 {
 
-/* $Log$
+/* $Log: lpcini.c,v $
- * Revision 1.18  2003/10/21 18:08:11  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Fix include order
+/* Initial version
- *
-/* Revision 1.5  2003/10/21 18:08:11  markster
-/* Fix include order
 /*
-/* Revision 1.4  2003/10/21 02:57:29  markster
+/* Revision 1.3  2002/10/10 05:29:04  robertj
-/* FreeBSD patch, take 2
+/* Removed non-ansi-C comments to maximise portability, thanks Martijn Roest
 /*
-/* Revision 1.3  2003/10/16 21:11:30  martinp
+/* Revision 1.2  2001/02/24 14:00:10  rogerh
-/* Revert the previous patch since it's braking compilation
+/* Select the correct header file for malloc (stdlib.h or malloc.h)
 /*
-/* Revision 1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Initial revision
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:35:41  jaf
  * Added functions for allocating and initializing lpc10_encoder_state
@@ -131,24 +123,18 @@ struct {
 
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
-/* $Log$
+/* $Log: lpcini.c,v $
- * Revision 1.18  2003/10/21 18:08:11  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Fix include order
+/* Initial version
- *
-/* Revision 1.5  2003/10/21 18:08:11  markster
-/* Fix include order
 /*
-/* Revision 1.4  2003/10/21 02:57:29  markster
+/* Revision 1.3  2002/10/10 05:29:04  robertj
-/* FreeBSD patch, take 2
+/* Removed non-ansi-C comments to maximise portability, thanks Martijn Roest
 /*
-/* Revision 1.3  2003/10/16 21:11:30  martinp
+/* Revision 1.2  2001/02/24 14:00:10  rogerh
-/* Revert the previous patch since it's braking compilation
+/* Select the correct header file for malloc (stdlib.h or malloc.h)
 /*
-/* Revision 1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Initial revision
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:35:41  jaf
  * Added functions for allocating and initializing lpc10_encoder_state

libs/codec/lpc10/lpfilt.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: lpfilt.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:31:35  jaf
  * Initial revision
@@ -19,6 +13,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +24,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp);
-#endif
-
 /* *********************************************************************** */
 
 /* 	LPFILT Version 55 */
 
-/* $Log$
+/* $Log: lpfilt.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:31:35  jaf
  * Initial revision

libs/codec/lpc10/median.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: median.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:31:31  jaf
  * Initial revision
@@ -19,6 +13,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern integer median_(integer *d1, integer *d2, integer *d3);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +24,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern integer median_(integer *d1, integer *d2, integer *d3);
-#endif
-
 /* ********************************************************************* */
 
 /* 	MEDIAN Version 45G */
 
-/* $Log$
+/* $Log: median.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:31:31  jaf
  * Initial revision

libs/codec/lpc10/mload.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: mload.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:31:25  jaf
  * Initial revision
@@ -19,6 +13,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +24,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi);
-#endif
-
 /* ***************************************************************** */
 
 /* 	MLOAD Version 48 */
 
-/* $Log$
+/* $Log: mload.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:31:25  jaf
  * Initial revision

libs/codec/lpc10/onset.c

@@ -1,17 +1,14 @@
 /*
 
-$Log$
+$Log: onset.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.2  2002/02/15 03:57:55  yurik
-mer feb 12 14:56:57 CET 2003
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:37:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -27,6 +24,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -34,10 +35,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int onset_(real *pebuf, integer *osbuf, integer *osptr, integer *oslen, integer *sbufl, integer *sbufh, integer *lframe, struct lpc10_encoder_state *st);
-#endif
-
 /* Table of constant values */
 
 static real c_b2 = 1.f;
@@ -46,18 +43,15 @@ static real c_b2 = 1.f;
 
 /* 	ONSET Version 49 */
 
-/* $Log$
+/* $Log: onset.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.2  1996/08/20  20:37:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -154,18 +148,15 @@ static real c_b2 = 1.f;
     real *fpc;
 
 /*       Arguments */
-/* $Log$
+/* $Log: onset.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:39  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.2  1996/08/20  20:37:55  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/pitsyn.c

@@ -1,20 +1,14 @@
 /*
 
-$Log$
+$Log: pitsyn.c,v $
-Revision 1.16  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.15  2003/11/23 22:14:32  markster
+Revision 1.2  2002/02/15 03:57:55  yurik
-Various warning cleanups
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:40:12  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -30,6 +24,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -37,29 +35,19 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st);
-#endif
-
 /* ***************************************************************** */
 
 /* 	PITSYN Version 53 */
 
-/* $Log$
+/* $Log: pitsyn.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/11/23 22:14:32  markster
-/* Various warning cleanups
 /*
-/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:40:12  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -140,7 +128,7 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re
     logical *first;
 
     /* System generated locals */
-    integer rci_dim1 = 0, rci_offset, i__1, i__2;
+    integer rci_dim1, rci_offset, i__1, i__2;
     real r__1;
 
     /* Builtin functions */
@@ -160,21 +148,15 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re
     real xxy;
 
 /*       Arguments */
-/* $Log$
+/* $Log: pitsyn.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/11/23 22:14:32  markster
-/* Various warning cleanups
 /*
-/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:40:12  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/placea.c

@@ -1,23 +1,14 @@
 /*
 
-$Log$
+$Log: placea.c,v $
-Revision 1.16  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.15  2003/09/19 01:20:22  markster
+Revision 1.2  2001/10/16 21:21:14  yurik
-Code cleanups (bug #66)
+Removed warnings on Windows CE. Submitted by Jehan Bing, jehan@bravobrava.com
 
-Revision 1.2  2003/09/19 01:20:22  markster
+Revision 1.1  2000/06/05 04:45:12  robertj
-Code cleanups (bug #66)
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.3  2001/04/12 21:27:53  markh
-app_record now supports wildcards of sort so your output file is not overwritten every time it's run.  File.h got a documentation update on the ast_fileexists to include the return call.  Watch out for the placea.c placev.c code, it's updates have not been tested yet.  Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set.
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:31:07  jaf
  * Initial revision
@@ -25,6 +16,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -32,32 +27,19 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin);
-#endif
-
 /* *********************************************************************** */
 
 /* 	PLACEA Version 48 */
 
-/* $Log$
+/* $Log: placea.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/19 01:20:22  markster
-/* Code cleanups (bug #66)
 /*
-/* Revision 1.2  2003/09/19 01:20:22  markster
+/* Revision 1.2  2001/10/16 21:21:14  yurik
-/* Code cleanups (bug #66)
+/* Removed warnings on Windows CE. Submitted by Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.3  2001/04/12 21:27:53  markh
-/* app_record now supports wildcards of sort so your output file is not overwritten every time it's run.  File.h got a documentation update on the ast_fileexists to include the return call.  Watch out for the placea.c placev.c code, it's updates have not been tested yet.  Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set.
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:31:07  jaf
  * Initial revision
@@ -170,7 +152,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;

libs/codec/lpc10/placev.c

@@ -1,20 +1,14 @@
 /*
 
-$Log$
+$Log: placev.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.2  2001/10/16 21:21:14  yurik
-mer feb 12 14:56:57 CET 2003
+Removed warnings on Windows CE. Submitted by Jehan Bing, jehan@bravobrava.com
 
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.3  2001/04/12 21:27:53  markh
-app_record now supports wildcards of sort so your output file is not overwritten every time it's run.  File.h got a documentation update on the ast_fileexists to include the return call.  Watch out for the placea.c placev.c code, it's updates have not been tested yet.  Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set.
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:31:02  jaf
  * Initial revision
@@ -22,6 +16,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -29,29 +27,19 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh);
-#endif
-
 /* ****************************************************************** */
 
 /* 	PLACEV Version 48 */
 
-/* $Log$
+/* $Log: placev.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2001/10/16 21:21:14  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Removed warnings on Windows CE. Submitted by Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.3  2001/04/12 21:27:53  markh
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* app_record now supports wildcards of sort so your output file is not overwritten every time it's run.  File.h got a documentation update on the ast_fileexists to include the return call.  Watch out for the placea.c placev.c code, it's updates have not been tested yet.  Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set.
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:31:02  jaf
  * Initial revision

libs/codec/lpc10/preemp.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: preemp.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:30:58  jaf
  * Initial revision
@@ -19,6 +13,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +24,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z__);
-#endif
-
 /* ******************************************************************* */
 
 /* 	PREEMP Version 55 */
 
-/* $Log$
+/* $Log: preemp.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:30:58  jaf
  * Initial revision

libs/codec/lpc10/prepro.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: prepro.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:40:51  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -24,8 +18,16 @@ Some OSS fixes and a few lpc changes to make it actually work
  * Revision 1.1  1996/08/19  22:30:54  jaf
  * Initial revision
  *
+
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int prepro_(real *speech, integer *length,
+		   struct lpc10_encoder_state *st)
+/*:ref: hp100_ 14 3 6 4 4 */
+/*:ref: inithp100_ 14 0 */
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -33,13 +35,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int prepro_(real *speech, integer *length,
-		   struct lpc10_encoder_state *st);
-/*:ref: hp100_ 14 3 6 4 4 */
-/*:ref: inithp100_ 14 0 */
-#endif
-
 /* Table of constant values */
 
 static integer c__1 = 1;
@@ -48,18 +43,12 @@ static integer c__1 = 1;
 
 /* 	PREPRO Version 48 */
 
-/* $Log$
+/* $Log: prepro.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:40:51  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/random.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: random.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:41:32  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -27,6 +21,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern integer random_(struct lpc10_decoder_state *st);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -34,26 +32,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern integer random_(struct lpc10_decoder_state *st);
-#endif
-
 /* ********************************************************************** */
 
 /* 	RANDOM Version 49 */
 
-/* $Log$
+/* $Log: random.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:41:32  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/rcchk.c

@@ -1,17 +1,11 @@
 /*
 
-$Log$
+$Log: rcchk.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:30:41  jaf
  * Initial revision
@@ -19,6 +13,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int rcchk_(integer *order, real *rc1f, real *rc2f);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,26 +24,16 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int rcchk_(integer *order, real *rc1f, real *rc2f);
-#endif
-
 /* ********************************************************************* */
 
 /* 	RCCHK Version 45G */
 
-/* $Log$
+/* $Log: rcchk.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.1  1996/08/19  22:30:41  jaf
  * Initial revision

libs/codec/lpc10/synths.c

@@ -1,20 +1,11 @@
 /*
 
-$Log$
+$Log: synths.c,v $
-Revision 1.16  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.15  2003/09/27 02:45:37  markster
+Revision 1.1  2000/06/05 04:45:12  robertj
-Fix various compiler warnings (bug #322)
+Added LPC-10 2400bps codec
-
-Revision 1.2  2003/09/27 02:45:37  markster
-Fix various compiler warnings (bug #322)
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:39  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:42:59  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -30,13 +21,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
-/*  -- translated by f2c (version 19951025).
-   You must link the resulting object file with the libraries:
-	-lf2c -lm   (in that order)
-*/
-
-#include "f2c.h"
-
 #ifdef P_R_O_T_O_T_Y_P_E_S
 extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *speech, integer *k, struct lpc10_decoder_state *st);
 /* comlen contrl_ 12 */
@@ -49,6 +33,13 @@ extern int synths_(integer *voice, integer *pitch, real *rms, real *rc, real *sp
 /*:ref: initdeemp_ 14 0 */
 #endif
 
+/*  -- translated by f2c (version 19951025).
+   You must link the resulting object file with the libraries:
+	-lf2c -lm   (in that order)
+*/
+
+#include "f2c.h"
+
 /* Common Block Declarations */
 
 extern struct {
@@ -66,21 +57,12 @@ static real c_b2 = .7f;
 
 /* 	SYNTHS Version 54 */
 
-/* $Log$
+/* $Log: synths.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/27 02:45:37  markster
-/* Fix various compiler warnings (bug #322)
 /*
-/* Revision 1.2  2003/09/27 02:45:37  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Fix various compiler warnings (bug #322)
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:42:59  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -185,6 +167,9 @@ static real c_b2 = .7f;
     extern /* Subroutine */ int deemp_(real *, integer *, struct lpc10_decoder_state *);
     real ratio;
     integer ipiti[16];
+    extern /* Subroutine */ bsynz_(real *, integer *, 
+	    integer *, real *, real *, real *, real *, struct lpc10_decoder_state *), irc2pc_(real *, real *
+	    , integer *, real *, real *);
     real g2pass;
     real pc[10];
     extern /* Subroutine */ int pitsyn_(integer *, integer *, integer *, real 
@@ -192,21 +177,12 @@ static real c_b2 = .7f;
 	    integer *, real *, struct lpc10_decoder_state *);
     real rci[160]	/* was [10][16] */;
 
-/* $Log$
+/* $Log: synths.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/27 02:45:37  markster
-/* Fix various compiler warnings (bug #322)
 /*
-/* Revision 1.2  2003/09/27 02:45:37  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Fix various compiler warnings (bug #322)
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:42:59  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -232,21 +208,12 @@ static real c_b2 = .7f;
 /*   LPC Configuration parameters: */
 /* Frame size, Prediction order, Pitch period */
 /*       Arguments */
-/* $Log$
+/* $Log: synths.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/09/27 02:45:37  markster
-/* Fix various compiler warnings (bug #322)
 /*
-/* Revision 1.2  2003/09/27 02:45:37  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Fix various compiler warnings (bug #322)
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
-/*
-/* Revision 1.2  2000/01/05 08:20:39  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:42:59  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/tbdm.c

@@ -1,17 +1,14 @@
 /*
 
-$Log$
+$Log: tbdm.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.2  2002/02/15 03:57:55  yurik
-mer feb 12 14:56:57 CET 2003
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.2  2000/01/05 08:20:40  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:30:26  jaf
  * Initial revision
@@ -19,6 +16,11 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau);
+/*:ref: difmag_ 14 8 6 4 4 4 4 6 4 4 */
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,27 +28,19 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer *mintau);
-/*:ref: difmag_ 14 8 6 4 4 4 4 6 4 4 */
-#endif
-
 /* ********************************************************************** */
 
 /* 	TBDM Version 49 */
 
-/* $Log$
+/* $Log: tbdm.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:40  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.1  1996/08/19  22:30:26  jaf
  * Initial revision

libs/codec/lpc10/voicin.c

@@ -1,20 +1,14 @@
 /*
 
-$Log$
+$Log: voicin.c,v $
-Revision 1.16  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.15  2003/11/23 22:14:32  markster
+Revision 1.2  2002/02/15 03:57:55  yurik
-Various warning cleanups
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
-mer feb 12 14:56:57 CET 2003
-
-Revision 1.2  2000/01/05 08:20:40  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.2  1996/08/20  20:45:00  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -30,6 +24,12 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st);
+/* comlen contrl_ 12 */
+/*:ref: vparms_ 14 14 4 6 6 4 4 6 4 4 4 4 6 6 6 6 */
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -37,12 +37,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int voicin_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st);
-/* comlen contrl_ 12 */
-/*:ref: vparms_ 14 14 4 6 6 4 4 6 4 4 4 4 6 6 6 6 */
-#endif
-
 /* Common Block Declarations */
 
 extern struct {
@@ -56,21 +50,15 @@ extern struct {
 
 /* 	VOICIN Version 52 */
 
-/* $Log$
+/* $Log: voicin.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/11/23 22:14:32  markster
-/* Various warning cleanups
 /*
-/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:40  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:45:00  jaf
  * Removed all static local variables that were SAVE'd in the Fortran
@@ -277,7 +265,7 @@ s*/
 	    ;
 
     /* System generated locals */
-    integer inbuf_offset = 0, lpbuf_offset = 0, i__1, i__2;
+    integer inbuf_offset, lpbuf_offset, i__1, i__2;
     real r__1, r__2;
 
     /* Builtin functions */
@@ -307,21 +295,15 @@ s*/
 
 /* 	Global Variables: */
 /*       Arguments */
-/* $Log$
+/* $Log: voicin.c,v $
- * Revision 1.16  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.15  2003/11/23 22:14:32  markster
-/* Various warning cleanups
 /*
-/* Revision 1.14  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* mer feb 12 14:56:57 CET 2003
+/* Added LPC-10 2400bps codec
-/*
-/* Revision 1.2  2000/01/05 08:20:40  markster
-/* Some OSS fixes and a few lpc changes to make it actually work
 /*
  * Revision 1.2  1996/08/20  20:45:00  jaf
  * Removed all static local variables that were SAVE'd in the Fortran

libs/codec/lpc10/vparms.c

@@ -1,17 +1,14 @@
 /*
 
-$Log$
+$Log: vparms.c,v $
-Revision 1.15  2004/06/26 03:50:14  markster
+Revision 1.1  2004/05/04 11:16:43  csoutheren
-Merge source cleanups (bug #1911)
+Initial version
 
-Revision 1.14  2003/02/12 13:59:15  matteo
+Revision 1.2  2002/02/15 03:57:55  yurik
-mer feb 12 14:56:57 CET 2003
+Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 
-Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+Revision 1.1  2000/06/05 04:45:12  robertj
-mer feb 12 14:56:57 CET 2003
+Added LPC-10 2400bps codec
-
-Revision 1.2  2000/01/05 08:20:40  markster
-Some OSS fixes and a few lpc changes to make it actually work
 
  * Revision 1.1  1996/08/19  22:30:04  jaf
  * Initial revision
@@ -19,6 +16,10 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 */
 
+#ifdef P_R_O_T_O_T_Y_P_E_S
+extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__);
+#endif
+
 /*  -- translated by f2c (version 19951025).
    You must link the resulting object file with the libraries:
 	-lf2c -lm   (in that order)
@@ -26,10 +27,6 @@ Some OSS fixes and a few lpc changes to make it actually work
 
 #include "f2c.h"
 
-#ifdef P_R_O_T_O_T_Y_P_E_S
-extern int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real *ar_f__);
-#endif
-
 /* Table of constant values */
 
 static real c_b2 = 1.f;
@@ -38,18 +35,15 @@ static real c_b2 = 1.f;
 
 /* 	VPARMS Version 50 */
 
-/* $Log$
+/* $Log: vparms.c,v $
- * Revision 1.15  2004/06/26 03:50:14  markster
+/* Revision 1.1  2004/05/04 11:16:43  csoutheren
- * Merge source cleanups (bug #1911)
+/* Initial version
- *
-/* Revision 1.14  2003/02/12 13:59:15  matteo
-/* mer feb 12 14:56:57 CET 2003
 /*
-/* Revision 1.1.1.1  2003/02/12 13:59:15  matteo
+/* Revision 1.2  2002/02/15 03:57:55  yurik
-/* mer feb 12 14:56:57 CET 2003
+/* Warnings removed during compilation, patch courtesy of Jehan Bing, jehan@bravobrava.com
 /*
-/* Revision 1.2  2000/01/05 08:20:40  markster
+/* Revision 1.1  2000/06/05 04:45:12  robertj
-/* Some OSS fixes and a few lpc changes to make it actually work
+/* Added LPC-10 2400bps codec
 /*
  * Revision 1.1  1996/08/19  22:30:04  jaf
  * Initial revision