[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.3.2.1, Sat Feb 22 08:49:45 2003 UTC revision 1.4, Sat Mar 29 10:21:23 2003 UTC
# Line 144  Line 144 
144          VECTOR directmvF[4];          VECTOR directmvF[4];
145          VECTOR directmvB[4];          VECTOR directmvB[4];
146          const VECTOR * referencemv;          const VECTOR * referencemv;
147    // _BITS stuff
148            int16_t * dctSpace;
149    
150  } SearchData;  } SearchData;
151    
# Line 246  Line 248 
248  #define iDiamondSize 2  #define iDiamondSize 2
249    
250  static __inline uint32_t  static __inline uint32_t
251  MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t VopFlags, const uint32_t VolFlags)  MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t GlobalFlags)
252  {  {
253          uint32_t Flags = MotionFlags;          uint32_t Flags = MotionFlags;
254    
255          if (!(VopFlags & XVID_MODEDECISION_BITS))          if (!(GlobalFlags & XVID_MODEDECISION_BITS))
256                  Flags &= ~(QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS+EXTSEARCH_BITS);                  Flags &= ~(QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS+EXTSEARCH_BITS);
257    
258          if (Flags & EXTSEARCH_BITS)          if (Flags & EXTSEARCH_BITS)
# Line 270  Line 272 
272          if (Flags & QUARTERPELREFINE8_BITS)          if (Flags & QUARTERPELREFINE8_BITS)
273                  Flags &= ~PMV_QUARTERPELREFINE8;                  Flags &= ~PMV_QUARTERPELREFINE8;
274    
275          if (!(VolFlags & XVID_QUARTERPEL))          if (!(GlobalFlags & XVID_QUARTERPEL))
276                  Flags &= ~(PMV_QUARTERPELREFINE16+PMV_QUARTERPELREFINE8+QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS);                  Flags &= ~(PMV_QUARTERPELREFINE16+PMV_QUARTERPELREFINE8+QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS);
277    
278          if (!(VopFlags & XVID_HALFPEL))          if (!(GlobalFlags & XVID_HALFPEL))
279                  Flags &= ~(PMV_EXTSEARCH16+PMV_HALFPELREFINE16+PMV_HALFPELREFINE8+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS);                  Flags &= ~(PMV_EXTSEARCH16+PMV_HALFPELREFINE16+PMV_HALFPELREFINE8+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS);
280    
281          if ((VopFlags & XVID_GREYSCALE) || (VopFlags & XVID_REDUCED))          if (GlobalFlags & (XVID_GREYSCALE + XVID_REDUCED))
282                  Flags &= ~(PMV_CHROMA16 + PMV_CHROMA8);                  Flags &= ~(PMV_CHROMA16 + PMV_CHROMA8);
283    
284          return Flags;          return Flags;
Legend:
Removed from v.1.3.2.1  
changed lines
  Added in v.1.4
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4