[svn] / branches / dev-api-4 / xvidcore / src / motion / estimation_rd_based.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/motion/estimation_rd_based.c

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

revision 1205, Thu Nov 13 23:11:24 2003 UTC revision 1230, Sun Nov 30 16:13:16 2003 UTC
# Line 20  Line 20 
20   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   * $Id: estimation_rd_based.c,v 1.1.2.9 2003-11-13 23:11:24 edgomez Exp $   * $Id: estimation_rd_based.c,v 1.1.2.11 2003-11-30 16:13:16 edgomez Exp $
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# Line 55  Line 55 
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)                                  const uint16_t * scan_table,
59                                    const uint16_t * mpeg_quant_matrices)
60  {  {
61          int sum;          int sum;
62          int bits;          int bits;
# Line 63  Line 64 
64    
65          fdct(data);          fdct(data);
66    
67          if (quant_type) sum = quant_h263_inter(coeff, data, quant);          if (quant_type) sum = quant_h263_inter(coeff, data, quant, mpeg_quant_matrices);
68          else sum = quant_mpeg_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_table);                  bits = BITS_MULT * CodeCoeffInter_CalcBits(coeff, scan_table);
73    
74                  if (quant_type) dequant_h263_inter(dqcoeff, coeff, quant);                  if (quant_type) dequant_h263_inter(dqcoeff, coeff, quant, mpeg_quant_matrices);
75                  else dequant_mpeg_inter(dqcoeff, coeff, quant);                  else dequant_mpeg_inter(dqcoeff, coeff, quant, mpeg_quant_matrices);
76    
77                  distortion = sse8_16bit(data, dqcoeff, 8*sizeof(int16_t));                  distortion = sse8_16bit(data, dqcoeff, 8*sizeof(int16_t));
78          } else {          } else {
# Line 107  Line 108 
108                                          const uint32_t quant,                                          const uint32_t quant,
109                                          const int quant_type,                                          const int quant_type,
110                                          unsigned int bits[2],                                          unsigned int bits[2],
111                                          unsigned int cbp[2])                                          unsigned int cbp[2],
112                                            const uint16_t * mpeg_quant_matrices)
113  {  {
114          int direction;          int direction;
115          int16_t *pCurrent;          int16_t *pCurrent;
# Line 118  Line 120 
120          fdct(coeff);          fdct(coeff);
121    
122          if (quant_type) {          if (quant_type) {
123                  quant_h263_intra(qcoeff, coeff, quant, iDcScaler);                  quant_h263_intra(qcoeff, coeff, quant, iDcScaler, mpeg_quant_matrices);
124                  dequant_h263_intra(dqcoeff, qcoeff, quant, iDcScaler);                  dequant_h263_intra(dqcoeff, qcoeff, quant, iDcScaler, mpeg_quant_matrices);
125          } else {          } else {
126                  quant_mpeg_intra(qcoeff, coeff, quant, iDcScaler);                  quant_mpeg_intra(qcoeff, coeff, quant, iDcScaler, mpeg_quant_matrices);
127                  dequant_mpeg_intra(dqcoeff, qcoeff, quant, iDcScaler);                  dequant_mpeg_intra(dqcoeff, qcoeff, quant, iDcScaler, mpeg_quant_matrices);
128          }          }
129    
130          predict_acdc(pMB-(x+mb_width*y), x, y, mb_width, block, qcoeff,          predict_acdc(pMB-(x+mb_width*y), x, y, mb_width, block, qcoeff,
# Line 172  Line 174 
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 197  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, data->scan_table);                  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 222  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, data->scan_table);          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, data->scan_table);          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 262  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, data->scan_table);          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 336  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 353  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);
# Line 464  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, Data->scan_table);          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, Data->scan_table);          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 480  Line 483 
483  }  }
484    
485  static int  static int
486  findRD_intra(const SearchData * const Data, MACROBLOCK * pMB,  findRD_intra(SearchData * const Data, MACROBLOCK * pMB,
487                           const int x, const int y, const int mb_width)                           const int x, const int y, const int mb_width)
488  {  {
489          int cbp[2] = {0, 0}, bits[2], i;          unsigned int cbp[2] = {0, 0}, bits[2], i;
490          int bits1 = BITS_MULT*1, bits2 = BITS_MULT*1; /* this one is ac/dc prediction flag bit */          unsigned int bits1 = BITS_MULT*1, bits2 = BITS_MULT*1; /* this one is ac/dc prediction flag bit */
491          int distortion = 0;          unsigned int distortion = 0;
492    
493          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64, * dqcoeff = Data->dctSpace + 128;          int16_t *in = Data->dctSpace, * coeff = Data->dctSpace + 64, * dqcoeff = Data->dctSpace + 128;
494          const uint32_t iQuant = Data->iQuant;          const uint32_t iQuant = Data->iQuant;
# Line 497  Line 500 
500    
501    
502                  distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, i, in, coeff, dqcoeff,                  distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, i, in, coeff, dqcoeff,
503                                                                  predictors[i], iQuant, Data->quant_type, bits, cbp);                                                                  predictors[i], iQuant, Data->quant_type, bits, cbp, Data->mpeg_quant_matrices);
504                  bits1 += distortion + BITS_MULT * bits[0];                  bits1 += distortion + BITS_MULT * bits[0];
505                  bits2 += distortion + BITS_MULT * bits[1];                  bits2 += distortion + BITS_MULT * bits[1];
506    
# Line 511  Line 514 
514          /*chroma U */          /*chroma U */
515          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);          transfer_8to16copy(in, Data->CurU, Data->iEdgedWidth/2);
516          distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, 4, in, coeff, dqcoeff,          distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, 4, in, coeff, dqcoeff,
517                                                                          predictors[4], iQuant, Data->quant_type, bits, cbp);                                                                          predictors[4], iQuant, Data->quant_type, bits, cbp, Data->mpeg_quant_matrices);
518          bits1 += distortion + BITS_MULT * bits[0];          bits1 += distortion + BITS_MULT * bits[0];
519          bits2 += distortion + BITS_MULT * bits[1];          bits2 += distortion + BITS_MULT * bits[1];
520    
# Line 521  Line 524 
524          /* chroma V */          /* chroma V */
525          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);          transfer_8to16copy(in, Data->CurV, Data->iEdgedWidth/2);
526          distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, 5, in, coeff, dqcoeff,          distortion = Block_CalcBitsIntra(pMB, x, y, mb_width, 5, in, coeff, dqcoeff,
527                                                                          predictors[5], iQuant, Data->quant_type, bits, cbp);                                                                          predictors[5], iQuant, Data->quant_type, bits, cbp, Data->mpeg_quant_matrices);
528    
529          bits1 += distortion + BITS_MULT * bits[0];          bits1 += distortion + BITS_MULT * bits[0];
530          bits2 += distortion + BITS_MULT * bits[1];          bits2 += distortion + BITS_MULT * bits[1];
# Line 536  Line 539 
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, Data->scan_table);                  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 553  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, Data->scan_table);          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, Data->scan_table);          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 587  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;
         Data->cbp = c;  
596          Data->scan_table = VopFlags & XVID_VOP_ALTERNATESCAN ?          Data->scan_table = VopFlags & XVID_VOP_ALTERNATESCAN ?
597                                                  scan_tables[2] : scan_tables[0];                                                  scan_tables[2] : scan_tables[0];
598    
# Line 694  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;
# Line 748  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 849  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++) {
Legend:
Removed from v.1205  
changed lines
  Added in v.1230
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4