[svn] / trunk / xvidcore / src / prediction / mbprediction.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/prediction/mbprediction.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 248, Fri Jun 28 15:14:40 2002 UTC revision 652, Sun Nov 17 00:35:33 2002 UTC
# Line 1  Line 1 
1   /******************************************************************************  /*****************************************************************************
2    *                                                                            *   *
3    *  This file is part of XviD, a free MPEG-4 video encoder/decoder            *   *  XVID MPEG-4 VIDEO CODEC
4    *                                                                            *   *  - Prediction functions -
5    *  XviD is an implementation of a part of one or more MPEG-4 Video tools     *   *
6    *  as specified in ISO/IEC 14496-2 standard.  Those intending to use this    *   *  Copyright(C) 2001-2002 - Michael Militzer <isibaar@xvid.org>
7    *  software module in hardware or software products are advised that its     *   *  Copyright(C) 2001-2002 - Peter Ross <pross@xvid.org>
8    *  use may infringe existing patents or copyrights, and any such use         *   *
9    *  would be at such party's own risk.  The original developer of this        *   *  This file is part of XviD, a free MPEG-4 video encoder/decoder
10    *  software module and his/her company, and subsequent editors and their     *   *
11    *  companies, will have no liability for use of this software or             *   *  XviD is free software; you can redistribute it and/or modify it
12    *  modifications or derivatives thereof.                                     *   *  under the terms of the GNU General Public License as published by
13    *                                                                            *   *  the Free Software Foundation; either version 2 of the License, or
14    *  XviD is free software; you can redistribute it and/or modify it           *   *  (at your option) any later version.
15    *  under the terms of the GNU General Public License as published by         *   *
16    *  the Free Software Foundation; either version 2 of the License, or         *   *  This program is distributed in the hope that it will be useful,
17    *  (at your option) any later version.                                       *   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
18    *                                                                            *   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
19    *  XviD is distributed in the hope that it will be useful, but               *   *  GNU General Public License for more details.
20    *  WITHOUT ANY WARRANTY; without even the implied warranty of                *   *
21    *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *   *  You should have received a copy of the GNU General Public License
22    *  GNU General Public License for more details.                              *   *  along with this program; if not, write to the Free Software
23    *                                                                            *   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
24    *  You should have received a copy of the GNU General Public License         *   *
25    *  along with this program; if not, write to the Free Software               *   *  Under section 8 of the GNU General Public License, the copyright
26    *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA  *   *  holders of XVID explicitly forbid distribution in the following
27    *                                                                            *   *  countries:
28    ******************************************************************************/   *
29     *    - Japan
30   /******************************************************************************   *    - United States of America
31    *                                                                            *   *
32    *  mbprediction.c                                                            *   *  Linking XviD statically or dynamically with other modules is making a
33    *                                                                            *   *  combined work based on XviD.  Thus, the terms and conditions of the
34    *  Copyright (C) 2001 - Michael Militzer <isibaar@xvid.org>                  *   *  GNU General Public License cover the whole combination.
35    *  Copyright (C) 2001 - Peter Ross <pross@cs.rmit.edu.au>                    *   *
36    *                                                                            *   *  As a special exception, the copyright holders of XviD give you
37    *  For more information visit the XviD homepage: http://www.xvid.org         *   *  permission to link XviD with independent modules that communicate with
38    *                                                                            *   *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
39    ******************************************************************************/   *  license terms of these independent modules, and to copy and distribute
40     *  the resulting combined work under terms of your choice, provided that
41   /******************************************************************************   *  every copy of the combined work is accompanied by a complete copy of
42    *                                                                            *   *  the source code of XviD (the version of XviD used to produce the
43    *  Revision history:                                                         *   *  combined work), being distributed under the terms of the GNU General
44    *                                                                            *   *  Public License plus this exception.  An independent module is a module
45    *  29.06.2002 predict_acdc() bounding                                        *   *  which is not derived from or based on XviD.
46    *  12.12.2001 improved calc_acdc_prediction; removed need for memcpy         *   *
47    *  15.12.2001 moved pmv displacement to motion estimation                    *   *  Note that people who make modified versions of XviD are not obligated
48    *  30.11.2001 mmx cbp support                                                *   *  to grant this special exception for their modified versions; it is
49    *  17.11.2001 initial version                                                *   *  their choice whether to do so.  The GNU General Public License gives
50    *                                                                            *   *  permission to release a modified version without this exception; this
51    ******************************************************************************/   *  exception also makes it possible to release a modified version which
52     *  carries forward this exception.
53     *
54     * $Id: mbprediction.c,v 1.10 2002-11-17 00:35:33 edgomez Exp $
55     *
56     ****************************************************************************/
57    
58  #include "../encoder.h"  #include "../encoder.h"
59  #include "mbprediction.h"  #include "mbprediction.h"
# Line 60  Line 65 
65  #define DIV_DIV(A,B)    ( (A) > 0 ? ((A)+((B)>>1))/(B) : ((A)-((B)>>1))/(B) )  #define DIV_DIV(A,B)    ( (A) > 0 ? ((A)+((B)>>1))/(B) : ((A)-((B)>>1))/(B) )
66    
67    
68    /*****************************************************************************
69     * Local inlined function
70     ****************************************************************************/
71    
72  static int __inline  static int __inline
73  rescale(int predict_quant,  rescale(int predict_quant,
74                  int current_quant,                  int current_quant,
# Line 70  Line 79 
79  }  }
80    
81    
82    /*****************************************************************************
83     * Local data
84     ****************************************************************************/
85    
86  static const int16_t default_acdc_values[15] = {  static const int16_t default_acdc_values[15] = {
87          1024,          1024,
88          0, 0, 0, 0, 0, 0, 0,          0, 0, 0, 0, 0, 0, 0,
# Line 77  Line 90 
90  };  };
91    
92    
93    /*****************************************************************************
94     * Functions
95     ****************************************************************************/
96    
97    
98  /*      get dc/ac prediction direction for a single block and place  /*      get dc/ac prediction direction for a single block and place
99          predictor values into MB->pred_values[j][..]          predictor values into MB->pred_values[j][..]
100  */  */
# Line 92  Line 110 
110                           uint32_t current_quant,                           uint32_t current_quant,
111                           int32_t iDcScaler,                           int32_t iDcScaler,
112                           int16_t predictors[8],                           int16_t predictors[8],
113                          const unsigned int bound_x,                          const int bound)
                         const unsigned int bound_y)  
