[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.51, Thu Oct 6 10:46:42 2005 UTC revision 1.63.2.2, Mon Dec 1 16:35:47 2008 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,1,-125)  #define XVID_VERSION             XVID_MAKE_VERSION(1,2,1)
61  #define XVID_API                 XVID_MAKE_API(4, 1)  #define XVID_API                 XVID_MAKE_API(4, 2)
   
 #define XVID_UNSTABLE  
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 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 39  #define XVID_BS_VERSION 50
75    
76  /*****************************************************************************  /*****************************************************************************
77   * error codes   * error codes
# Line 102  Line 100 
100  #define XVID_CSP_YUY2     (1<< 3) /* 4:2:2 packed */  #define XVID_CSP_YUY2     (1<< 3) /* 4:2:2 packed */
101  #define XVID_CSP_UYVY     (1<< 4) /* 4:2:2 packed */  #define XVID_CSP_UYVY     (1<< 4) /* 4:2:2 packed */
102  #define XVID_CSP_YVYU     (1<< 5) /* 4:2:2 packed */  #define XVID_CSP_YVYU     (1<< 5) /* 4:2:2 packed */
103    #define XVID_CSP_RGB      (1<<16) /* 24-bit rgb packed */
104  #define XVID_CSP_BGRA     (1<< 6) /* 32-bit bgra packed */  #define XVID_CSP_BGRA     (1<< 6) /* 32-bit bgra packed */
105  #define XVID_CSP_ABGR     (1<< 7) /* 32-bit abgr packed */  #define XVID_CSP_ABGR     (1<< 7) /* 32-bit abgr packed */
106  #define XVID_CSP_RGBA     (1<< 8) /* 32-bit rgba packed */  #define XVID_CSP_RGBA     (1<< 8) /* 32-bit rgba packed */
# Line 169  Line 168 
168  #define XVID_CPU_MMXEXT   (1<< 1) /*   mmx-ext : pentium2, athlon */  #define XVID_CPU_MMXEXT   (1<< 1) /*   mmx-ext : pentium2, athlon */
169  #define XVID_CPU_SSE      (1<< 2) /*       sse : pentium3, athlonXP */  #define XVID_CPU_SSE      (1<< 2) /*       sse : pentium3, athlonXP */
170  #define XVID_CPU_SSE2     (1<< 3) /*      sse2 : pentium4, athlon64 */  #define XVID_CPU_SSE2     (1<< 3) /*      sse2 : pentium4, athlon64 */
171    #define XVID_CPU_SSE3     (1<< 8) /*      sse3 : pentium4, athlon64 */
172    #define XVID_CPU_SSE41    (1<< 9) /*      sse41: penryn */
173  #define XVID_CPU_3DNOW    (1<< 4) /*     3dnow : k6-2 */  #define XVID_CPU_3DNOW    (1<< 4) /*     3dnow : k6-2 */
174  #define XVID_CPU_3DNOWEXT (1<< 5) /* 3dnow-ext : athlon */  #define XVID_CPU_3DNOWEXT (1<< 5) /* 3dnow-ext : athlon */
175  #define XVID_CPU_TSC      (1<< 6) /*       tsc : Pentium */  #define XVID_CPU_TSC      (1<< 6) /*       tsc : Pentium */
# 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        int cpu_flags; /* XVID_CPU_XXX flags */
557    
558    } xvid_plugin_ssim_t;
559    
560  /*****************************************************************************  /*****************************************************************************
561   *                             ENCODER API   *                             ENCODER API
562   ****************************************************************************/   ****************************************************************************/
Legend:
Removed from v.1.51  
changed lines
  Added in v.1.63.2.2
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4