--- trunk/xvidcore/src/prediction/mbprediction.c 2002/06/12 20:38:41 195 +++ trunk/xvidcore/src/prediction/mbprediction.c 2002/09/21 03:11:36 499 @@ -1,53 +1,37 @@ - /****************************************************************************** - * * - * This file is part of XviD, a free MPEG-4 video encoder/decoder * - * * - * XviD 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. * - * * - * 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. * - * * - * XviD 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 * - * * - ******************************************************************************/ - - /****************************************************************************** - * * - * mbprediction.c * - * * - * Copyright (C) 2001 - Michael Militzer * - * Copyright (C) 2001 - Peter Ross * - * * - * For more information visit the XviD homepage: http://www.xvid.org * - * * - ******************************************************************************/ - - /****************************************************************************** - * * - * Revision history: * - * * - * 12.12.2001 improved calc_acdc_prediction; removed need for memcpy * - * 15.12.2001 moved pmv displacement to motion estimation * - * 30.11.2001 mmx cbp support * - * 17.11.2001 initial version * - * * - ******************************************************************************/ +/***************************************************************************** + * + * XVID MPEG-4 VIDEO CODEC + * - Prediction functions - + * + * 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 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: mbprediction.c,v 1.9 2002-09-21 03:07:56 suxen_drol Exp $ + * + ****************************************************************************/ #include "../encoder.h" #include "mbprediction.h" @@ -59,6 +43,10 @@ #define DIV_DIV(A,B) ( (A) > 0 ? ((A)+((B)>>1))/(B) : ((A)-((B)>>1))/(B) ) +/***************************************************************************** + * Local inlined function + ****************************************************************************/ + static int __inline rescale(int predict_quant, int current_quant, @@ -69,6 +57,10 @@ } +/***************************************************************************** + * Local data + ****************************************************************************/ + static const int16_t default_acdc_values[15] = { 1024, 0, 0, 0, 0, 0, 0, 0, @@ -76,6 +68,11 @@ }; +/***************************************************************************** + * Functions + ****************************************************************************/ + + /* get dc/ac prediction direction for a single block and place predictor values into MB->pred_values[j][..] */ @@ -90,8 +87,11 @@ int16_t qcoeff[64], uint32_t current_quant, int32_t iDcScaler, - int16_t predictors[8]) + int16_t predictors[8], + const int bound) + { + const int mbpos = (y * mb_width) + x; int16_t *left, *top, *diag, *current; int32_t left_quant = current_quant; @@ -111,7 +111,7 @@ // left macroblock - if (x && + if (x && mbpos >= bound + 1 && (pMBs[index - 1].mode == MODE_INTRA || pMBs[index - 1].mode == MODE_INTRA_Q)) { @@ -121,7 +121,7 @@ } // top macroblock - if (y && + if (mbpos >= bound + (int)mb_width && (pMBs[index - mb_width].mode == MODE_INTRA || pMBs[index - mb_width].mode == MODE_INTRA_Q)) { @@ -130,7 +130,7 @@ } // diag macroblock - if (x && y && + if (x && mbpos >= bound + (int)mb_width + 1 && (pMBs[index - 1 - mb_width].mode == MODE_INTRA || pMBs[index - 1 - mb_width].mode == MODE_INTRA_Q)) { @@ -241,6 +241,8 @@ int16_t *pCurrent = pMB->pred_values[block]; uint32_t i; + DPRINTF(DPRINTF_COEFF,"predictor[0] %i", predictors[0]); + dct_codes[0] += predictors[0]; // dc prediction pCurrent[0] = dct_codes[0] * iDcScaler; @@ -248,6 +250,8 @@ for (i = 1; i < 8; i++) { int level = dct_codes[i] + predictors[i]; + DPRINTF(DPRINTF_COEFF,"predictor[%i] %i",i, predictors[i]); + dct_codes[i] = level; pCurrent[i] = level; pCurrent[i + 7] = dct_codes[i * 8]; @@ -255,6 +259,7 @@ } else if (acpred_direction == 2) { for (i = 1; i < 8; i++) { int level = dct_codes[i * 8] + predictors[i]; + DPRINTF(DPRINTF_COEFF,"predictor[%i] %i",i*8, predictors[i]); dct_codes[i * 8] = level; pCurrent[i + 7] = level; @@ -379,7 +384,7 @@ iDcScaler = get_dc_scaler(iQuant, (j < 4) ? 1 : 0); predict_acdc(frame->mbs, x, y, mb_width, j, &qcoeff[j * 64], - iQuant, iDcScaler, predictors[j]); + iQuant, iDcScaler, predictors[j], 0); S += calc_acdc(pMB, j, &qcoeff[j * 64], iDcScaler, predictors[j]);