--- mbcoding.h 2003/02/15 15:22:18 1.11 +++ mbcoding.h 2004/03/22 22:36:23 1.12 @@ -1,3 +1,28 @@ +/***************************************************************************** + * + * XVID MPEG-4 VIDEO CODEC + * - MB coding header - + * + * Copyright (C) 2002 Michael Militzer + * + * This program is free software ; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation ; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program ; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id: mbcoding.h,v 1.12 2004/03/22 22:36:23 edgomez Exp $ + * + ****************************************************************************/ + #ifndef _MB_CODING_H_ #define _MB_CODING_H_ @@ -34,27 +59,22 @@ int direction); -void MBCodingBVOP(const MACROBLOCK * mb, +void MBCodingBVOP(const FRAMEINFO * const frame, + const MACROBLOCK * mb, const int16_t qcoeff[6 * 64], const int32_t fcode, const int32_t bcode, Bitstream * bs, - Statistics * pStat, - int alternate_scan); + Statistics * pStat); static __inline void MBSkip(Bitstream * bs) { - BitstreamPutBit(bs, 1); // not coded + BitstreamPutBit(bs, 1); /* not coded */ } - -#ifdef BIGLUT -extern VLC *intra_table; -int CodeCoeff_CalcBits(const int16_t qcoeff[64], VLC * table, const uint16_t * zigzag, uint16_t intra); -#else int CodeCoeffIntra_CalcBits(const int16_t qcoeff[64], const uint16_t * zigzag); -#endif +int CodeCoeffInter_CalcBits(const int16_t qcoeff[64], const uint16_t * zigzag); #endif /* _MB_CODING_H_ */