[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

revision 886, Fri Feb 21 14:49:29 2003 UTC revision 974, Sat Apr 5 16:47:44 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.4 2003-04-05 16:47:44 edgomez Exp $
30   *   *
31   ***************************************************************************/   ***************************************************************************/
32    
# Line 90  Line 90 
90          (int)(29.6436*NEIGH_TEND_8X8 + 0.5), (int)(36.4949*NEIGH_TEND_8X8 + 0.5)        };          (int)(29.6436*NEIGH_TEND_8X8 + 0.5), (int)(36.4949*NEIGH_TEND_8X8 + 0.5)        };
91    
92  // mv.length table  // mv.length table
93  static const uint32_t mvtab[33] = {  static const int mvtab[64] = {
94          1, 2, 3, 4, 6, 7, 7, 7,          1, 2, 3, 4, 6, 7, 7, 7,
95          9, 9, 9, 10, 10, 10, 10, 10,          9, 9, 9, 10, 10, 10, 10, 10,
96          10, 10, 10, 10, 10, 10, 10, 10,          10, 10, 10, 10, 10, 10, 10, 10,
97          10, 11, 11, 11, 11, 11, 11, 12, 12                  10, 11, 11, 11, 11, 11, 11, 12,
98  };                  12, 12, 12, 12, 12, 12, 12, 12,
99                    12, 12, 12, 12, 12, 12, 12, 12,
100                    12, 12, 12, 12, 12, 12, 12, 12, 12 };
101    
102  static const int DQtab[4] = {  static const int DQtab[4] = {
103          -1, -2, 1, 2          -1, -2, 1, 2
# Line 144  Line 146 
146          VECTOR directmvF[4];          VECTOR directmvF[4];
147          VECTOR directmvB[4];          VECTOR directmvB[4];
148          const VECTOR * referencemv;          const VECTOR * referencemv;
149    // _BITS stuff
150            int16_t * dctSpace;
151    
152  } SearchData;  } SearchData;
153    
# Line 246  Line 250 
250  #define iDiamondSize 2  #define iDiamondSize 2
251    
252  static __inline uint32_t  static __inline uint32_t
253  MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t GlobalFlags)  MakeGoodMotionFlags(const uint32_t MotionFlags, const uint32_t VopFlags, const uint32_t VolFlags)
254  {  {
255          uint32_t Flags = MotionFlags;          uint32_t Flags = MotionFlags;
256    
257          if (!(GlobalFlags & XVID_MODEDECISION_BITS))          if (!(VopFlags & XVID_VOP_MODEDECISION_BITS))
258                  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);
259    
260          if (Flags & EXTSEARCH_BITS)          if (Flags & XVID_ME_EXTSEARCH_BITS)
261                  Flags |= HALFPELREFINE16_BITS;                  Flags |= XVID_ME_HALFPELREFINE16_BITS;
262    
263          if (Flags & EXTSEARCH_BITS && MotionFlags & PMV_EXTSEARCH8)          if (Flags & XVID_ME_EXTSEARCH_BITS && MotionFlags & XVID_ME_EXTSEARCH8)
264                  Flags |= HALFPELREFINE8_BITS;                  Flags |= XVID_ME_HALFPELREFINE8_BITS;
265    
266          if (Flags & HALFPELREFINE16_BITS)          if (Flags & XVID_ME_HALFPELREFINE16_BITS)
267                  Flags |= QUARTERPELREFINE16_BITS;                  Flags |= XVID_ME_QUARTERPELREFINE16_BITS;
268    
269          if (Flags & HALFPELREFINE8_BITS) {          if (Flags & XVID_ME_HALFPELREFINE8_BITS) {
270                  Flags |= QUARTERPELREFINE8_BITS;                  Flags |= XVID_ME_QUARTERPELREFINE8_BITS;
271                  Flags &= ~PMV_HALFPELREFINE8;                  Flags &= ~XVID_ME_HALFPELREFINE8;
272          }          }
273    
274          if (Flags & QUARTERPELREFINE8_BITS)          if (Flags & XVID_ME_QUARTERPELREFINE8_BITS)
275                  Flags &= ~PMV_QUARTERPELREFINE8;                  Flags &= ~XVID_ME_QUARTERPELREFINE8;
276    
277          if (!(GlobalFlags & XVID_QUARTERPEL))          if (!(VolFlags & XVID_VOL_QUARTERPEL))
278                  Flags &= ~(PMV_QUARTERPELREFINE16+PMV_QUARTERPELREFINE8+QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS);                  Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS);
279    
280          if (!(GlobalFlags & XVID_HALFPEL))          if (!(VopFlags & XVID_VOP_HALFPEL))
281                  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);
282    
283          if (GlobalFlags & (XVID_GREYSCALE + XVID_REDUCED))          if ((VopFlags & XVID_VOP_GREYSCALE) || (VopFlags & XVID_VOP_REDUCED))
284                  Flags &= ~(PMV_CHROMA16 + PMV_CHROMA8);                  Flags &= ~(XVID_ME_CHROMA16 + XVID_ME_CHROMA8);
285    
286          return Flags;          return Flags;
287  }  }
Legend:
Removed from v.886  
changed lines
  Added in v.974
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4