[cvs] / xvidcore / src / motion / estimation_rd_based.c Repository:
ViewVC logotype

Diff of /xvidcore/src/motion/estimation_rd_based.c

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

revision 1.1.2.2, Sun Sep 28 16:12:32 2003 UTC revision 1.1.2.11, Sun Nov 30 16:13:16 2003 UTC
# Line 40  Line 40 
40  #include "motion.h"  #include "motion.h"
41  #include "sad.h"  #include "sad.h"
42  #include "../bitstream/zigzag.h"  #include "../bitstream/zigzag.h"
43  #include "../quant/quant_mpeg4.h"  #include "../quant/quant.h"
 #include "../quant/quant_h263.h"  
44  #include "../bitstream/vlc_codes.h"  #include "../bitstream/vlc_codes.h"
45  #include "../dct/fdct.h"  #include "../dct/fdct.h"
46  #include "motion_inlines.h"  #include "motion_inlines.h"
# Line 55  Line 54 
54                                  int16_t * const dqcoeff,                                  int16_t * const dqcoeff,
55                                  const uint32_t quant, const int quant_type,                                  const uint32_t quant, const int quant_type,
56                                  uint32_t * cbp,                                  uint32_t * cbp,
57                                  const int block)                                  const int block,
58                                    const uint16_t * scan_table,
59                                    const uint16_t * mpeg_quant_matrices)
60  {  {
61          int sum;          int sum;
62          int bits;          int bits;
63          int distortion = 0;          int distortion = 0;
         int i;  
64    
65          fdct(data);          fdct(data);
66    
67          if (quant_type) sum = quant_inter(coeff, data, quant);          if (quant_type) sum = quant_h263_inter(coeff, data, quant, mpeg_quant_matrices);
68          else sum = quant4_inter(coeff, data, quant);          else sum = quant_mpeg_inter(coeff, data, quant, mpeg_quant_matrices);
69    
70          if (sum > 0) {          if (sum > 0) {
71                  *cbp |= 1 << (5 - block);                  *cbp |= 1 << (5 - block);
72                  bits = BITS_MULT * CodeCoeffInter_CalcBits(coeff, scan_tables[0]);                  bits = BITS_MULT * CodeCoeffInter_CalcBits(coeff, scan_table);
   
                 if (quant_type) dequant_inter(dqcoeff, coeff, quant);  
                 else dequant4_inter(dqcoeff, coeff, quant);  
73    
74                  for (i = 0; i < 64; i++)                  if (quant_type) dequant_h263_inter(dqcoeff, coeff, quant, mpeg_quant_matrices);
75                          distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]);                  else dequant_mpeg_inter(dqcoeff, coeff, quant, mpeg_quant_matrices);
76    
77                    distortion = sse8_16bit(data, dqcoeff, 8*sizeof(int16_t));
78          } else {          } else {
79                    const static int16_t zero_block[64] =
80                            {
81                                    0, 0, 0, 0, 0, 0, 0, 0,
82                                    0, 0, 0, 0, 0, 0, 0, 0,
83                                    0, 0, 0, 0, 0, 0, 0, 0,
84                                    0, 0, 0, 0, 0, 0, 0, 0,
85                                    0, 0, 0, 0, 0, 0, 0, 0,
86                                    0, 0, 0, 0, 0, 0, 0, 0,
87                                    0, 0, 0, 0, 0, 0, 0, 0,
88                                    0, 0, 0, 0, 0, 0, 0, 0,
89                            };
90                  bits = 0;                  bits = 0;
91                  for (i = 0; i < 64; i++)                  distortion = sse8_16bit(data, zero_block, 8*sizeof(int16_t));
                         distortion += data[i]*data[i];  
92          }          }
93    
94    
95          return bits + (LAMBDA*distortion)/(quant*quant);          return bits + (LAMBDA*distortion)/(quant*quant);
96  }  }
97    
98  static __inline unsigned int  static __inline unsigned int
99  Block_CalcBitsIntra(int16_t * const coeff,  Block_CalcBitsIntra(MACROBLOCK * pMB,
100                                          int16_t * const data,                                          const unsigned int x,
101                                          int16_t * const dqcoeff,                                          const unsigned int y,
102                                          const uint32_t quant, const int quant_type,                                          const unsigned int mb_width,
103                                          uint32_t * cbp,                                          const uint32_t block,
104                                          const int block,                                          int16_t coeff[64],
105                                          int * dcpred)                                          int16_t qcoeff[64],
106  {                                          int16_t dqcoeff[64],
107          int bits, i;                                          int16_t predictors[8],
108          int distortion = 0;                                          const uint32_t quant,
109          uint32_t iDcScaler = get_dc_scaler(quant, block < 4);                                          const int quant_type,
110          int b_dc;                                          unsigned int bits[2],
111                                            unsigned int cbp[2],
112                                            const uint16_t * mpeg_quant_matrices)
113    {
114            int direction;
115            int16_t *pCurrent;
116            unsigned int i, coded;
117            unsigned int distortion = 0;
118            const uint32_t iDcScaler = get_dc_scaler(quant, block < 4);
119    
120            fdct(coeff);
121    
122            if (quant_type) {
123                    quant_h263_intra(qcoeff, coeff, quant, iDcScaler, mpeg_quant_matrices);
124                    dequant_h263_intra(dqcoeff, qcoeff, quant, iDcScaler, mpeg_quant_matrices);
125            } else {
126                    quant_mpeg_intra(qcoeff, coeff, quant, iDcScaler, mpeg_quant_matrices);
127                    dequant_mpeg_intra(dqcoeff, qcoeff, quant, iDcScaler, mpeg_quant_matrices);
128            }
129    
130          fdct(data);          predict_acdc(pMB-(x+mb_width*y), x, y, mb_width, block, qcoeff,
131          data[0] -= 1024;                                  quant, iDcScaler, predictors, 0);
132    
133          if (quant_type) quant_intra(coeff, data, quant, iDcScaler);          direction = pMB->acpred_directions[block];
134          else quant4_intra(coeff, data, quant, iDcScaler);          pCurrent = pMB->pred_values[block];
135    
136          b_dc = coeff[0];          /* store current coeffs to pred_values[] for future prediction */
137          if (block < 4) {          pCurrent[0] = qcoeff[0] * iDcScaler;
138                  coeff[0] -= *dcpred;          for (i = 1; i < 8; i++) {
139                  *dcpred = b_dc;                  pCurrent[i] = qcoeff[i];
140                    pCurrent[i + 7] = qcoeff[i * 8];
141          }          }
142    
143          bits = BITS_MULT*CodeCoeffIntra_CalcBits(coeff, scan_tables[0]);          /* dc prediction */
144          if (bits != 0) *cbp |= 1 << (5 - block);          qcoeff[0] = qcoeff[0] - predictors[0];
145    
146          if (block < 4) bits += BITS_MULT*dcy_tab[coeff[0] + 255].len;          if (block < 4) bits[1] = bits[0] = dcy_tab[qcoeff[0] + 255].len;
147          else bits += BITS_MULT*dcc_tab[coeff[0] + 255].len;          else bits[1] = bits[0] = dcc_tab[qcoeff[0] + 255].len;
148    
149          coeff[0] = b_dc;          /* calc cost before ac prediction */
150          if (quant_type) dequant_intra(dqcoeff, coeff, quant, iDcScaler);          bits[0] += coded = CodeCoeffIntra_CalcBits(qcoeff, scan_tables[0]);
151          else dequant4_intra(dqcoeff, coeff, quant, iDcScaler);          if (coded > 0) cbp[0] |= 1 << (5 - block);
152    
153          for (i = 0; i < 64; i++)          /* apply ac prediction & calc cost*/
154                  distortion += (data[i] - dqcoeff[i])*(data[i] - dqcoeff[i]);          if (direction == 1) {
155                    for (i = 1; i < 8; i++) {
156                            qcoeff[i] -= predictors[i];
157                            predictors[i] = qcoeff[i];
158                    }
159            } else {                                                /* acpred_direction == 2 */
160                    for (i = 1; i < 8; i++) {
161                            qcoeff[i*8] -= predictors[i];
162                            predictors[i] = qcoeff[i*8];
163                    }
164            }
165    
166          return bits + (LAMBDA*distortion)/(quant*quant);          bits[1] += coded = CodeCoeffIntra_CalcBits(qcoeff, scan_tables[direction]);
167            if (coded > 0) cbp[1] |= 1 << (5 - block);
168    
169            distortion = sse8_16bit(coeff, dqcoeff, 8*sizeof(int16_t));
170    
171            return (LAMBDA*distortion)/(quant*quant);
172  }  }
173    
174    
175    
176  static void  static void
177  CheckCandidateRD16(const int x, const int y, const SearchData * const data, const unsigned int Direction)  CheckCandidateRD16(const int x, const int y, SearchData * const data, const unsigned int Direction)
178  {  {
179    
180          int16_t *in = data->dctSpace, *coeff = data->dctSpace + 64;          int16_t *in = data->dctSpace, *coeff = data->dctSpace + 64;
181          int32_t rd = 0;          int32_t rd = 0;
182          VECTOR * current;          VECTOR * current;
183          const uint8_t * ptr;          const uint8_t * ptr;
184          int i, cbp = 0, t, xc, yc;          int i, t, xc, yc;
185            unsigned cbp = 0;
186    
187          if ( (x > data->max_dx) || (x < data->min_dx)          if ( (x > data->max_dx) || (x < data->min_dx)
188                  || (y > data->max_dy) || (y < data->min_dy) ) return;                  || (y > data->max_dy) || (y < data->min_dy) ) return;
# Line 154  Line 200 
200          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
201                  int s = 8*((i&1) + (i>>1)*data->iEdgedWidth);                  int s = 8*((i&1) + (i>>1)*data->iEdgedWidth);
202                  transfer_8to16subro(in, data->Cur + s, ptr + s, data->iEdgedWidth);                  transfer_8to16subro(in, data->Cur + s, ptr + s, data->iEdgedWidth);
203                  rd += data->temp[i] = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, i);                  rd += data->temp[i] = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, i, data->scan_table, data->mpeg_quant_matrices);
204          }          }
205    
206          rd += t = BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);          rd += t = BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);
# Line 179  Line 225 
225          /* chroma U */          /* chroma U */
226          ptr = interpolate8x8_switch2(data->RefQ, data->RefP[4], 0, 0, xc, yc, data->iEdgedWidth/2, data->rounding);          ptr = interpolate8x8_switch2(data->RefQ, data->RefP[4], 0, 0, xc, yc, data->iEdgedWidth/2, data->rounding);
227          transfer_8to16subro(in, data->CurU, ptr, data->iEdgedWidth/2);          transfer_8to16subro(in, data->CurU, ptr, data->iEdgedWidth/2);
228          rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 4);          rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 4, data->scan_table, data->mpeg_quant_matrices);
229          if (rd >= data->iMinSAD[0]) return;          if (rd >= data->iMinSAD[0]) return;
230    
231          /* chroma V */          /* chroma V */
232          ptr = interpolate8x8_switch2(data->RefQ, data->RefP[5], 0, 0, xc, yc, data->iEdgedWidth/2, data->rounding);          ptr = interpolate8x8_switch2(data->RefQ, data->RefP[5], 0, 0, xc, yc, data->iEdgedWidth/2, data->rounding);
233          transfer_8to16subro(in, data->CurV, ptr, data->iEdgedWidth/2);          transfer_8to16subro(in, data->CurV, ptr, data->iEdgedWidth/2);
234          rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5);          rd += Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5, data->scan_table, data->mpeg_quant_matrices);
235    
236          rd += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;          rd += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;
237    
238          if (rd < data->iMinSAD[0]) {          if (rd < data->iMinSAD[0]) {
239                  data->iMinSAD[0] = rd;                  data->iMinSAD[0] = rd;
240                  current[0].x = x; current[0].y = y;                  current[0].x = x; current[0].y = y;
241                  *data->dir = Direction;                  data->dir = Direction;
242                  *data->cbp = cbp;                  *data->cbp = cbp;
243          }          }
244  }  }
245    
246  static void  static void
247  CheckCandidateRD8(const int x, const int y, const SearchData * const data, const unsigned int Direction)  CheckCandidateRD8(const int x, const int y, SearchData * const data, const unsigned int Direction)
248  {  {
249    
250          int16_t *in = data->dctSpace, *coeff = data->dctSpace + 64;          int16_t *in = data->dctSpace, *coeff = data->dctSpace + 64;
251          int32_t rd;          int32_t rd;
252          VECTOR * current;          VECTOR * current;
253          const uint8_t * ptr;          const uint8_t * ptr;
254          int cbp = 0;          unsigned int cbp = 0;
255    
256          if ( (x > data->max_dx) || (x < data->min_dx)          if ( (x > data->max_dx) || (x < data->min_dx)
257                  || (y > data->max_dy) || (y < data->min_dy) ) return;                  || (y > data->max_dy) || (y < data->min_dy) ) return;
# Line 219  Line 265 
265          }          }
266    
267          transfer_8to16subro(in, data->Cur, ptr, data->iEdgedWidth);          transfer_8to16subro(in, data->Cur, ptr, data->iEdgedWidth);
268          rd = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5);          rd = Block_CalcBits(coeff, in, data->dctSpace + 128, data->iQuant, data->quant_type, &cbp, 5, data->scan_table, data->mpeg_quant_matrices);
269          rd += BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);          rd += BITS_MULT*d_mv_bits(x, y, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0);
270    
271          if (rd < data->iMinSAD[0]) {          if (rd < data->iMinSAD[0]) {
272                  *data->cbp = cbp;                  *data->cbp = cbp;
273                  data->iMinSAD[0] = rd;                  data->iMinSAD[0] = rd;
274                  current[0].x = x; current[0].y = y;                  current[0].x = x; current[0].y = y;
275                  *data->dir = Direction;                  data->dir = Direction;
276          }          }
277  }  }
278    
# Line 293  Line 339 
339  }  }
340    
341  static int  static int
342  findRD_inter4v(const SearchData * const Data,  findRD_inter4v(SearchData * const Data,
343                                  MACROBLOCK * const pMB, const MACROBLOCK * const pMBs,                                  MACROBLOCK * const pMB, const MACROBLOCK * const pMBs,
344                                  const int x, const int y,                                  const int x, const int y,
345                                  const MBParam * const pParam, const uint32_t MotionFlags,                                  const MBParam * const pParam, const uint32_t MotionFlags,
346                                  const VECTOR * const backup)                                  const VECTOR * const backup)
347  {  {
348    
349          int cbp = 0, bits = 0, t = 0, i;          unsigned int cbp = 0, bits = 0, t = 0, i;
350          SearchData Data2, *Data8 = &Data2;          SearchData Data2, *Data8 = &Data2;
351          int sumx = 0, sumy = 0;          int sumx = 0, sumy = 0;
352          int16_t *in = Data->dctSpace, *coeff = Data->dctSpace + 64;          int16_t *in = Data->dctSpace, *coeff = Data->dctSpace + 64;
# Line 310  Line 356 
356    
357          for (i = 0; i < 4; i++) { /* for all luma blocks */          for (i = 0; i < 4; i++) { /* for all luma blocks */
358    
359                  Data8->iMinSAD = Data->iMinSAD + i + 1;                  *Data8->iMinSAD = *(Data->iMinSAD + i + 1);
360                  Data8->currentMV = Data->currentMV + i + 1;                  *Data8->currentMV = *(Data->currentMV + i + 1);
361                  Data8->currentQMV = Data->currentQMV + i + 1;                  *Data8->currentQMV = *(Data->currentQMV + i + 1);
362                  Data8->Cur = Data->Cur + 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  Data8->Cur = Data->Cur + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
363                  Data8->RefP[0] = Data->RefP[0] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  Data8->RefP[0] = Data->RefP[0] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
364                  Data8->RefP[2] = Data->RefP[2] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  Data8->RefP[2] = Data->RefP[2] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
365                  Data8->RefP[1] = Data->RefP[1] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  Data8->RefP[1] = Data->RefP[1] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
366                  Data8->RefP[3] = Data->RefP[3] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  Data8->RefP[3] = Data->RefP[3] + 8*((i&1) + (i>>1)*Data->iEdgedWidth);
367                  *Data8->cbp = (Data->cbp[1] & (1<<(5-i))) ? 1:0; // copy corresponding cbp bit                  *Data8->cbp = (Data->cbp[1] & (1<<(5-i))) ? 1:0; /* copy corresponding cbp bit */
368    
369                  if(Data->qpel) {                  if(Data->qpel) {
370                          Data8->predMV = get_qpmv2(pMBs, pParam->mb_width, 0, x, y, i);                          Data8->predMV = get_qpmv2(pMBs, pParam->mb_width, 0, x, y, i);
# Line 421  Line 467 
467          /* chroma U */          /* chroma U */
468          ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[4], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);          ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[4], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);
469          transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurU, ptr, Data->iEdgedWidth/2);
470          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4);          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, Data->scan_table, Data->mpeg_quant_matrices);
471    
472          if (bits >= *Data->iMinSAD) return bits;          if (bits >= *Data->iMinSAD) return bits;
473    
474          /* chroma V */          /* chroma V */
475          ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[5], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);          ptr = interpolate8x8_switch2(Data->RefQ + 64, Data->RefP[5], 0, 0, sumx, sumy, Data->iEdgedWidth/2, Data->rounding);
476          transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurV, ptr, Data->iEdgedWidth/2);
477          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5);          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, Data->scan_table, Data->mpeg_quant_matrices);
478    
479          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER4V & 7) | ((cbp & 3) << 3)].len;          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER4V & 7) | ((cbp & 3) << 3)].len;
480    
# Line 437  Line 483 
483  }  }
484    
485  static int  static int
486  findRD_intra(const SearchData * const Data)  findRD_intra(SearchData * const Data, MACROBLOCK * pMB,
487                             const int x, const int y, const int mb_width)
488  {  {
489          int bits = BITS_MULT*1; /* this one is ac/dc prediction flag bit */          unsigned int cbp[2] = {0, 0}, bits[2], i;
490          int cbp = 0, i, dc = 0;          unsigned int bits1 = BITS_MULT*1, bits2 = BITS_MULT*1; /* this one is ac/dc prediction flag bit */
491          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64;          unsigned int distortion = 0;
492    
493            int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64, * dqcoeff = Data->dctSpace + 128;
494            const uint32_t iQuant = Data->iQuant;
495            int16_t predictors[6][8];
496    
497          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
498                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);
499                  transfer_8to16copy(in, Data->Cur + s, Data->iEdgedWidth);                  transfer_8to16copy(in, Data->Cur + s, Data->iEdgedWidth);
                 bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i, &dc);  
