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

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

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

revision 503, Sat Sep 21 11:55:53 2002 UTC revision 504, Sat Sep 21 11:59:22 2002 UTC
# Line 356  Line 356 
356      {  iMinSAD=iSAD; currMV->x=(X); currMV->y=(Y); iDirection=(D); iFound=0; } } \      {  iMinSAD=iSAD; currMV->x=(X); currMV->y=(Y); iDirection=(D); iFound=0; } } \
357  }  }
358    
359    #if 0
360  /* too slow and not fully functional at the moment */  /* too slow and not fully functional at the moment */
 /*  
361  int32_t ZeroSearch16(  int32_t ZeroSearch16(
362                                          const uint8_t * const pRef,                                          const uint8_t * const pRef,
363                                          const uint8_t * const pRefH,                                          const uint8_t * const pRefH,
# Line 396  Line 396 
396          return iSAD;          return iSAD;
397    
398  }  }
399  */  #endif /* 0 */
400    
401  int32_t  int32_t
402  Diamond16_MainSearch(const uint8_t * const pRef,  Diamond16_MainSearch(const uint8_t * const pRef,
# Line 839  Line 839 
839                  }                  }
840                  while (1);                              //forever                  while (1);                              //forever
841          }          }
842    
843          return iMinSAD;          return iMinSAD;
844  }  }
845    
846    /* Disabled bframe specific code */
847    #if 0
848    
849  #define CHECK_MV16_F_INTERPOL(X,Y) { \  #define CHECK_MV16_F_INTERPOL(X,Y) { \
850    if ( ((X) <= f_max_dx) && ((X) >= f_min_dx) \    if ( ((X) <= f_max_dx) && ((X) >= f_min_dx) \
851      && ((Y) <= f_max_dy) && ((Y) >= f_min_dy) ) \      && ((Y) <= f_max_dy) && ((Y) >= f_min_dy) ) \
# Line 898  Line 902 
902      {  iMinSAD=iSAD; b_currMV->x=(X); b_currMV->y=(Y); iFound=0;} } \      {  iMinSAD=iSAD; b_currMV->x=(X); b_currMV->y=(Y); iFound=0;} } \
903  }  }
904    
905    
906  int32_t  int32_t
907  Diamond16_InterpolMainSearch(const uint8_t * const f_pRef,  Diamond16_InterpolMainSearch(const uint8_t * const f_pRef,
908                                                           const uint8_t * const f_pRefH,                                                           const uint8_t * const f_pRefH,
# Line 1086  Line 1091 
1091          return iMinSAD;          return iMinSAD;
1092  }  }
1093    
1094    #endif /* 0 */
1095    
1096  int32_t  int32_t
1097  AdvDiamond8_MainSearch(const uint8_t * const pRef,  AdvDiamond8_MainSearch(const uint8_t * const pRef,
# Line 2782  Line 2788 
2788  }  }
2789    
2790    
2791    /* Disabled bframe specific code */
2792    # if 0
2793  int32_t  int32_t
2794  PMVfastIntSearch16(const uint8_t * const pRef,  PMVfastIntSearch16(const uint8_t * const pRef,
2795                                  const uint8_t * const pRefH,                                  const uint8_t * const pRefH,
# Line 3073  Line 3080 
3080          currPMV->y = currMV->y - center_y;          currPMV->y = currMV->y - center_y;
3081          return iMinSAD;          return iMinSAD;
3082  }  }
3083    #endif /* 0 */

Legend:
Removed from v.503  
changed lines
  Added in v.504

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