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

Diff of /xvidcore/src/xvid.h

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

revision 1.63.2.3, Mon May 25 08:09:23 2009 UTC revision 1.74.2.2, Mon Feb 14 17:21:00 2011 UTC
# Line 1  Line 1 
1  /*****************************************************************************  /*****************************************************************************
2   *   *
3   * XVID MPEG-4 VIDEO CODEC   * XVID MPEG-4 VIDEO CODEC
4   * - XviD Main header file -   * - Xvid Main header file -
5   *   *
6   *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>   *  Copyright(C) 2001-2010 Peter Ross <pross@xvid.org>
7   *   *
8   *  This program is free software ; you can redistribute it and/or modify   *  This program is free software ; you can redistribute it and/or modify
9   *  it under the terms of the GNU General Public License as published by   *  it under the terms of the GNU General Public License as published by
# 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,2,2)  #define XVID_VERSION             XVID_MAKE_VERSION(1,3,0)
61  #define XVID_API                 XVID_MAKE_API(4, 2)  #define XVID_API                 XVID_MAKE_API(4, 3)
62    
63  /* Bitstream Version  /* Bitstream Version
64   * this will be writen into the bitstream to allow easy detection of xvid   * this will be writen into the bitstream to allow easy detection of xvid
# Line 71  Line 71 
71   * 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
72   * future   * future
73   */   */
74  #define XVID_BS_VERSION 50  #define XVID_BS_VERSION 62
75    
76  /*****************************************************************************  /*****************************************************************************
77   * error codes   * error codes
# Line 127  Line 127 
127  #define XVID_PROFILE_S_L1    0x01  #define XVID_PROFILE_S_L1    0x01
128  #define XVID_PROFILE_S_L2    0x02  #define XVID_PROFILE_S_L2    0x02
129  #define XVID_PROFILE_S_L3    0x03  #define XVID_PROFILE_S_L3    0x03
130    #define XVID_PROFILE_S_L4a   0x04
131    #define XVID_PROFILE_S_L5    0x05
132    #define XVID_PROFILE_S_L6    0x06
133  #define XVID_PROFILE_ARTS_L1 0x91 /* advanced realtime simple */  #define XVID_PROFILE_ARTS_L1 0x91 /* advanced realtime simple */
134  #define XVID_PROFILE_ARTS_L2 0x92  #define XVID_PROFILE_ARTS_L2 0x92
135  #define XVID_PROFILE_ARTS_L3 0x93  #define XVID_PROFILE_ARTS_L3 0x93
# Line 234  Line 237 
237  extern int xvid_decore(void *handle, int opt, void *param1, void *param2);  extern int xvid_decore(void *handle, int opt, void *param1, void *param2);
238    
239  /* XVID_DEC_CREATE param 1  /* XVID_DEC_CREATE param 1
240          image width & height may be specified here when the dimensions are          image width & height as well as FourCC code may be specified
241          known in advance. */          here when known in advance (e.g. being read from container) */
242  typedef struct {  typedef struct {
243          int version;          int version;
244          int width;     /* [in:opt] image width */          int width;     /* [in:opt] image width */
245          int height;    /* [in:opt] image width */          int height;    /* [in:opt] image width */
246          void * handle; /* [out]    decore context handle */          void * handle; /* [out]    decore context handle */
247    /* ------- v1.3.x ------- */
248            int fourcc;     /* [in:opt] fourcc of the input video */
249            int num_threads;/* [in:opt] number of threads to use in decoder */
250  } xvid_dec_create_t;  } xvid_dec_create_t;
251    
252    
# Line 364  Line 370 
370  #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */  #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */
371  #define XVID_REQLAMBDA   (1<<3) /* plugin requires access to the lambda table */  #define XVID_REQLAMBDA   (1<<3) /* plugin requires access to the lambda table */
372    
   