500    
501                  if (bits >= Data->iMinSAD[0]) return bits;  
502                    distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, i, in, coeff, dqcoeff,
503                                                                    predictors[i], iQuant, Data->quant_type, bits, cbp, Data->mpeg_quant_matrices);
504                    bits1 += distortion + BITS_MULT * bits[0];
505                    bits2 += distortion + BITS_MULT * bits[1];
506    
507                    if (bits1 >= Data->iMinSAD[0] && bits2 >= Data->iMinSAD[0])
508                            return bits1;
509          }          }
510    
511          bits += BITS_MULT*xvid_cbpy_tab[cbp>>2].len;          bits1 += BITS_MULT*xvid_cbpy_tab[cbp[0]>>2].len;
512            bits2 += BITS_MULT*xvid_cbpy_tab[cbp[1]>>2].len;
513    
514          /*chroma U */          /*chroma U */
515          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);
516          bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, &dc);          distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, 4, in, coeff, dqcoeff,
517                                                                            predictors[4], iQuant, Data->quant_type, bits, cbp, Data->mpeg_quant_matrices);
518            bits1 += distortion + BITS_MULT * bits[0];
519            bits2 += distortion + BITS_MULT * bits[1];
520    
521          if (bits >= Data->iMinSAD[0]) return bits;          if (bits1 >= Data->iMinSAD[0] && bits2 >= Data->iMinSAD[0])
522                    return bits1;
523    
524          /* chroma V */          /* chroma V */
525          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);
526          bits += Block_CalcBitsIntra(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, &dc);          distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, 5, in, coeff, dqcoeff,
527                                                                            predictors[5], iQuant, Data->quant_type, bits, cbp, Data->mpeg_quant_matrices);
528    
529          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp & 3) << 3)].len;          bits1 += distortion + BITS_MULT * bits[0];
530            bits2 += distortion + BITS_MULT * bits[1];
531    
532          return bits;          bits1 += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp[0] & 3) << 3)].len;
533            bits2 += BITS_MULT*mcbpc_inter_tab[(MODE_INTRA & 7) | ((cbp[1] & 3) << 3)].len;
534    
535            *Data->cbp = bits1 <= bits2 ? cbp[0] : cbp[1];
536    
537            return MIN(bits1, bits2);
538  }  }
539    
540    
541  static int  static int
542  findRD_gmc(const SearchData * const Data, const IMAGE * const vGMC, const int x, const int y)  findRD_gmc(SearchData * const Data, const IMAGE * const vGMC, const int x, const int y)
543  {  {
544          int bits = BITS_MULT*1; /* this one is mcsel */          int bits = BITS_MULT*1; /* this one is mcsel */
545          int cbp = 0, i;          unsigned int cbp = 0, i;
546          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64;          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64;
547    
548          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
549                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);                  int s = 8*((i&1) + (i>>1)*Data->iEdgedWidth);
550                  transfer_8to16subro(in, Data->Cur + s, vGMC->y + s + 16*(x+y*Data->iEdgedWidth), Data->iEdgedWidth);                  transfer_8to16subro(in, Data->Cur + s, vGMC->y + s + 16*(x+y*Data->iEdgedWidth), Data->iEdgedWidth);
551                  bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i);                  bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, i, Data->scan_table, Data->mpeg_quant_matrices);
552                  if (bits >= Data->iMinSAD[0]) return bits;                  if (bits >= Data->iMinSAD[0]) return bits;
553          }          }
554    
# Line 486  Line 556 
556    
557          /*chroma U */          /*chroma U */
558          transfer_8to16subro(in, Data->CurU, vGMC->u + 8*(x+y*(Data->iEdgedWidth/2)), Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurU, vGMC->u + 8*(x+y*(Data->iEdgedWidth/2)), Data->iEdgedWidth/2);
559          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4);          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 4, Data->scan_table, Data->mpeg_quant_matrices);
560    
561          if (bits >= Data->iMinSAD[0]) return bits;          if (bits >= Data->iMinSAD[0]) return bits;
562    
563          /* chroma V */          /* chroma V */
564          transfer_8to16subro(in, Data->CurV , vGMC->v + 8*(x+y*(Data->iEdgedWidth/2)), Data->iEdgedWidth/2);          transfer_8to16subro(in, Data->CurV , vGMC->v + 8*(x+y*(Data->iEdgedWidth/2)), Data->iEdgedWidth/2);
565          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5);          bits += Block_CalcBits(coeff, in, Data->dctSpace + 128, Data->iQuant, Data->quant_type, &cbp, 5, Data->scan_table, Data->mpeg_quant_matrices);
566    
567          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;          bits += BITS_MULT*mcbpc_inter_tab[(MODE_INTER & 7) | ((cbp & 3) << 3)].len;
568    
# Line 520  Line 590 
590          int inter4v = (VopFlags & XVID_VOP_INTER4V) && (pMB->dquant == 0);          int inter4v = (VopFlags & XVID_VOP_INTER4V) && (pMB->dquant == 0);
591          const uint32_t iQuant = pMB->quant;          const uint32_t iQuant = pMB->quant;
592    
593          int min_rd, intra_rd, i, cbp, c[2] = {0, 0};          int min_rd, intra_rd, i, cbp;
594          VECTOR backup[5], *v;          VECTOR backup[5], *v;
595          Data->iQuant = iQuant;          Data->iQuant = iQuant;
596          Data->cbp = c;          Data->scan_table = VopFlags & XVID_VOP_ALTERNATESCAN ?
597                                                    scan_tables[2] : scan_tables[0];
598    
599          pMB->mcsel = 0;          pMB->mcsel = 0;
600    
# Line 558  Line 629 
629                  }                  }
630          }          }
631    
632          intra_rd = findRD_intra(Data);          intra_rd = findRD_intra(Data, pMB, x, y, pParam->mb_width);
633          if (intra_rd < min_rd) {          if (intra_rd < min_rd) {
634                  *Data->iMinSAD = min_rd = intra_rd;                  *Data->iMinSAD = min_rd = intra_rd;
635                  mode = MODE_INTRA;                  mode = MODE_INTRA;
636                    cbp = *Data->cbp;
637          }          }
638    
639          pMB->sad16 = pMB->sad8[0] = pMB->sad8[1] = pMB->sad8[2] = pMB->sad8[3] = 0;          pMB->sad16 = pMB->sad8[0] = pMB->sad8[1] = pMB->sad8[2] = pMB->sad8[3] = 0;
# Line 586  Line 658 
658                          pMB->pmvs[0].y = Data->currentMV[0].y - Data->predMV.y;                          pMB->pmvs[0].y = Data->currentMV[0].y - Data->predMV.y;
659                  }                  }
660    
661          } else if (mode == MODE_INTER ) { // but mcsel == 1          } else if (mode == MODE_INTER ) { /* but mcsel == 1 */
662    
663                  pMB->mcsel = 1;                  pMB->mcsel = 1;
664                  if (Data->qpel) {                  if (Data->qpel) {
# Line 624  Line 696 
696          const uint32_t iQuant = pMB->quant;          const uint32_t iQuant = pMB->quant;
697          const int skip_possible = (coding_type == P_VOP) && (pMB->dquant == 0);          const int skip_possible = (coding_type == P_VOP) && (pMB->dquant == 0);
698      int sad;      int sad;
699          int min_rd = -1, intra_rd, i, cbp = 63, c[2] = {0, 0};          int min_rd = -1, intra_rd, i, cbp = 63;
700          VECTOR backup[5], *v;          VECTOR backup[5], *v;
701          int sad_backup[5];          int sad_backup[5];
702          int InterBias = MV16_INTER_BIAS;          int InterBias = MV16_INTER_BIAS;
703          int thresh = 0;          int thresh = 0;
704          int top = 0, top_right = 0, left = 0;          int top = 0, top_right = 0, left = 0;
705            Data->scan_table = VopFlags & XVID_VOP_ALTERNATESCAN ?
706                                                    scan_tables[2] : scan_tables[0];
707    
708          pMB->mcsel = 0;          pMB->mcsel = 0;
709    
# Line 676  Line 750 
750                  }                  }
751          } else { /* Rate-Distortion INTER<->INTER4V */          } else { /* Rate-Distortion INTER<->INTER4V */
752                  Data->iQuant = iQuant;                  Data->iQuant = iQuant;
                 Data->cbp = c;  
753                  v = Data->qpel ? Data->currentQMV : Data->currentMV;                  v = Data->qpel ? Data->currentQMV : Data->currentMV;
754    
755                  /* final skip decision, a.k.a. "the vector you found, really that good?" */                  /* final skip decision, a.k.a. "the vector you found, really that good?" */
# Line 734  Line 807 
807          thresh = 0;          thresh = 0;
808    
809          if((x > 0) && (y > 0) && (x < (int32_t) pParam->mb_width)) {          if((x > 0) && (y > 0) && (x < (int32_t) pParam->mb_width)) {
810                  left = (&pMBs[(x-1) + y * pParam->mb_width])->sad16; // left                  left = (&pMBs[(x-1) + y * pParam->mb_width])->sad16; /* left */
811                  top = (&pMBs[x + (y-1) * pParam->mb_width])->sad16; // top                  top = (&pMBs[x + (y-1) * pParam->mb_width])->sad16; /* top */
812                  top_right = (&pMBs[(x+1) + (y-1) * pParam->mb_width])->sad16; // top right                  top_right = (&pMBs[(x+1) + (y-1) * pParam->mb_width])->sad16; /* top right */
813    
814                  if(((&pMBs[(x-1) + y * pParam->mb_width])->mode != MODE_INTRA) &&                  if(((&pMBs[(x-1) + y * pParam->mb_width])->mode != MODE_INTRA) &&
815                     ((&pMBs[x + (y-1) * pParam->mb_width])->mode != MODE_INTRA) &&                     ((&pMBs[x + (y-1) * pParam->mb_width])->mode != MODE_INTRA) &&
# Line 777  Line 850 
850          } else { /* Rate-Distortion INTRA<->INTER */          } else { /* Rate-Distortion INTRA<->INTER */
851                  if(min_rd < 0) {                  if(min_rd < 0) {
852                          Data->iQuant = iQuant;                          Data->iQuant = iQuant;
                         Data->cbp = c;  
853                          v = Data->qpel ? Data->currentQMV : Data->currentMV;                          v = Data->qpel ? Data->currentQMV : Data->currentMV;
854    
855                          for (i = 0; i < 5; i++) {                          for (i = 0; i < 5; i++) {
# Line 814  Line 886 
886                          }                          }
887                  }                  }
888    
889                  intra_rd = findRD_intra(Data);                  intra_rd = findRD_intra(Data, pMB, x, y, pParam->mb_width);
890                  if (intra_rd < min_rd) {                  if (intra_rd < min_rd) {
891                          *Data->iMinSAD = min_rd = intra_rd;                          *Data->iMinSAD = min_rd = intra_rd;
892                          mode = MODE_INTRA;                          mode = MODE_INTRA;
# Line 844  Line 916 
916                          pMB->pmvs[0].y = Data->currentMV[0].y - Data->predMV.y;                          pMB->pmvs[0].y = Data->currentMV[0].y - Data->predMV.y;
917                  }                  }
918    
919          } else if (mode == MODE_INTER ) { // but mcsel == 1          } else if (mode == MODE_INTER ) { /* but mcsel == 1 */
920    
921                  pMB->mcsel = 1;                  pMB->mcsel = 1;
922                  if (Data->qpel) {                  if (Data->qpel) {
Legend:
Removed from v.1.1.2.2  
changed lines
  Added in v.1.1.2.11
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4