changeset 7668:bdb1bdcd4cd0 libavcodec

Move from g729.h all definitions which are used only in g729dec.c
author voroshil
date Sat, 23 Aug 2008 12:38:45 +0000
parents ce3402b964cd
children 700d8267095a
files g729.h g729data.h g729dec.c
diffstat 3 files changed, 21 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/g729.h	Sat Aug 23 03:30:08 2008 +0000
+++ b/g729.h	Sat Aug 23 12:38:45 2008 +0000
@@ -23,27 +23,6 @@
 
 #include <stdint.h>
 
-/// Moving Average (MA) prediction order
-#define MA_NP                      4
-
-/**
- * minimum quantized LSF value (3.2.4)
- * 0.005 in Q13
- */
-#define LSFQ_MIN                   40
-
-/**
- * maximum quantized LSF value (3.2.4)
- * 3.135 in Q13
- */
-#define LSFQ_MAX                   25681
-
-/**
- * minimum LSF distance (3.2.4)
- * 0.0391 in Q13
- */
-#define LSFQ_DIFF_MIN              321
-
 /**
  * maximum possible subframe size
  */
--- a/g729data.h	Sat Aug 23 03:30:08 2008 +0000
+++ b/g729data.h	Sat Aug 23 12:38:45 2008 +0000
@@ -23,7 +23,9 @@
 #define FFMPEG_G729DATA_H
 
 #include <stdint.h>
-#include "g729.h"
+
+/// Moving Average (MA) prediction order
+#define MA_NP                      4
 
 /**
  * first stage LSP codebook
--- a/g729dec.c	Sat Aug 23 03:30:08 2008 +0000
+++ b/g729dec.c	Sat Aug 23 12:38:45 2008 +0000
@@ -31,6 +31,24 @@
 #include "bitstream.h"
 
 /**
+ * minimum quantized LSF value (3.2.4)
+ * 0.005 in Q13
+ */
+#define LSFQ_MIN                   40
+
+/**
+ * maximum quantized LSF value (3.2.4)
+ * 3.135 in Q13
+ */
+#define LSFQ_MAX                   25681
+
+/**
+ * minimum LSF distance (3.2.4)
+ * 0.0391 in Q13
+ */
+#define LSFQ_DIFF_MIN              321
+
+/**
  * \brief pseudo random number generator
  */
 static inline uint16_t g729_random(uint16_t value)