Move struct and func definition to codec_internal.h.

svn path=/trunk/vorbis/; revision=13575

diff --git a/lib/codec_internal.h b/lib/codec_internal.h
index 02cfd24..8f5b333 100644 (file)
--- a/lib/codec_internal.h
+++ b/lib/codec_internal.h
@@ -133,5 +133,36 @@ typedef struct codec_setup_info {
 extern vorbis_look_psy_global *_vp_global_look(vorbis_info *vi);
 extern void _vp_global_free(vorbis_look_psy_global *look);
 
+
+
+typedef struct {
+  int sorted_index[VIF_POSIT+2];
+  int forward_index[VIF_POSIT+2];
+  int reverse_index[VIF_POSIT+2];
+  
+  int hineighbor[VIF_POSIT];
+  int loneighbor[VIF_POSIT];
+  int posts;
+
+  int n;
+  int quant_q;
+  vorbis_info_floor1 *vi;
+
+  long phrasebits;
+  long postbits;
+  long frames;
+} vorbis_look_floor1;
+
+
+
+extern int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look,
+                         const float *logmdct,   /* in */
+                         const float *logmask);
+extern int *floor1_interpolate_fit(vorbis_block *vb,vorbis_look_floor1 *look,
+                         int *A,int *B,
+                         int del);
+extern int floor1_encode(oggpack_buffer *opb,vorbis_block *vb,
+                 vorbis_look_floor1 *look,
+                 int *post,int *ilogmask);
 #endif
 

diff --git a/lib/floor1.c b/lib/floor1.c
index f30227c..649e3ee 100644 (file)
--- a/lib/floor1.c
+++ b/lib/floor1.c
@@ -30,24 +30,6 @@
 
 #define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */
 
-typedef struct {
-  int sorted_index[VIF_POSIT+2];
-  int forward_index[VIF_POSIT+2];
-  int reverse_index[VIF_POSIT+2];
-  
-  int hineighbor[VIF_POSIT];
-  int loneighbor[VIF_POSIT];
-  int posts;
-
-  int n;
-  int quant_q;
-  vorbis_info_floor1 *vi;
-
-  long phrasebits;
-  long postbits;
-  long frames;
-} vorbis_look_floor1;
-
 typedef struct lsfit_acc{
   long x0;
   long x1;

diff --git a/lib/mapping0.c b/lib/mapping0.c
index b9258d0..e0662fa 100644 (file)
--- a/lib/mapping0.c
+++ b/lib/mapping0.c
@@ -229,16 +229,6 @@ static float FLOOR1_fromdB_LOOKUP[256]={
 
 #endif 
 
-extern int *floor1_fit(vorbis_block *vb,vorbis_look_floor *look,
-                      const float *logmdct,   /* in */
-                      const float *logmask);
-extern int *floor1_interpolate_fit(vorbis_block *vb,vorbis_look_floor *look,
-                                  int *A,int *B,
-                                  int del);
-extern int floor1_encode(oggpack_buffer *opb,vorbis_block *vb,
-                        vorbis_look_floor *look,
-                        int *post,int *ilogmask);
-
 
 static int mapping0_forward(vorbis_block *vb){
   vorbis_dsp_state      *vd=vb->vd;