[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 1106, Sat Aug 2 10:42:23 2003 UTC revision 1107, Sat Aug 2 15:08:48 2003 UTC
# Line 21  Line 21 
21   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *   *
24   * $Id: motion_est.h,v 1.3.2.13 2003-07-13 09:57:28 syskin Exp $   * $Id: motion_est.h,v 1.3.2.14 2003-08-02 15:08:45 edgomez Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 292  Line 292 
292  {  {
293          uint32_t Flags = MotionFlags;          uint32_t Flags = MotionFlags;
294    
295          if (!(VopFlags & XVID_VOP_MODEDECISION_BITS))          if (!(VopFlags & XVID_VOP_MODEDECISION_RD))
296                  Flags &= ~(XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS+XVID_ME_HALFPELREFINE16_BITS+XVID_ME_HALFPELREFINE8_BITS+XVID_ME_EXTSEARCH_BITS);                  Flags &= ~(XVID_ME_QUARTERPELREFINE16_RD+XVID_ME_QUARTERPELREFINE8_RD+XVID_ME_HALFPELREFINE16_RD+XVID_ME_HALFPELREFINE8_RD+XVID_ME_EXTSEARCH_RD);
297    
298          if (Flags & XVID_ME_EXTSEARCH_BITS)          if (Flags & XVID_ME_EXTSEARCH_RD)
299                  Flags |= XVID_ME_HALFPELREFINE16_BITS;                  Flags |= XVID_ME_HALFPELREFINE16_RD;
300    
301          if (Flags & XVID_ME_EXTSEARCH_BITS && MotionFlags & XVID_ME_EXTSEARCH8)          if (Flags & XVID_ME_EXTSEARCH_RD && MotionFlags & XVID_ME_EXTSEARCH8)
302                  Flags |= XVID_ME_HALFPELREFINE8_BITS;                  Flags |= XVID_ME_HALFPELREFINE8_RD;
303    
304          if (Flags & XVID_ME_HALFPELREFINE16_BITS)          if (Flags & XVID_ME_HALFPELREFINE16_RD)
305                  Flags |= XVID_ME_QUARTERPELREFINE16_BITS;                  Flags |= XVID_ME_QUARTERPELREFINE16_RD;
306    
307          if (Flags & XVID_ME_HALFPELREFINE8_BITS) {          if (Flags & XVID_ME_HALFPELREFINE8_RD) {
308                  Flags |= XVID_ME_QUARTERPELREFINE8_BITS;                  Flags |= XVID_ME_QUARTERPELREFINE8_RD;
309                  Flags &= ~XVID_ME_HALFPELREFINE8;                  Flags &= ~XVID_ME_HALFPELREFINE8;
310          }          }
311    
312          if (Flags & XVID_ME_QUARTERPELREFINE8_BITS)          if (Flags & XVID_ME_QUARTERPELREFINE8_RD)
313                  Flags &= ~XVID_ME_QUARTERPELREFINE8;                  Flags &= ~XVID_ME_QUARTERPELREFINE8;
314    
315          if (!(VolFlags & XVID_VOL_QUARTERPEL))          if (!(VolFlags & XVID_VOL_QUARTERPEL))
316                  Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_BITS+XVID_ME_QUARTERPELREFINE8_BITS);                  Flags &= ~(XVID_ME_QUARTERPELREFINE16+XVID_ME_QUARTERPELREFINE8+XVID_ME_QUARTERPELREFINE16_RD+XVID_ME_QUARTERPELREFINE8_RD);
317    
318          if (!(VopFlags & XVID_VOP_HALFPEL))          if (!(VopFlags & XVID_VOP_HALFPEL))
319                  Flags &= ~(XVID_ME_EXTSEARCH16+XVID_ME_HALFPELREFINE16+XVID_ME_HALFPELREFINE8+XVID_ME_HALFPELREFINE16_BITS+XVID_ME_HALFPELREFINE8_BITS);                  Flags &= ~(XVID_ME_EXTSEARCH16+XVID_ME_HALFPELREFINE16+XVID_ME_HALFPELREFINE8+XVID_ME_HALFPELREFINE16_RD+XVID_ME_HALFPELREFINE8_RD);
320    
321          if ((VopFlags & XVID_VOP_GREYSCALE) || (VopFlags & XVID_VOP_REDUCED))          if ((VopFlags & XVID_VOP_GREYSCALE) || (VopFlags & XVID_VOP_REDUCED))
322                  Flags &= ~(XVID_ME_CHROMA16 + XVID_ME_CHROMA8);                  Flags &= ~(XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP);
323    
324          return Flags;          return Flags;
325  }  }
326    
327  /* BITS mode decision and search */  /* RD mode decision and search */
328    
329  #include "../bitstream/zigzag.h"  #include "../bitstream/zigzag.h"
330  #include "../quant/quant_mpeg4.h"  #include "../quant/quant_mpeg4.h"
Legend:
Removed from v.1106  
changed lines
  Added in v.1107
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4