[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 890, Sat Feb 22 08:49:45 2003 UTC revision 949, Wed Mar 26 14:56:49 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.2.1 2003-02-22 08:49:45 suxen_drol Exp $   *  $Id: motion_est.h,v 1.3.2.2 2003-03-26 14:56:49 edgomez Exp $
30   *   *
31   ***************************************************************************/   ***************************************************************************/
32    
# Line 250  Line 250 
250  {  {
251          uint32_t Flags = MotionFlags;          uint32_t Flags = MotionFlags;
252    
253          if (!(VopFlags & XVID_MODEDECISION_BITS))          if (!(VopFlags & XVID_VOP_MODEDECISION_BITS))
254                  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);
255    
256          if (Flags & EXTSEARCH_BITS)          if (Flags & XVID_ME_EXTSEARCH_BITS)
257                  Flags |= HALFPELREFINE16_BITS;                  Flags |= XVID_ME_HALFPELREFINE16_BITS;
258    
259          if (Flags & EXTSEARCH_BITS && MotionFlags & PMV_EXTSEARCH8)          if (Flags & XVID_ME_EXTSEARCH_BITS && MotionFlags & XVID_ME_EXTSEARCH8)
260                  Flags |= HALFPELREFINE8_BITS;                  Flags |= XVID_ME_HALFPELREFINE8_BITS;
261    
262          if (Flags & HALFPELREFINE16_BITS)          if (Flags & XVID_ME_HALFPELREFINE16_BITS)
263                  Flags |= QUARTERPELREFINE16_BITS;                  Flags |= XVID_ME_QUARTERPELREFINE16_BITS;
264    
265          if (Flags & HALFPELREFINE8_BITS) {          if (Flags & XVID_ME_HALFPELREFINE8_BITS) {
266                  Flags |= QUARTERPELREFINE8_BITS;                  Flags |= XVID_ME_QUARTERPELREFINE8_BITS;
267                  Flags &= ~PMV_HALFPELREFINE8;                  Flags &= ~XVID_ME_HALFPELREFINE8;
268          }          }
269    
270          if (Flags & QUARTERPELREFINE8_BITS)          if (Flags & XVID_ME_QUARTERPELREFINE8_BITS)
271                  Flags &= ~PMV_QUARTERPELREFINE8;                  Flags &= ~XVID_ME_QUARTERPELREFINE8;
272    
273          if (!(VolFlags & XVID_QUARTERPEL))          if (!(VolFlags & XVID_VOL_QUARTERPEL))
274                  Flags &= ~(PMV_QUARTERPELREFINE16+PMV_QUARTERPELREFINE8+QUARTERPELREFINE16_BITS+QUARTERPELREFINE8_BITS);                  Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS);
275    
276          if (!(VopFlags & XVID_HALFPEL))          if (!(VopFlags & XVID_VOP_HALFPEL))
277                  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);
278    
279          if ((VopFlags & XVID_GREYSCALE) || (VopFlags & XVID_REDUCED))          if ((VopFlags & XVID_VOP_GREYSCALE) || (VopFlags & XVID_VOP_REDUCED))
280                  Flags &= ~(PMV_CHROMA16 + PMV_CHROMA8);                  Flags &= ~(XVID_ME_CHROMA16 + XVID_ME_CHROMA8);
281    
282          return Flags;          return Flags;
283  }  }

Legend:
Removed from v.890  
changed lines
  Added in v.949

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