[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.70, Tue Nov 16 14:42:07 2010 UTC revision 1.74.2.2, Mon Feb 14 17:21:00 2011 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,0)
61  #define XVID_API                 XVID_MAKE_API(4, 3)  #define XVID_API                 XVID_MAKE_API(4, 3)
62    
 #define XVID_UNSTABLE  
   
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
65   * encoder bugs in the decoder, without this it might not possible to   * encoder bugs in the decoder, without this it might not possible to
# Line 73  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 57  #define XVID_BS_VERSION 62
75    
76  /*****************************************************************************  /*****************************************************************************
77   * error codes   * error codes
# Line 246  Line 244 
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          int fourcc;     /* [in:opt] fourcc of the video */  /* ------- 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 370  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 669  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 746  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 772  Line 772 
772    
773          /* ------- v1.3.x ------- */          /* ------- v1.3.x ------- */
774          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 */
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.70  
changed lines
  Added in v.1.74.2.2
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4