[cvs] / xvidcore / src / motion / motion_est.h Repository:
ViewVC logotype

Diff of /xvidcore/src/motion/motion_est.h

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

revision 1.2, Sat Feb 15 15:22:18 2003 UTC revision 1.3.2.1, Sat Feb 22 08:49:45 2003 UTC
# Line 103  Line 103 
103    
104  #define RRV_MV_SCALEDOWN(a)     ( (a)>=0 ? (a+1)/2 : (a-1)/2 )  #define RRV_MV_SCALEDOWN(a)     ( (a)>=0 ? (a+1)/2 : (a-1)/2 )
105    
 static const VECTOR zeroMV = {0,0};  
   
106  typedef struct  typedef struct
107  {  {
108  // general fields  // general fields
# Line 248  Line 246 
246  #define iDiamondSize 2  #define iDiamondSize 2
247    
248  static __inline uint32_t  static __inline uint32_t
249  MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t GlobalFlags)  MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t VopFlags, const uint32_t VolFlags)
250  {  {
251          uint32_t Flags = MotionFlags;          uint32_t Flags = MotionFlags;
252    
253          if (!(GlobalFlags & XVID_MODEDECISION_BITS))          if (!(VopFlags & XVID_MODEDECISION_BITS))
254                  Flags &= ~(QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS+EXTSEARCH_BITS);                  Flags &= ~(QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS+EXTSEARCH_BITS);
255    
256          if (Flags & EXTSEARCH_BITS)          if (Flags & EXTSEARCH_BITS)
# Line 272  Line 270 
270          if (Flags & QUARTERPELREFINE8_BITS)          if (Flags & QUARTERPELREFINE8_BITS)
271                  Flags &= ~PMV_QUARTERPELREFINE8;                  Flags &= ~PMV_QUARTERPELREFINE8;
272    
273          if (!(GlobalFlags & XVID_QUARTERPEL))          if (!(VolFlags & XVID_QUARTERPEL))
274                  Flags &= ~(PMV_QUARTERPELREFINE16+PMV_QUARTERPELREFINE8+QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS);                  Flags &= ~(PMV_QUARTERPELREFINE16+PMV_QUARTERPELREFINE8+QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS);
275    
276          if (!(GlobalFlags & XVID_HALFPEL))          if (!(VopFlags & XVID_HALFPEL))
277                  Flags &= ~(PMV_EXTSEARCH16+PMV_HALFPELREFINE16+PMV_HALFPELREFINE8+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS);                  Flags &= ~(PMV_EXTSEARCH16+PMV_HALFPELREFINE16+PMV_HALFPELREFINE8+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS);
278    
279          if (GlobalFlags & (XVID_GREYSCALE + XVID_REDUCED))          if ((VopFlags & XVID_GREYSCALE) || (VopFlags & XVID_REDUCED))
280                  Flags &= ~(PMV_CHROMA16 + PMV_CHROMA8);                  Flags &= ~(PMV_CHROMA16 + PMV_CHROMA8);
281    
282          return Flags;          return Flags;
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3.2.1
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4