[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 1451, Fri May 21 14:40:15 2004 UTC revision 1730, Wed Oct 11 13:55:32 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.39 2004-05-21 14:40:15 edgomez Exp $   * $Id: xvid.h,v 1.56 2006-10-11 13:55:32 Skal 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,2,-127)
61  #define XVID_API                 XVID_MAKE_API(4, 0)  #define XVID_API                 XVID_MAKE_API(4, 1)
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 34  #define XVID_BS_VERSION 45
77    
78  /*****************************************************************************  /*****************************************************************************
79   * error codes   * error codes
# Line 263  Line 263 
263          void *bitstream;     /* [in]     bitstream (read from)*/          void *bitstream;     /* [in]     bitstream (read from)*/
264          int length;          /* [in]     bitstream length */          int length;          /* [in]     bitstream length */
265          xvid_image_t output; /* [in]     output image (written to) */          xvid_image_t output; /* [in]     output image (written to) */
266  /* ------- v1.1.0 ------- */  /* ------- v1.1.x ------- */
267          int brightness;          /* [in]         brightness offset (0=none) */          int brightness;          /* [in]         brightness offset (0=none) */
268  } xvid_dec_frame_t;  } xvid_dec_frame_t;
269    
# Line 361  Line 361 
361  #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 */
362  #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*/
363  #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */  #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */
364    #define XVID_REQLAMBDA   (1<<3) /* plugin requires access to the lambda table */
365    
366    
367  typedef struct  typedef struct
# Line 426  Line 427 
427          int vol_flags;          /* [in,out] */          int vol_flags;          /* [in,out] */
428          int motion_flags;       /* [in,out] */          int motion_flags;       /* [in,out] */
429    
430            /* Lambda table for HVSPlugins */
431            float * lambda;         /* [in,out] six floats for each macroblock. read, multiply, write back */
432    
433  /* Deprecated, use the stats field instead.  /* Deprecated, use the stats field instead.
434   * Will disapear before 1.0 */   * Will disapear before 1.0 */
435          int length;             /* [out] after: length of encoded frame */          int length;             /* [out] after: length of encoded frame */
# Line 481  Line 485 
485  extern xvid_plugin_func xvid_plugin_psnr;       /* write psnr values to stdout */  extern xvid_plugin_func xvid_plugin_psnr;       /* write psnr values to stdout */
486  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */
487    
488    extern xvid_plugin_func xvid_plugin_ssim;       /*write ssim values to stdout*/
489    
490    
491  /* single pass rate control  /* single pass rate control
492   * CBR and Constant quantizer modes */   * CBR and Constant quantizer modes */
# Line 508  Line 514 
514  typedef struct {  typedef struct {
515          int version;          int version;
516    
517          int bitrate;                  /* [in] bits per second */          int bitrate;                  /* [in] target bitrate (bits per second) */
518          char * filename;              /* [in] first pass stats filename */          char * filename;              /* [in] first pass stats filename */
519    
520          int keyframe_boost;           /* [in] keyframe boost percentage: [0..100] */          int keyframe_boost;           /* [in] keyframe boost percentage: [0..100] */
# Line 525  Line 531 
531                                                                     *      0 for 1<distance<kfthreshold */                                                                     *      0 for 1<distance<kfthreshold */
532    
533          int container_frame_overhead; /* [in] How many bytes the controller has to compensate per frame due to container format overhead */          int container_frame_overhead; /* [in] How many bytes the controller has to compensate per frame due to container format overhead */
534    
535    /* ------- v1.1.x ------- */
536            int vbv_size;                 /* [in] buffer size (bits) */
537            int vbv_initial;              /* [in] initial buffer occupancy (bits) */
538            int vbv_maxrate;              /* [in] max processing bitrate (bits per second) */
539            int vbv_peakrate;             /* [in:opt] max average bitrate over 3 seconds (bits per second) */
540    
541  }xvid_plugin_2pass2_t;  }xvid_plugin_2pass2_t;
542    
543    
544    typedef struct{
545            /*stat output*/
546            int b_printstat;
547            char* stat_path;
548    
549            /*visualize*/
550            int b_visualize;
551    
552    } xvid_plugin_ssim_t;
553    
554  /*****************************************************************************  /*****************************************************************************
555   *                             ENCODER API   *                             ENCODER API
556   ****************************************************************************/   ****************************************************************************/
# Line 586  Line 610 
610  #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 */
611  #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 */
612  #endif  #endif
613    #define XVID_GLOBAL_DIVX5_USERDATA    (1<<5) /* write divx5 userdata string
614                                                    this is implied if XVID_GLOBAL_PACKED is set */
615    
616  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
617   * "VOL" flags   * "VOL" flags
# Line 600  Line 625 
625  #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 */
626  #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 */
627  #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 */
628                                                                               /* NOTE:  the reduced resolution feature is not supported anymore. This flag will have no effect! */
629  #define XVID_VOL_INTERLACING    (1<<5) /* enable interlaced encoding */  #define XVID_VOL_INTERLACING    (1<<5) /* enable interlaced encoding */
630    
631    
# Line 621  Line 647 
647  #define XVID_VOP_HQACPRED             (1<< 7) /* high quality ac prediction */  #define XVID_VOP_HQACPRED             (1<< 7) /* high quality ac prediction */
648  #define XVID_VOP_MODEDECISION_RD      (1<< 8) /* enable DCT-ME and use it for mode decision */  #define XVID_VOP_MODEDECISION_RD      (1<< 8) /* enable DCT-ME and use it for mode decision */
649  #define XVID_VOP_FAST_MODEDECISION_RD (1<<12) /* use simplified R-D mode decision */  #define XVID_VOP_FAST_MODEDECISION_RD (1<<12) /* use simplified R-D mode decision */
650    #define XVID_VOP_RD_BVOP              (1<<13) /* enable rate-distortion mode decision in b-frames */
651    
652  /* Only valid for vol_flags|=XVID_VOL_INTERLACING */  /* Only valid for vol_flags|=XVID_VOL_INTERLACING */
653  #define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */  #define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */
# Line 628  Line 655 
655    
656  /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */  /* only valid for vol_flags|=XVID_VOL_REDUCED_ENABLED */
657  #define XVID_VOP_REDUCED              (1<<11) /* reduced resolution vop */  #define XVID_VOP_REDUCED              (1<<11) /* reduced resolution vop */
658                                                                                              /* NOTE: reduced resolution feature is not supported anymore. This flag will have no effect! */
659    
660  /*----------------------------------------------------------------------------  /*----------------------------------------------------------------------------
661   * "Motion" flags   * "Motion" flags

Legend:
Removed from v.1451  
changed lines
  Added in v.1730

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