[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.69, Sun Oct 10 19:19:55 2010 UTC revision 1.74, Fri Dec 24 13:20:07 2010 UTC
# 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,3,-127)  #define XVID_VERSION             XVID_MAKE_VERSION(1,3,-31)
61  #define XVID_API                 XVID_MAKE_API(4, 3)  #define XVID_API                 XVID_MAKE_API(4, 3)
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 57  #define XVID_BS_VERSION 60
77    
78  /*****************************************************************************  /*****************************************************************************
79   * error codes   * error codes
# Line 246  Line 246 
246          int width;      /* [in:opt] image width */          int width;      /* [in:opt] image width */
247          int height;     /* [in:opt] image width */          int height;     /* [in:opt] image width */
248          void * handle;  /* [out]    decore context handle */          void * handle;  /* [out]    decore context handle */
249          int fourcc;     /* [in:opt] fourcc of the video */  /* ------- v1.3.x ------- */
250            int fourcc;     /* [in:opt] fourcc of the input video */
251            int num_threads;/* [in:opt] number of threads to use in decoder */
252  } xvid_dec_create_t;  } xvid_dec_create_t;
253    
254    
# Line 370  Line 372 
372  #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */  #define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */
373  #define XVID_REQLAMBDA   (1<<3) /* plugin requires access to the lambda table */  #define XVID_REQLAMBDA   (1<<3) /* plugin requires access to the lambda table */
374    
   
375  typedef struct  typedef struct
376  {  {
377          int version;          int version;
# Line 541  Line 542 
542          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 */
543    
544  /* ------- v1.1.x ------- */  /* ------- v1.1.x ------- */
545          int vbv_size;                 /* [in] buffer size (bits) */          int vbv_size;                 /* [in] buffer size (bits) If this is zero, VBV check is disabled.*/
546          int vbv_initial;              /* [in] initial buffer occupancy (bits) */          int vbv_initial;              /* [in] initial buffer occupancy (bits) */
547          int vbv_maxrate;              /* [in] max processing bitrate (bits per second) */          int vbv_maxrate;              /* [in] max processing bitrate (bits per second) */
548          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).
549                                                                       *          This is used for diagnostics only and won't affect the actual peak bitrate.
550                                                                       *          This is not a problem as long as vbv_peakrate > vbv_size + vbv_maxrate which
551                                                                       *          guarantees that vbv_peakrate won't be exceeded. */
552  }xvid_plugin_2pass2_t;  }xvid_plugin_2pass2_t;
553    
554    
# Line 667  Line 670 
670  #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 */
671  #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 */
672  #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 */
673    #define XVID_VOP_RD_PSNRHVSM          (1<<14) /* use PSNR-HVS-M as metric for rate-distortion optimizations */
674    
675  /* Only valid for vol_flags|=XVID_VOL_INTERLACING */  /* Only valid for vol_flags|=XVID_VOL_INTERLACING */
676  #define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */  #define XVID_VOP_TOPFIELDFIRST        (1<< 9) /* set top-field-first flag  */
# Line 744  Line 748 
748          int num_plugins;             /* [in:opt] number of plugins */          int num_plugins;             /* [in:opt] number of plugins */
749          xvid_enc_plugin_t * plugins; /*          ^^ plugin array */          xvid_enc_plugin_t * plugins; /*          ^^ plugin array */
750    
751          int num_threads;             /* [in:opt] number of threads */          int num_threads;             /* [in:opt] number of threads to use in encoder */
752          int max_bframes;             /* [in:opt] max sequential bframes (0=disable bframes) */          int max_bframes;             /* [in:opt] max sequential bframes (0=disable bframes) */
753    
754          int global;                  /* [in:opt] global flags; controls encoding behavior */          int global;                  /* [in:opt] global flags; controls encoding behavior */
# Line 770  Line 774 
774    
775          /* ------- v1.3.x ------- */          /* ------- v1.3.x ------- */
776          int start_frame_num;         /* [in:opt] frame number of start frame relative to zones definitions. allows to encode sub-sequences */          int start_frame_num;         /* [in:opt] frame number of start frame relative to zones definitions. allows to encode sub-sequences */
777            int num_slices;              /* [in:opt] number of slices to code for each frame */
778  } xvid_enc_create_t;  } xvid_enc_create_t;
779    
780    

Legend:
Removed from v.1.69  
changed lines
  Added in v.1.74

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