114    
115  {  {
116          const unsigned bound = (bound_y * mb_width) + bound_x;          const int mbpos = (y * mb_width) + x;
         const unsigned mbpos = (y * mb_width) + x;  
117          int16_t *left, *top, *diag, *current;          int16_t *left, *top, *diag, *current;
118    
119          int32_t left_quant = current_quant;          int32_t left_quant = current_quant;
# Line 127  Line 143 
143          }          }
144          // top macroblock          // top macroblock
145    
146          if (mbpos >= bound + mb_width &&          if (mbpos >= bound + (int)mb_width &&
147                  (pMBs[index - mb_width].mode == MODE_INTRA ||                  (pMBs[index - mb_width].mode == MODE_INTRA ||
148                   pMBs[index - mb_width].mode == MODE_INTRA_Q)) {                   pMBs[index - mb_width].mode == MODE_INTRA_Q)) {
149    
# Line 136  Line 152 
152          }          }
153          // diag macroblock          // diag macroblock
154    
155          if (x && mbpos >= bound + mb_width + 1 &&          if (x && mbpos >= bound + (int)mb_width + 1 &&
156                  (pMBs[index - 1 - mb_width].mode == MODE_INTRA ||                  (pMBs[index - 1 - mb_width].mode == MODE_INTRA ||
157                   pMBs[index - 1 - mb_width].mode == MODE_INTRA_Q)) {                   pMBs[index - 1 - mb_width].mode == MODE_INTRA_Q)) {
158    
# Line 247  Line 263 
263          int16_t *pCurrent = pMB->pred_values[block];          int16_t *pCurrent = pMB->pred_values[block];
264          uint32_t i;          uint32_t i;
265    
266            DPRINTF(DPRINTF_COEFF,"predictor[0] %i", predictors[0]);
267    
268          dct_codes[0] += predictors[0];  // dc prediction          dct_codes[0] += predictors[0];  // dc prediction
269          pCurrent[0] = dct_codes[0] * iDcScaler;          pCurrent[0] = dct_codes[0] * iDcScaler;
270    
# Line 254  Line 272 
272                  for (i = 1; i < 8; i++) {                  for (i = 1; i < 8; i++) {
273                          int level = dct_codes[i] + predictors[i];                          int level = dct_codes[i] + predictors[i];
274    
275                            DPRINTF(DPRINTF_COEFF,"predictor[%i] %i",i, predictors[i]);
276    
277                          dct_codes[i] = level;                          dct_codes[i] = level;
278                          pCurrent[i] = level;                          pCurrent[i] = level;
279                          pCurrent[i + 7] = dct_codes[i * 8];                          pCurrent[i + 7] = dct_codes[i * 8];
# Line 261  Line 281 
281          } else if (acpred_direction == 2) {          } else if (acpred_direction == 2) {
282                  for (i = 1; i < 8; i++) {                  for (i = 1; i < 8; i++) {
283                          int level = dct_codes[i * 8] + predictors[i];                          int level = dct_codes[i * 8] + predictors[i];
284                            DPRINTF(DPRINTF_COEFF,"predictor[%i] %i",i*8, predictors[i]);
285    
286                          dct_codes[i * 8] = level;                          dct_codes[i * 8] = level;
287                          pCurrent[i + 7] = level;                          pCurrent[i + 7] = level;
# Line 385  Line 406 
406                          iDcScaler = get_dc_scaler(iQuant, (j < 4) ? 1 : 0);                          iDcScaler = get_dc_scaler(iQuant, (j < 4) ? 1 : 0);
407    
408                          predict_acdc(frame->mbs, x, y, mb_width, j, &qcoeff[j * 64],                          predict_acdc(frame->mbs, x, y, mb_width, j, &qcoeff[j * 64],
409                                                   iQuant, iDcScaler, predictors[j], 0, 0);                                                   iQuant, iDcScaler, predictors[j], 0);
410    
411                          S += calc_acdc(pMB, j, &qcoeff[j * 64], iDcScaler, predictors[j]);                          S += calc_acdc(pMB, j, &qcoeff[j * 64], iDcScaler, predictors[j]);
412    

Legend:
Removed from v.248  
changed lines
  Added in v.652

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4