# HG changeset patch # User voroshil # Date 1219495125 0 # Node ID bdb1bdcd4cd0b3d08eef1e25b2cf913703dd94fa # Parent ce3402b964cddaf246506e805aed3e440bed0fea Move from g729.h all definitions which are used only in g729dec.c diff -r ce3402b964cd -r bdb1bdcd4cd0 g729.h --- 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 -/// 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 */ diff -r ce3402b964cd -r bdb1bdcd4cd0 g729data.h --- 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 -#include "g729.h" + +/// Moving Average (MA) prediction order +#define MA_NP 4 /** * first stage LSP codebook diff -r ce3402b964cd -r bdb1bdcd4cd0 g729dec.c --- 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)