--- mbtransquant.c 2002/09/05 21:44:11 1.12 +++ mbtransquant.c 2002/11/26 23:44:11 1.20 @@ -3,20 +3,15 @@ * XVID MPEG-4 VIDEO CODEC * - MacroBlock transfer and quantization - * - * Copyright(C) 2002-2001 Michael Militzer - * 2002-2001 Peter Ross + * Copyright(C) 2002-2001 Christoph Lampert + * 2002-2001 Michael Militzer + * 2002-2001 Peter Ross + * 2002 Daniel Smith * - * This program is an implementation of a part of one or more MPEG-4 - * Video tools as specified in ISO/IEC 14496-2 standard. Those intending - * to use this software module in hardware or software products are - * advised that its use may infringe existing patents or copyrights, and - * any such use would be at such party's own risk. The original - * developer of this software module and his/her company, and subsequent - * editors and their companies, will have no liability for use of this - * software or modifications or derivatives thereof. + * This file is part of XviD, a free MPEG-4 video encoder/decoder * - * 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 + * XviD 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. * @@ -29,7 +24,36 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: mbtransquant.c,v 1.12 2002/09/05 21:44:11 edgomez Exp $ + * Under section 8 of the GNU General Public License, the copyright + * holders of XVID explicitly forbid distribution in the following + * countries: + * + * - Japan + * - United States of America + * + * Linking XviD statically or dynamically with other modules is making a + * combined work based on XviD. Thus, the terms and conditions of the + * GNU General Public License cover the whole combination. + * + * As a special exception, the copyright holders of XviD give you + * permission to link XviD with independent modules that communicate with + * XviD solely through the VFW1.1 and DShow interfaces, regardless of the + * license terms of these independent modules, and to copy and distribute + * the resulting combined work under terms of your choice, provided that + * every copy of the combined work is accompanied by a complete copy of + * the source code of XviD (the version of XviD used to produce the + * combined work), being distributed under the terms of the GNU General + * Public License plus this exception. An independent module is a module + * which is not derived from or based on XviD. + * + * Note that people who make modified versions of XviD are not obligated + * to grant this special exception for their modified versions; it is + * their choice whether to do so. The GNU General Public License gives + * permission to release a modified version without this exception; this + * exception also makes it possible to release a modified version which + * carries forward this exception. + * + * $Id: mbtransquant.c,v 1.20 2002/11/26 23:44:11 edgomez Exp $ * ****************************************************************************/ @@ -364,8 +388,8 @@ MBQuantIntra(const MBParam * pParam, FRAMEINFO * frame, MACROBLOCK *pMB, - int16_t qcoeff[6 * 64], - int16_t data[6*64]) + int16_t data[6 * 64], + int16_t qcoeff[6 * 64]) { int i; int iQuant = frame->quant; @@ -438,7 +462,7 @@ stop_quant_timer(); } - if (sum >= TOOSMALL_LIMIT) { // skip block ? + if (sum >= TOOSMALL_LIMIT) { /* skip block ? */ cbp |= 1 << (5 - i); } } @@ -598,11 +622,11 @@ } } - if (frame > field) { + if (frame > (field + 350)) { MBFrameToField(data); } - return (frame > field); + return (frame > (field + 350)); } @@ -618,26 +642,26 @@ /* left blocks */ - // 1=2, 2=4, 4=8, 8=1 + /* 1=2, 2=4, 4=8, 8=1 */ MOVLINE(tmp, LINE(0, 1)); MOVLINE(LINE(0, 1), LINE(0, 2)); MOVLINE(LINE(0, 2), LINE(0, 4)); MOVLINE(LINE(0, 4), LINE(2, 0)); MOVLINE(LINE(2, 0), tmp); - // 3=6, 6=12, 12=9, 9=3 + /* 3=6, 6=12, 12=9, 9=3 */ MOVLINE(tmp, LINE(0, 3)); MOVLINE(LINE(0, 3), LINE(0, 6)); MOVLINE(LINE(0, 6), LINE(2, 4)); MOVLINE(LINE(2, 4), LINE(2, 1)); MOVLINE(LINE(2, 1), tmp); - // 5=10, 10=5 + /* 5=10, 10=5 */ MOVLINE(tmp, LINE(0, 5)); MOVLINE(LINE(0, 5), LINE(2, 2)); MOVLINE(LINE(2, 2), tmp); - // 7=14, 14=13, 13=11, 11=7 + /* 7=14, 14=13, 13=11, 11=7 */ MOVLINE(tmp, LINE(0, 7)); MOVLINE(LINE(0, 7), LINE(2, 6)); MOVLINE(LINE(2, 6), LINE(2, 5)); @@ -646,26 +670,26 @@ /* right blocks */ - // 1=2, 2=4, 4=8, 8=1 + /* 1=2, 2=4, 4=8, 8=1 */ MOVLINE(tmp, LINE(1, 1)); MOVLINE(LINE(1, 1), LINE(1, 2)); MOVLINE(LINE(1, 2), LINE(1, 4)); MOVLINE(LINE(1, 4), LINE(3, 0)); MOVLINE(LINE(3, 0), tmp); - // 3=6, 6=12, 12=9, 9=3 + /* 3=6, 6=12, 12=9, 9=3 */ MOVLINE(tmp, LINE(1, 3)); MOVLINE(LINE(1, 3), LINE(1, 6)); MOVLINE(LINE(1, 6), LINE(3, 4)); MOVLINE(LINE(3, 4), LINE(3, 1)); MOVLINE(LINE(3, 1), tmp); - // 5=10, 10=5 + /* 5=10, 10=5 */ MOVLINE(tmp, LINE(1, 5)); MOVLINE(LINE(1, 5), LINE(3, 2)); MOVLINE(LINE(3, 2), tmp); - // 7=14, 14=13, 13=11, 11=7 + /* 7=14, 14=13, 13=11, 11=7 */ MOVLINE(tmp, LINE(1, 7)); MOVLINE(LINE(1, 7), LINE(3, 6)); MOVLINE(LINE(3, 6), LINE(3, 5));