[svn] / branches / dev-api-4 / xvidcore / src / prediction / mbprediction.h Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/prediction/mbprediction.h

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

revision 652, Sun Nov 17 00:35:33 2002 UTC revision 677, Tue Nov 26 23:44:11 2002 UTC
# Line 51  Line 51 
51   *  exception also makes it possible to release a modified version which   *  exception also makes it possible to release a modified version which
52   *  carries forward this exception.   *  carries forward this exception.
53   *   *
54   * $Id: mbprediction.h,v 1.17 2002-11-17 00:35:33 edgomez Exp $   * $Id: mbprediction.h,v 1.18 2002-11-26 23:44:11 edgomez Exp $
55   *   *
56   *************************************************************************/   *************************************************************************/
57    
# Line 315  Line 315 
315          if (num_cand == 1) {          if (num_cand == 1) {
316                  pmv[0] = pmv[last_cand];                  pmv[0] = pmv[last_cand];
317                  psad[0] = psad[last_cand];                  psad[0] = psad[last_cand];
318          // return MVequal(pmv[0], zeroMV); /* no point calculating median mv and minimum sad */          /* return MVequal(pmv[0], zeroMV);  no point calculating median mv and minimum sad  */
319    
320                  /* original pmvdata() compatibility hack */                  /* original pmvdata() compatibility hack */
321                  return y==0 && block <= 1 ? 0 : MVequal(pmv[0], zeroMV);                  return y==0 && block <= 1 ? 0 : MVequal(pmv[0], zeroMV);
# Line 326  Line 326 
326                  psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]);                  psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]);
327                  return 1;                  return 1;
328                  /* compatibility patch */                  /* compatibility patch */
329                  //return y==0 && block <= 1 ? 0 : 1;                  /*return y==0 && block <= 1 ? 0 : 1; */
330          }          }
331    
332          /* set median, minimum */          /* set median, minimum */
# Line 518  Line 518 
518          if (num_cand == 1) {          if (num_cand == 1) {
519                  pmv[0] = pmv[last_cand];                  pmv[0] = pmv[last_cand];
520                  psad[0] = psad[last_cand];                  psad[0] = psad[last_cand];
521          // return MVequal(pmv[0], zeroMV); /* no point calculating median mv and minimum sad */          /* return MVequal(pmv[0], zeroMV); no point calculating median mv and minimum sad */
522    
523                  /* original pmvdata() compatibility hack */                  /* original pmvdata() compatibility hack */
524                  return y==0 && block <= 1 ? 0 : MVequal(pmv[0], zeroMV);                  return y==0 && block <= 1 ? 0 : MVequal(pmv[0], zeroMV);
# Line 529  Line 529 
529                  psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]);                  psad[0] = MIN(MIN(psad[1], psad[2]), psad[3]);
530                  return 1;                  return 1;
531                  /* compatibility patch */                  /* compatibility patch */
532                  //return y==0 && block <= 1 ? 0 : 1;                  /*return y==0 && block <= 1 ? 0 : 1; */
533          }          }
534    
535          /* set median, minimum */          /* set median, minimum */

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

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