373  typedef struct  typedef struct
374  {  {
375          int version;          int version;
# Line 487  Line 492 
492  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */
493    
494  extern xvid_plugin_func xvid_plugin_ssim;       /*write ssim values to stdout*/  extern xvid_plugin_func xvid_plugin_ssim;       /*write ssim values to stdout*/
495    extern xvid_plugin_func xvid_plugin_psnrhvsm;   /*write psnrhvsm values to stdout*/
496    
497    
498  /* single pass rate control  /* single pass rate control
# Line 534  Line 540 
540          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 */
541    
542  /* ------- v1.1.x ------- */  /* ------- v1.1.x ------- */
543          int vbv_size;                 /* [in] buffer size (bits) */          int vbv_size;                 /* [in] buffer size (bits) If this is zero, VBV check is disabled.*/
544          int vbv_initial;              /* [in] initial buffer occupancy (bits) */          int vbv_initial;              /* [in] initial buffer occupancy (bits) */
545          int vbv_maxrate;              /* [in] max processing bitrate (bits per second) */          int vbv_maxrate;              /* [in] max processing bitrate (bits per second) */
546          int vbv_peakrate;             /* [in:opt] max average bitrate over 3 seconds (bits per second) */          int vbv_peakrate;             /* [in:opt] max average bitrate over 1 second (bits per second).
547                                                                       *          This is used for diagnostics only and won't affect the actual peak bitrate.
548                                                                       *          This is not a problem as long as vbv_peakrate > vbv_size + vbv_maxrate which
549                                                                       *          guarantees that vbv_peakrate won't be exceeded. */
550  }xvid_plugin_2pass2_t;  }xvid_plugin_2pass2_t;
551    
552    
# Line 557  Line 565 
565    
566  } xvid_plugin_ssim_t;  } xvid_plugin_ssim_t;
567    
568    typedef struct {
569            int version;
570    
571            int method;      /* [in] masking method to apply. 0 for luminance masking, 1 for variance masking */
572    } xvid_plugin_lumimasking_t;
573    
574  /*****************************************************************************  /*****************************************************************************
575   *                             ENCODER API   *                             ENCODER API
576   ****************************************************************************/   ****************************************************************************/
# Line 654  Line 668 
668  #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 */
669  #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 */
670  #define XVID_VOP_RD_BVOP              (1<<13) /* enable rate-distortion mode decision in b-frames */  #define XVID_VOP_RD_BVOP              (1<<13) /* enable rate-distortion mode decision in b-frames */
671    #define XVID_VOP_RD_PSNRHVSM          (1<<14) /* use PSNR-HVS-M as metric for rate-distortion optimizations */
672    
673  /* Only valid for vol_flags|=XVID_VOL_INTERLACING */  /* Only valid for vol_flags|=XVID_VOL_INTERLACING */
674  #define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */  #define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */
# Line 731  Line 746 
746          int num_plugins;             /* [in:opt] number of plugins */          int num_plugins;             /* [in:opt] number of plugins */
747          xvid_enc_plugin_t * plugins; /*          ^^ plugin array */          xvid_enc_plugin_t * plugins; /*          ^^ plugin array */
748    
749          int num_threads;             /* [in:opt] number of threads */          int num_threads;             /* [in:opt] number of threads to use in encoder */
750          int max_bframes;             /* [in:opt] max sequential bframes (0=disable bframes) */          int max_bframes;             /* [in:opt] max sequential bframes (0=disable bframes) */
751    
752          int global;                  /* [in:opt] global flags; controls encoding behavior */          int global;                  /* [in:opt] global flags; controls encoding behavior */
# Line 754  Line 769 
769          /* ---------------------------------------------- */          /* ---------------------------------------------- */
770    
771          void *handle;                /* [out] encoder instance handle */          void *handle;                /* [out] encoder instance handle */
772    
773            /* ------- v1.3.x ------- */
774            int start_frame_num;         /* [in:opt] frame number of start frame relative to zones definitions. allows to encode sub-sequences */
775            int num_slices;              /* [in:opt] number of slices to code for each frame */
776  } xvid_enc_create_t;  } xvid_enc_create_t;
777    
778    
Legend:
Removed from v.1.63.2.3  
changed lines
  Added in v.1.74.2.2
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4