X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fg729.h;h=9cae471bc2cc2989b08a2a3a33ec505a8d38f573;hb=88312a4de3708cdd8f0ca4121546ec882777b7fa;hp=820221299e346fe159e28af0b7798f6c76e88e24;hpb=5209846850a2b00dc1c52fd1afb6986edcdb4dd8;p=ffmpeg diff --git a/libavcodec/g729.h b/libavcodec/g729.h index 820221299e3..9cae471bc2c 100644 --- a/libavcodec/g729.h +++ b/libavcodec/g729.h @@ -2,51 +2,28 @@ * G.729 decoder * Copyright (c) 2008 Vladimir Voroshilov * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_G729_H -#define FFMPEG_G729_H - -#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 +#ifndef AVCODEC_G729_H +#define AVCODEC_G729_H /** - * maximum possible subframe size + * subframe size */ -#define MAX_SUBFRAME_SIZE 44 +#define SUBFRAME_SIZE 40 -#endif // FFMPEG_G729_H +#endif // AVCODEC_G729_H