[xiph-commits] r13575 - trunk/vorbis/lib

[erikd at svn.xiph.org]

Author: erikd
Date: 2007-08-20 02:56:50 -0700 (Mon, 20 Aug 2007)
New Revision: 13575

Modified:
   trunk/vorbis/lib/codec_internal.h
   trunk/vorbis/lib/floor1.c
   trunk/vorbis/lib/mapping0.c
Log:
Move struct and func definition to codec_internal.h.

Modified: trunk/vorbis/lib/codec_internal.h
===================================================================
--- trunk/vorbis/lib/codec_internal.h	2007-08-20 09:30:49 UTC (rev 13574)
+++ trunk/vorbis/lib/codec_internal.h	2007-08-20 09:56:50 UTC (rev 13575)
@@ -133,5 +133,36 @@
 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
 

Modified: trunk/vorbis/lib/floor1.c
===================================================================
--- trunk/vorbis/lib/floor1.c	2007-08-20 09:30:49 UTC (rev 13574)
+++ trunk/vorbis/lib/floor1.c	2007-08-20 09:56:50 UTC (rev 13575)
@@ -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;

Modified: trunk/vorbis/lib/mapping0.c
===================================================================
--- trunk/vorbis/lib/mapping0.c	2007-08-20 09:30:49 UTC (rev 13574)
+++ trunk/vorbis/lib/mapping0.c	2007-08-20 09:56:50 UTC (rev 13575)
@@ -229,17 +229,7 @@
 
 #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;
   vorbis_info           *vi=vd->vi;