Improving code conversion to publishable form.

033e6091 · Jean-Marc Valin · dc67fa9a · 033e6091 · 033e6091 · 033e6091
Commit 033e6091 authored Jun 05, 2009 by Jean-Marc Valin
--- a/doc/ietf/Makefile.ietf
+++ b/doc/ietf/Makefile.ietf
+CC = gcc
+CFLAGS = -c -O2 -g -Dfloat2int=rintf -DHAVE_CONFIG_H
+LIBS = -lm
+
+OBJS = bands.o celt.o cwrs.o entcode.o entdec.o entenc.o kiss_fft.o kiss_fftr.o laplace.o mdct.o modes.o pitch.o psy.o quant_bands.o rangedec.o rangeenc.o rate.o testcelt.o vq.o
+
+.c.o:
+	$(CC) $(CFLAGS) $<
+
+testcelt: $(OBJS)
+	$(CC) -o $@ $(OBJS) $(LIBS)
+
+clean:
+	rm -f testcelt *.o
--- a/doc/ietf/arch.h
+++ b/doc/ietf/arch.h
@@ -48,9 +48,6 @@
 #define celt_assert2(cond, message)
 #endif

-#define IMUL32(a,b) ((a)*(b))
-#define UMUL32(a,b) ((celt_int32_t)(a)*(celt_int32_t)(b))
-#define UMUL16_16(a,b) ((celt_int32_t)(a)*(celt_int32_t)(b))

 #define ABS(x) ((x) < 0 ? (-(x)) : (x))      /**< Absolute integer value. */
 #define ABS16(x) ((x) < 0 ? (-(x)) : (x))    /**< Absolute 16-bit value.  */
@@ -61,179 +58,11 @@
 #define MAX32(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum 32-bit value.   */
 #define IMIN(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum int value.   */
 #define IMAX(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum int value.   */
-#define UADD32(a,b) ((a)+(b))
-#define USUB32(a,b) ((a)-(b))

