--- trunk/xvidcore/src/prediction/mbprediction.c 2002/09/21 03:11:36 499 +++ trunk/xvidcore/src/prediction/mbprediction.c 2002/11/26 23:44:11 677 @@ -6,17 +6,10 @@ * Copyright(C) 2001-2002 - Michael Militzer * Copyright(C) 2001-2002 - Peter Ross * - * 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 +22,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: mbprediction.c,v 1.9 2002-09-21 03:07:56 suxen_drol 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: mbprediction.c,v 1.11 2002-11-26 23:44:11 edgomez Exp $ * ****************************************************************************/ @@ -101,15 +123,15 @@ const int16_t *pTop = default_acdc_values; const int16_t *pDiag = default_acdc_values; - uint32_t index = x + y * mb_width; // current macroblock + uint32_t index = x + y * mb_width; /* current macroblock */ int *acpred_direction = &pMBs[index].acpred_directions[block]; uint32_t i; left = top = diag = current = 0; - // grab left,top and diag macroblocks + /* grab left,top and diag macroblocks */ - // left macroblock + /* left macroblock */ if (x && mbpos >= bound + 1 && (pMBs[index - 1].mode == MODE_INTRA || @@ -117,9 +139,9 @@ left = pMBs[index - 1].pred_values[0]; left_quant = pMBs[index - 1].quant; - //DEBUGI("LEFT", *(left+MBPRED_SIZE)); + /*DEBUGI("LEFT", *(left+MBPRED_SIZE)); */ } - // top macroblock + /* top macroblock */ if (mbpos >= bound + (int)mb_width && (pMBs[index - mb_width].mode == MODE_INTRA || @@ -128,7 +150,7 @@ top = pMBs[index - mb_width].pred_values[0]; top_quant = pMBs[index - mb_width].quant; } - // diag macroblock + /* diag macroblock */ if (x && mbpos >= bound + (int)mb_width + 1 && (pMBs[index - 1 - mb_width].mode == MODE_INTRA || @@ -139,7 +161,7 @@ current = pMBs[index].pred_values[0]; - // now grab pLeft, pTop, pDiag _blocks_ + /* now grab pLeft, pTop, pDiag _blocks_ */ switch (block) { @@ -206,17 +228,17 @@ break; } - // determine ac prediction direction & ac/dc predictor - // place rescaled ac/dc predictions into predictors[] for later use + /* determine ac prediction direction & ac/dc predictor */ + /* place rescaled ac/dc predictions into predictors[] for later use */ if (ABS(pLeft[0] - pDiag[0]) < ABS(pDiag[0] - pTop[0])) { - *acpred_direction = 1; // vertical + *acpred_direction = 1; /* vertical */ predictors[0] = DIV_DIV(pTop[0], iDcScaler); for (i = 1; i < 8; i++) { predictors[i] = rescale(top_quant, current_quant, pTop[i]); } } else { - *acpred_direction = 2; // horizontal + *acpred_direction = 2; /* horizontal */ predictors[0] = DIV_DIV(pLeft[0], iDcScaler); for (i = 1; i < 8; i++) { predictors[i] = rescale(left_quant, current_quant, pLeft[i + 7]); @@ -243,7 +265,7 @@ DPRINTF(DPRINTF_COEFF,"predictor[0] %i", predictors[0]); - dct_codes[0] += predictors[0]; // dc prediction + dct_codes[0] += predictors[0]; /* dc prediction */ pCurrent[0] = dct_codes[0] * iDcScaler; if (acpred_direction == 1) { @@ -275,8 +297,8 @@ -// ****************************************************************** -// ****************************************************************** +/* ****************************************************************** */ +/* ****************************************************************** */ /* encoder: subtract predictors from qcoeff[] and calculate S1/S2 @@ -322,7 +344,7 @@ S1 += ABS(level); predictors[i] = level; } - } else // acpred_direction == 2 + } else /* acpred_direction == 2 */ { for (i = 1; i < 8; i++) { int16_t level; @@ -390,7 +412,7 @@ } - if (S < 0) // dont predict + if (S < 0) /* dont predict */ { for (j = 0; j < 6; j++) { pMB->acpred_directions[j] = 0;