From b2c4ee5a6a94e4f5e800691a59532c6eaf3dcd31 Mon Sep 17 00:00:00 2001 From: voroshil <voroshil@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b> Date: Sat, 23 Aug 2008 12:38:45 +0000 Subject: [PATCH] Move from g729.h all definitions which are used only in g729dec.c git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14915 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- libavcodec/g729.h | 21 --------------------- libavcodec/g729data.h | 4 +++- libavcodec/g729dec.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/libavcodec/g729.h b/libavcodec/g729.h index 820221299..3192f9d92 100644 --- a/libavcodec/g729.h +++ b/libavcodec/g729.h @@ -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 */ diff --git a/libavcodec/g729data.h b/libavcodec/g729data.h index 66dc4d3ce..5334e4809 100644 --- a/libavcodec/g729data.h +++ b/libavcodec/g729data.h @@ -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 diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index 987086453..f00e59786 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -30,6 +30,24 @@ #include "libavutil/avutil.h" #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 */ -- 2.25.4