-#define PRINT_MIPS(file)
-
-#ifdef FIXED_POINT
-
-typedef celt_int16_t float;
-typedef celt_int32_t float;
-
-typedef float float;
-typedef float float;
-typedef float float;
-typedef float float;
-typedef float float;
-
-#define Q15ONE 32767
-#define Q30ONE 1073741823
-
-#define SIG_SHIFT 12
-
-#define NORM_SCALING 16384
-#define NORM_SCALING_1 (1.f/16384.f)
-#define NORM_SHIFT 14
-
-#define ENER_SCALING 16384.f
-#define ENER_SCALING_1 (1.f/16384.f)
-#define ENER_SHIFT 14
-
-#define PGAIN_SCALING 32768.f
-#define PGAIN_SCALING_1 (1.f/32768.f)
-#define PGAIN_SHIFT 15
-
-#define DB_SCALING 256.f
-#define DB_SCALING_1 (1.f/256.f)
-
-#define EPSILON 1
-#define VERY_SMALL 0
-#define VERY_LARGE32 ((celt_word32_t)2147483647)
-#define VERY_LARGE16 ((celt_word16_t)32767)
-#define Q15_ONE ((celt_word16_t)32767)
-#define Q15_ONE_1 (1.f/32768.f)
-
-#define SCALEIN(a)	(a)
-#define SCALEOUT(a)	(a)
-
-#ifdef FIXED_DEBUG
-#include "fixed_debug.h"
-#else
-
-#include "fixed_generic.h"
-
-#ifdef ARM5E_ASM
-#include "fixed_arm5e.h"
-#elif defined (ARM4_ASM)
-#include "fixed_arm4.h"
-#elif defined (BFIN_ASM)
-#include "fixed_bfin.h"
-#elif defined (TI_C5X_ASM)
-#include "fixed_c5x.h"
-#elif defined (TI_C6X_ASM)
-#include "fixed_c6x.h"
-#endif
-
-#endif
-
-
-#else /* FIXED_POINT */
-
-
-
-#define Q15ONE 1.0f
-#define Q30ONE 1.0f
-
-#define NORM_SCALING 1.f
-#define NORM_SCALING_1 1.f
-#define ENER_SCALING 1.f
-#define ENER_SCALING_1 1.f
-#define PGAIN_SCALING 1.f
-#define PGAIN_SCALING_1 1.f
-
-#define DB_SCALING 1.f
-#define DB_SCALING_1 1.f
-
-#define EPSILON 1e-15f
-#define VERY_SMALL 1e-15f
-#define VERY_LARGE32 1e15f
-#define VERY_LARGE16 1e15f
-#define Q15_ONE ((celt_word16_t)1.f)
-#define Q15_ONE_1 ((celt_word16_t)1.f)
-
-#define QCONST16(x,bits) (x)
-#define QCONST32(x,bits) (x)
-
-#define NEG16(x) (-(x))
-#define NEG32(x) (-(x))
-#define EXTRACT16(x) (x)
-#define EXTEND32(x) (x)
-#define SHR16(a,shift) (a)
-#define SHL16(a,shift) (a)
-#define SHR32(a,shift) (a)
-#define SHL32(a,shift) (a)
-#define PSHR16(a,shift) (a)
-#define PSHR32(a,shift) (a)
-#define VSHR32(a,shift) (a)
-#define SATURATE16(x,a) (x)
-#define SATURATE32(x,a) (x)
-
-#define PSHR(a,shift)   (a)
-#define SHR(a,shift)    (a)
-#define SHL(a,shift)    (a)
-#define SATURATE(x,a)   (x)
-
-#define ROUND16(a,shift)  (a)
-#define HALF32(x)       (.5f*(x))
-
-#define ADD16(a,b) ((a)+(b))
-#define SUB16(a,b) ((a)-(b))
-#define ADD32(a,b) ((a)+(b))
-#define SUB32(a,b) ((a)-(b))
-#define MULT16_16_16(a,b)     ((a)*(b))
-#define MULT16_16(a,b)     ((celt_word32_t)(a)*(celt_word32_t)(b))
-#define MAC16_16(c,a,b)     ((c)+(celt_word32_t)(a)*(celt_word32_t)(b))
-
-#define MULT16_32_Q11(a,b)     ((a)*(b))
-#define MULT16_32_Q13(a,b)     ((a)*(b))
-#define MULT16_32_Q14(a,b)     ((a)*(b))
-#define MULT16_32_Q15(a,b)     ((a)*(b))
-#define MULT16_32_Q16(a,b)     ((a)*(b))
-#define MULT16_32_P15(a,b)     ((a)*(b))
-
-#define MULT32_32_Q31(a,b)     ((a)*(b))
-
-#define MAC16_32_Q11(c,a,b)     ((c)+(a)*(b))
-#define MAC16_32_Q15(c,a,b)     ((c)+(a)*(b))
-
-#define MAC16_16_Q11(c,a,b)     ((c)+(a)*(b))
-#define MAC16_16_Q13(c,a,b)     ((c)+(a)*(b))
-#define MAC16_16_P13(c,a,b)     ((c)+(a)*(b))
-#define MULT16_16_Q11_32(a,b)     ((a)*(b))
-#define MULT16_16_Q13(a,b)     ((a)*(b))
-#define MULT16_16_Q14(a,b)     ((a)*(b))
-#define MULT16_16_Q15(a,b)     ((a)*(b))
-#define MULT16_16_P15(a,b)     ((a)*(b))
-#define MULT16_16_P13(a,b)     ((a)*(b))
-#define MULT16_16_P14(a,b)     ((a)*(b))
-
-#define DIV32_16(a,b)     (((celt_word32_t)(a))/(celt_word16_t)(b))
-#define PDIV32_16(a,b)     (((celt_word32_t)(a))/(celt_word16_t)(b))
-#define DIV32(a,b)     (((celt_word32_t)(a))/(celt_word32_t)(b))
-#define PDIV32(a,b)     (((celt_word32_t)(a))/(celt_word32_t)(b))

 #define SCALEIN(a)	((a)*CELT_SIG_SCALE)
 #define SCALEOUT(a)	((a)*(1/CELT_SIG_SCALE))

-#endif /* !FIXED_POINT */
-
-
-#if defined (CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
-
-/* 2 on TI C5x DSP */
-#define BYTES_PER_CHAR 2
-#define BITS_PER_CHAR 16
-#define LOG2_BITS_PER_CHAR 4
-
-#else /* CONFIG_TI_C54X */
-
-#define BYTES_PER_CHAR 1
-#define BITS_PER_CHAR 8
-#define LOG2_BITS_PER_CHAR 3
-
-#endif /* !CONFIG_TI_C54X */
-
 #ifndef GLOBAL_STACK_SIZE
 #ifdef FIXED_POINT
 #define GLOBAL_STACK_SIZE 25000

