[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 1596, Sun Jan 16 10:34:52 2005 UTC revision 1759, Fri Nov 10 18:58:39 2006 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.48 2005-01-16 10:34:52 edgomez Exp $   * $Id: xvid.h,v 1.59 2006-11-10 18:58:39 chl 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,-126)  #define XVID_VERSION             XVID_MAKE_VERSION(1,2,-127)
61  #define XVID_API                 XVID_MAKE_API(4, 1)  #define XVID_API                 XVID_MAKE_API(4, 1)
62    
63  #define XVID_UNSTABLE  #define XVID_UNSTABLE
# 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 38  #define XVID_BS_VERSION 47
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 361  Line 362 
362  #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 */
363  #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*/
364  #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */  #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */
365    #define XVID_REQLAMBDA   (1<<3) /* plugin requires access to the lambda table */
366    
367    
368  typedef struct  typedef struct
# Line 426  Line 428 
428          int vol_flags;          /* [in,out] */          int vol_flags;          /* [in,out] */
429          int motion_flags;       /* [in,out] */          int motion_flags;       /* [in,out] */
430    
431            /* Lambda table for HVSPlugins */
432            float * lambda;         /* [in,out] six floats for each macroblock. read, multiply, write back */
433    
434  /* Deprecated, use the stats field instead.  /* Deprecated, use the stats field instead.
435   * Will disapear before 1.0 */   * Will disapear before 1.0 */
436          int length;             /* [out] after: length of encoded frame */          int length;             /* [out] after: length of encoded frame */
# Line 481  Line 486 
486  extern xvid_plugin_func xvid_plugin_psnr;       /* write psnr values to stdout */  extern xvid_plugin_func xvid_plugin_psnr;       /* write psnr values to stdout */
487  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */
488    
489    extern xvid_plugin_func xvid_plugin_ssim;       /*write ssim values to stdout*/
490    
491    
492  /* single pass rate control  /* single pass rate control
493   * CBR and Constant quantizer modes */   * CBR and Constant quantizer modes */
# Line 534  Line 541 
541    
542  }xvid_plugin_2pass2_t;  }xvid_plugin_2pass2_t;
543    
544    
545    typedef struct{
546            /*stat output*/
547            int b_printstat;
548            char* stat_path;
549    
550            /*visualize*/
551            int b_visualize;
552    
553            /*accuracy 0 very accurate 4 very fast*/
554            int acc;
555    
556    } xvid_plugin_ssim_t;
557    
558  /*****************************************************************************  /*****************************************************************************
559   *                             ENCODER API   *                             ENCODER API
560   ****************************************************************************/   ****************************************************************************/
# Line 593  Line 614 
614  #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 */
615  #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 */
616  #endif  #endif
617    #define XVID_GLOBAL_DIVX5_USERDATA    (1<<5) /* write divx5 userdata string
618                                                    this is implied if XVID_GLOBAL_PACKED is set */
619    
620  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
621   * "VOL" flags   * "VOL" flags
# Line 607  Line 629 
629  #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 */
630  #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 */
631  #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 */
632                                                                               /* NOTE:  the reduced resolution feature is not supported anymore. This flag will have no effect! */
633  #define XVID_VOL_INTERLACING    (1<<5) /* enable interlaced encoding */  #define XVID_VOL_INTERLACING    (1<<5) /* enable interlaced encoding */
634    
635    
# Line 636  Line 659 
659    
660  /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */  /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */
661  #define XVID_VOP_REDUCED              (1<<11) /* reduced resolution vop */  #define XVID_VOP_REDUCED              (1<<11) /* reduced resolution vop */
662                                                                                              /* NOTE: reduced resolution feature is not supported anymore. This flag will have no effect! */
663    
664  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
665   * "Motion" flags   * "Motion" flags
Legend:
Removed from v.1596  
changed lines
  Added in v.1759
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4