[svn] / trunk / xvidcore / src / motion / estimation_rd_based_bvop.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/motion/estimation_rd_based_bvop.c

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

revision 1563, Wed Nov 24 22:14:11 2004 UTC revision 1564, Sun Dec 5 04:53:01 2004 UTC
# Line 160  Line 160 
160                  xc = x/2; yc = y/2;                  xc = x/2; yc = y/2;
161          }          }
162    
163          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);
164    
165          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
166                  int s = 8*((i&1) + (i>>1)*data->iEdgedWidth);                  int s = 8*((i&1) + (i>>1)*data->iEdgedWidth);
# Line 267  Line 267 
267          if (cbp)          if (cbp)
268                  rd += BITS_MULT * 6;                  rd += BITS_MULT * 6;
269          if (cbp || x != 0 || y != 0)          if (cbp || x != 0 || y != 0)
270                  rd += BITS_MULT * d_mv_bits(x, y, zeroMV, 1, 0, 0);                  rd += BITS_MULT * d_mv_bits(x, y, zeroMV, 1, 0);
271    
272          if (rd < *(data->iMinSAD)) {          if (rd < *(data->iMinSAD)) {
273                  *data->iMinSAD = rd;                  *data->iMinSAD = rd;
# Line 322  Line 322 
322                  xcb = xb/2; ycb = yb/2;                  xcb = xb/2; ycb = yb/2;
323          }          }
324    
325          rd += BITS_MULT * (d_mv_bits(xf, yf, data->predMV, data->iFcode, data->qpel^data->qpel_precision, 0)          rd += BITS_MULT * (d_mv_bits(xf, yf, data->predMV, data->iFcode, data->qpel^data->qpel_precision)
326                                          + d_mv_bits(xb, yb, data->bpredMV, data->iFcode, data->qpel^data->qpel_precision, 0));                                          + d_mv_bits(xb, yb, data->bpredMV, data->iFcode, data->qpel^data->qpel_precision));
327    
328    
329          for(i = 0; i < 4; i++) {          for(i = 0; i < 4; i++) {
# Line 375  Line 375 
375          Data->iMinSAD[0] = *best_sad;          Data->iMinSAD[0] = *best_sad;
376    
377          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy,          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy,
378                  x, y, 4, pParam->width, pParam->height, Data->iFcode, 1 + Data->qpel, 0);                  x, y, 4, pParam->width, pParam->height, Data->iFcode, 1 + Data->qpel);
379    
380          Data->qpel_precision = Data->qpel;          Data->qpel_precision = Data->qpel;
381    
# Line 418  Line 418 
418          Data->iMinSAD[0] = *best_sad;          Data->iMinSAD[0] = *best_sad;
419    
420          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy,          get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy,
421                  x, y, 4, pParam->width, pParam->height, Data->iFcode, 1 + Data->qpel, 0);                  x, y, 4, pParam->width, pParam->height, Data->iFcode, 1 + Data->qpel);
422    
423          Data->qpel_precision = Data->qpel;          Data->qpel_precision = Data->qpel;
424    

Legend:
Removed from v.1563  
changed lines
  Added in v.1564

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