--- a/doc/ietf/convert_source.sh
+++ b/doc/ietf/convert_source.sh
@@ -28,11 +28,14 @@ cat tata.c > source/$i

 done

-cat arch.h > source/arch.h
-cat celt_types.h > source/celt_types.h
-cat config.h > source/config.h
+cp arch.h source/arch.h
+cp celt_types.h source/celt_types.h
+cp config.h source/config.h
+cp Makefile.ietf source/Makefile
+
 rm source/mfrng*.c
 rm source/dump_modes*
 rm source/header*
 rm source/fixed*
+rm source/tata.c

--- a/doc/ietf/substitutions.h
+++ b/doc/ietf/substitutions.h
-#define celt_fatal(str) _celt_fatal(str, __FILE__, __LINE__);
-#define celt_assert(cond)
-#define celt_assert2(cond, message)
 #define IMUL32(a,b) ((a)*(b))
-//#define ABS(x) ((x) < 0 ? (-(x)) : (x))      /**< Absolute integer value. */
-//#define ABS16(x) ((x) < 0 ? (-(x)) : (x))    /**< Absolute 16-bit value.  */
-//#define MIN16(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum 16-bit value.   */
-//#define MAX16(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum 16-bit value.   */
-//#define ABS32(x) ((x) < 0 ? (-(x)) : (x))    /**< Absolute 32-bit value.  */
-//#define MIN32(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum 32-bit value.   */
-//#define MAX32(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum 32-bit value.   */
-//#define IMIN(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum int value.   */
-//#define IMAX(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum int value.   */
-//#define UADD32(a,b) ((a)+(b))
-//#define USUB32(a,b) ((a)-(b))
-#define PRINT_MIPS(file)
-
-//#define celt_int16_t short
-//#define celt_int32_t int
-//#define celt_uint16_t unsigned short
-//#define celt_uint32_t unsigned int
-//#define celt_int64_t long long
+#define UMUL32(a,b) ((a)*(b))
+#define UMUL16_16(a,b) ((a)*(b))

 #define celt_word16_t float
 #define celt_word32_t float
@@ -30,6 +11,9 @@
 #define celt_pgain_t float
 #define celt_mask_t float

+#define UADD32(a,b) ((a)+(b))
+#define USUB32(a,b) ((a)-(b))
+

 #define Q15ONE 1.0f
 #define Q30ONE 1.0f
@@ -48,8 +32,8 @@
 #define VERY_SMALL 1e-15f
 #define VERY_LARGE32 1e15f
 #define VERY_LARGE16 1e15f
-#define Q15_ONE ((celt_word16_t)1.f)
-#define Q15_ONE_1 ((celt_word16_t)1.f)
+#define Q15_ONE 1.f
+#define Q15_ONE_1 1.f

 #define QCONST16(x,bits) (x)
 #define QCONST32(x,bits) (x)
@@ -81,8 +65,8 @@
 #define ADD32(a,b) ((a)+(b))
 #define SUB32(a,b) ((a)-(b))
 #define MULT16_16_16(a,b)     ((a)*(b))
-#define MULT16_16(a,b)     ((celt_word32_t)(a)*(celt_word32_t)(b))
-#define MAC16_16(c,a,b)     ((c)+(celt_word32_t)(a)*(celt_word32_t)(b))
+#define MULT16_16(a,b)     ((a)*(b))
+#define MAC16_16(c,a,b)     ((c)+(a)*(b))

 #define MULT16_32_Q11(a,b)     ((a)*(b))
 #define MULT16_32_Q13(a,b)     ((a)*(b))
@@ -107,7 +91,9 @@
 #define MULT16_16_P13(a,b)     ((a)*(b))
 #define MULT16_16_P14(a,b)     ((a)*(b))

-#define DIV32_16(a,b)     (((celt_word32_t)(a))/(celt_word16_t)(b))
-#define PDIV32_16(a,b)     (((celt_word32_t)(a))/(celt_word16_t)(b))
-#define DIV32(a,b)     (((celt_word32_t)(a))/(celt_word32_t)(b))
-#define PDIV32(a,b)     (((celt_word32_t)(a))/(celt_word32_t)(b))
+#define DIV32_16(a,b)     ((a)/(b))
+#define PDIV32_16(a,b)     ((a)/(b))
+#define DIV32(a,b)     ((a)/(b))
+#define PDIV32(a,b)     ((a)/(b))
+
+#define PRINT_MIPS(x)
\ No newline at end of file