From fe3a80d6fabade4b7d13f83a18c0205c16dd7581 Mon Sep 17 00:00:00 2001 From: Vladimir Voroshilov Date: Sat, 23 Aug 2008 12:38:45 +0000 Subject: Move from g729.h all definitions which are used only in g729dec.c Originally committed as revision 14915 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/g729.h | 21 --------------------- libavcodec/g729data.h | 4 +++- libavcodec/g729dec.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 22 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/g729.h b/libavcodec/g729.h index 8202212..3192f9d 100644 --- a/libavcodec/g729.h +++ b/libavcodec/g729.h @@ -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 --git a/libavcodec/g729data.h b/libavcodec/g729data.h index 66dc4d3..5334e48 100644 --- a/libavcodec/g729data.h +++ b/libavcodec/g729data.h @@ -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 --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index 9870864..f00e597 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -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) -- cgit v1.1