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

Diff of /branches/dev-api-4/xvidcore/src/motion/motion_est.h

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

trunk/xvidcore/src/motion/motion_est.h revision 884, Fri Feb 21 14:44:57 2003 UTC branches/dev-api-4/xvidcore/src/motion/motion_est.h revision 959, Sat Mar 29 10:11:06 2003 UTC
# Line 26  Line 26 
26   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
27   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
28   *   *
29   *  $Id: motion_est.h,v 1.3 2003-02-21 14:40:11 syskin Exp $   *  $Id: motion_est.h,v 1.3.2.3 2003-03-29 10:11:06 edgomez Exp $
30   *   *
31   ***************************************************************************/   ***************************************************************************/
32    
# 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 GlobalFlags)  MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t VopFlags, const uint32_t VolFlags)
252  {  {
253          uint32_t Flags = MotionFlags;          uint32_t Flags = MotionFlags;
254    
255          if (!(GlobalFlags & XVID_MODEDECISION_BITS))          if (!(VopFlags & XVID_VOP_MODEDECISION_BITS))
256                  Flags &= ~(QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS+EXTSEARCH_BITS);                  Flags &= ~(XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS+XVID_ME_HALFPELREFINE16_BITS+XVID_ME_HALFPELREFINE8_BITS+XVID_ME_EXTSEARCH_BITS);
257    
258          if (Flags & EXTSEARCH_BITS)          if (Flags & XVID_ME_EXTSEARCH_BITS)
259                  Flags |= HALFPELREFINE16_BITS;                  Flags |= XVID_ME_HALFPELREFINE16_BITS;
260    
261          if (Flags & EXTSEARCH_BITS && MotionFlags & PMV_EXTSEARCH8)          if (Flags & XVID_ME_EXTSEARCH_BITS && MotionFlags & XVID_ME_EXTSEARCH8)
262                  Flags |= HALFPELREFINE8_BITS;                  Flags |= XVID_ME_HALFPELREFINE8_BITS;
263    
264          if (Flags & HALFPELREFINE16_BITS)          if (Flags & XVID_ME_HALFPELREFINE16_BITS)
265                  Flags |= QUARTERPELREFINE16_BITS;                  Flags |= XVID_ME_QUARTERPELREFINE16_BITS;
266    
267          if (Flags & HALFPELREFINE8_BITS) {          if (Flags & XVID_ME_HALFPELREFINE8_BITS) {
268                  Flags |= QUARTERPELREFINE8_BITS;                  Flags |= XVID_ME_QUARTERPELREFINE8_BITS;
269                  Flags &= ~PMV_HALFPELREFINE8;                  Flags &= ~XVID_ME_HALFPELREFINE8;
270          }          }
271    
272          if (Flags & QUARTERPELREFINE8_BITS)          if (Flags & XVID_ME_QUARTERPELREFINE8_BITS)
273                  Flags &= ~PMV_QUARTERPELREFINE8;                  Flags &= ~XVID_ME_QUARTERPELREFINE8;
274    
275          if (!(GlobalFlags & XVID_QUARTERPEL))          if (!(VolFlags & XVID_VOL_QUARTERPEL))
276                  Flags &= ~(PMV_QUARTERPELREFINE16+PMV_QUARTERPELREFINE8+QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS);                  Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS);
277    
278          if (!(GlobalFlags & XVID_HALFPEL))          if (!(VopFlags & XVID_VOP_HALFPEL))
279                  Flags &= ~(PMV_EXTSEARCH16+PMV_HALFPELREFINE16+PMV_HALFPELREFINE8+HALFPELREFINE16_BITS+HALFPELREFINE8_BITS);                  Flags &= ~(XVID_ME_EXTSEARCH16+XVID_ME_HALFPELREFINE16+XVID_ME_HALFPELREFINE8+XVID_ME_HALFPELREFINE16_BITS+XVID_ME_HALFPELREFINE8_BITS);
280    
281          if (GlobalFlags & (XVID_GREYSCALE + XVID_REDUCED))          if ((VopFlags & XVID_VOP_GREYSCALE) || (VopFlags & XVID_VOP_REDUCED))
282                  Flags &= ~(PMV_CHROMA16 + PMV_CHROMA8);                  Flags &= ~(XVID_ME_CHROMA16 + XVID_ME_CHROMA8);
283    
284          return Flags;          return Flags;
285  }  }
Legend:
Removed from v.884  
changed lines
  Added in v.959
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4