[svn] / trunk / xvidcore / src / xvid.h Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/xvid.h

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

revision 1505, Sun Jul 18 11:22:24 2004 UTC revision 1863, Wed May 27 15:52:05 2009 UTC
# Line 19  Line 19 
19   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
20   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
21   *   *
22   * $Id: xvid.h,v 1.43 2004-07-18 11:22:24 syskin Exp $   * $Id: xvid.h,v 1.65 2009-05-27 15:52:05 Isibaar Exp $
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
# Line 57  Line 57 
57  #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)  #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
58  #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)  #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
59    
60  #define XVID_VERSION             XVID_MAKE_VERSION(1,1,-127)  #define XVID_VERSION             XVID_MAKE_VERSION(1,3,-127)
61  #define XVID_API                 XVID_MAKE_API(4, 0)  #define XVID_API                 XVID_MAKE_API(4, 3)
62    
63  #define XVID_UNSTABLE  #define XVID_UNSTABLE
64    
# Line 73  Line 73 
73   * doesnt hurt but not increasing it could cause difficulty for decoders in the   * doesnt hurt but not increasing it could cause difficulty for decoders in the
74   * future   * future
75   */   */
76  #define XVID_BS_VERSION 35  #define XVID_BS_VERSION 55
77    
78  /*****************************************************************************  /*****************************************************************************
79   * error codes   * error codes
# Line 102  Line 102 
102  #define XVID_CSP_YUY2     (1<< 3) /* 4:2:2 packed */  #define XVID_CSP_YUY2     (1<< 3) /* 4:2:2 packed */
103  #define XVID_CSP_UYVY     (1<< 4) /* 4:2:2 packed */  #define XVID_CSP_UYVY     (1<< 4) /* 4:2:2 packed */
104  #define XVID_CSP_YVYU     (1<< 5) /* 4:2:2 packed */  #define XVID_CSP_YVYU     (1<< 5) /* 4:2:2 packed */
105    #define XVID_CSP_RGB      (1<<16) /* 24-bit rgb packed */
106  #define XVID_CSP_BGRA     (1<< 6) /* 32-bit bgra packed */  #define XVID_CSP_BGRA     (1<< 6) /* 32-bit bgra packed */
107  #define XVID_CSP_ABGR     (1<< 7) /* 32-bit abgr packed */  #define XVID_CSP_ABGR     (1<< 7) /* 32-bit abgr packed */
108  #define XVID_CSP_RGBA     (1<< 8) /* 32-bit rgba packed */  #define XVID_CSP_RGBA     (1<< 8) /* 32-bit rgba packed */
# Line 169  Line 170 
170  #define XVID_CPU_MMXEXT   (1<< 1) /*   mmx-ext : pentium2, athlon */  #define XVID_CPU_MMXEXT   (1<< 1) /*   mmx-ext : pentium2, athlon */
171  #define XVID_CPU_SSE      (1<< 2) /*       sse : pentium3, athlonXP */  #define XVID_CPU_SSE      (1<< 2) /*       sse : pentium3, athlonXP */
172  #define XVID_CPU_SSE2     (1<< 3) /*      sse2 : pentium4, athlon64 */  #define XVID_CPU_SSE2     (1<< 3) /*      sse2 : pentium4, athlon64 */
173    #define XVID_CPU_SSE3     (1<< 8) /*      sse3 : pentium4, athlon64 */
174    #define XVID_CPU_SSE41    (1<< 9) /*      sse41: penryn */
175  #define XVID_CPU_3DNOW    (1<< 4) /*     3dnow : k6-2 */  #define XVID_CPU_3DNOW    (1<< 4) /*     3dnow : k6-2 */
176  #define XVID_CPU_3DNOWEXT (1<< 5) /* 3dnow-ext : athlon */  #define XVID_CPU_3DNOWEXT (1<< 5) /* 3dnow-ext : athlon */
177  #define XVID_CPU_TSC      (1<< 6) /*       tsc : Pentium */  #define XVID_CPU_TSC      (1<< 6) /*       tsc : Pentium */
# Line 361  Line 364 
364  #define XVID_REQORIGINAL (1<<0) /* plugin requires a copy of the original (uncompressed) image */  #define XVID_REQORIGINAL (1<<0) /* plugin requires a copy of the original (uncompressed) image */
365  #define XVID_REQPSNR     (1<<1) /* plugin requires psnr between the uncompressed and compressed image*/  #define XVID_REQPSNR     (1<<1) /* plugin requires psnr between the uncompressed and compressed image*/
366  #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */  #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */
367    #define XVID_REQLAMBDA   (1<<3) /* plugin requires access to the lambda table */
368    
369    
370  typedef struct  typedef struct
# Line 426  Line 430 
430          int vol_flags;          /* [in,out] */          int vol_flags;          /* [in,out] */
431          int motion_flags;       /* [in,out] */          int motion_flags;       /* [in,out] */
432    
433            /* Lambda table for HVSPlugins */
434            float * lambda;         /* [in,out] six floats for each macroblock. read, multiply, write back */
435    
436  /* Deprecated, use the stats field instead.  /* Deprecated, use the stats field instead.
437   * Will disapear before 1.0 */   * Will disapear before 1.0 */
438          int length;             /* [out] after: length of encoded frame */          int length;             /* [out] after: length of encoded frame */
# Line 481  Line 488 
488  extern xvid_plugin_func xvid_plugin_psnr;       /* write psnr values to stdout */  extern xvid_plugin_func xvid_plugin_psnr;       /* write psnr values to stdout */
489  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */
490    
491    extern xvid_plugin_func xvid_plugin_ssim;       /*write ssim values to stdout*/
492    
493    
494  /* single pass rate control  /* single pass rate control
495   * CBR and Constant quantizer modes */   * CBR and Constant quantizer modes */
# Line 534  Line 543 
543    
544  }xvid_plugin_2pass2_t;  }xvid_plugin_2pass2_t;
545    
546    
547    typedef struct{
548            /*stat output*/
549            int b_printstat;
550            char* stat_path;
551    
552            /*visualize*/
553            int b_visualize;
554    
555            /*accuracy 0 very accurate 4 very fast*/
556            int acc;
557    
558        int cpu_flags; /* XVID_CPU_XXX flags */
559    
560    } xvid_plugin_ssim_t;
561    
562    typedef struct {
563            int version;
564    
565            int method;      /* [in] masking method to apply. 0 for luminance masking, 1 for variance masking */
566    } xvid_plugin_lumimasking_t;
567    
568  /*****************************************************************************  /*****************************************************************************
569   *                             ENCODER API   *                             ENCODER API
570   ****************************************************************************/   ****************************************************************************/
# Line 593  Line 624 
624  #define XVID_GLOBAL_VOL_AT_IVOP       (1<<3) /* write vol at every ivop: WIN32/divx compatibility */  #define XVID_GLOBAL_VOL_AT_IVOP       (1<<3) /* write vol at every ivop: WIN32/divx compatibility */
625  #define XVID_GLOBAL_FORCE_VOL         (1<<4) /* when vol-based parameters are changed, insert an ivop NOT recommended */  #define XVID_GLOBAL_FORCE_VOL         (1<<4) /* when vol-based parameters are changed, insert an ivop NOT recommended */
626  #endif  #endif
627    #define XVID_GLOBAL_DIVX5_USERDATA    (1<<5) /* write divx5 userdata string
628                                                    this is implied if XVID_GLOBAL_PACKED is set */
629    
630  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
631   * "VOL" flags   * "VOL" flags
# Line 607  Line 639 
639  #define XVID_VOL_QUARTERPEL     (1<<2) /* enable quarterpel: frames will encoded as quarterpel */  #define XVID_VOL_QUARTERPEL     (1<<2) /* enable quarterpel: frames will encoded as quarterpel */
640  #define XVID_VOL_GMC            (1<<3) /* enable GMC; frames will be checked for gmc suitability */  #define XVID_VOL_GMC            (1<<3) /* enable GMC; frames will be checked for gmc suitability */
641  #define XVID_VOL_REDUCED_ENABLE (1<<4) /* enable reduced resolution vops: frames will be checked for rrv suitability */  #define XVID_VOL_REDUCED_ENABLE (1<<4) /* enable reduced resolution vops: frames will be checked for rrv suitability */
642                                                                               /* NOTE:  the reduced resolution feature is not supported anymore. This flag will have no effect! */
643  #define XVID_VOL_INTERLACING    (1<<5) /* enable interlaced encoding */  #define XVID_VOL_INTERLACING    (1<<5) /* enable interlaced encoding */
644    
645    
# Line 636  Line 669 
669    
670  /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */  /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */
671  #define XVID_VOP_REDUCED              (1<<11) /* reduced resolution vop */  #define XVID_VOP_REDUCED              (1<<11) /* reduced resolution vop */
672                                                                                              /* NOTE: reduced resolution feature is not supported anymore. This flag will have no effect! */
673    
674  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
675   * "Motion" flags   * "Motion" flags

Legend:
Removed from v.1505  
changed lines
  Added in v.1863

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