changeset 81:e0e53bfe1a8a

libgsmefr: pitch_f6.c compiles
author Mychaela Falconia <falcon@freecalypso.org>
date Sat, 26 Nov 2022 07:06:02 +0000
parents 92479d9a8e38
children 509ba99f5136
files libgsmefr/Makefile libgsmefr/pitch_f6.c
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libgsmefr/Makefile	Sat Nov 26 07:01:58 2022 +0000
+++ b/libgsmefr/Makefile	Sat Nov 26 07:06:02 2022 +0000
@@ -4,8 +4,8 @@
 	d1035pf.o d_gains.o d_homing.o d_plsf_5.o dec_12k2.o dec_create.o \
 	dec_lag6.o dtx.o e_homing.o enc_create.o enc_lag6.o frame2params.o \
 	g_code.o g_pitch.o int_lpc.o inter_6.o inv_sqrt.o lag_wind.o levinson.o\
-	log2.o lsp_az.o lsp_lsf.o oper_32b.o params2frame.o sid_class.o \
-	sid_insert.o tls_flags.o
+	log2.o lsp_az.o lsp_lsf.o oper_32b.o params2frame.o pitch_f6.o \
+	sid_class.o sid_insert.o tls_flags.o
 HDRS=	basic_op.h cnst.h codec.h d_homing.h dec_state.h dtx.h e_homing.h \
 	enc_state.h gains_tb.h gsm_efr.h memops.h namespace.h no_count.h \
 	oper_32b.h sig_proc.h typedef.h vad.h
--- a/libgsmefr/pitch_f6.c	Sat Nov 26 07:01:58 2022 +0000
+++ b/libgsmefr/pitch_f6.c	Sat Nov 26 07:06:02 2022 +0000
@@ -14,10 +14,12 @@
  *
  *************************************************************************/
 
+#include "gsm_efr.h"
 #include "typedef.h"
+#include "namespace.h"
 #include "basic_op.h"
 #include "oper_32b.h"
-#include "count.h"
+#include "no_count.h"
 #include "sig_proc.h"
 #include "codec.h"
 
@@ -27,8 +29,8 @@
 
  /* Local functions */
 
-void Norm_Corr (Word16 exc[], Word16 xn[], Word16 h[], Word16 L_subfr,
-                Word16 t_min, Word16 t_max, Word16 corr_norm[]);
+static void Norm_Corr (Word16 exc[], Word16 xn[], Word16 h[], Word16 L_subfr,
+                       Word16 t_min, Word16 t_max, Word16 corr_norm[]);
 
 Word16 Pitch_fr6 (    /* (o)     : pitch period.                          */
     Word16 exc[],     /* (i)     : excitation buffer                      */
@@ -130,7 +132,7 @@
  *
  *************************************************************************/
 
-void 
+static void
 Norm_Corr (Word16 exc[], Word16 xn[], Word16 h[], Word16 L_subfr,
            Word16 t_min, Word16 t_max, Word16 corr_norm[])
 {