[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.61, Fri Nov 14 15:43:27 2008 UTC revision 1.69, Sun Oct 10 19:19:55 2010 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,-127)  #define XVID_VERSION             XVID_MAKE_VERSION(1,3,-127)
61  #define XVID_API                 XVID_MAKE_API(4, 1)  #define XVID_API                 XVID_MAKE_API(4, 3)
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 47  #define XVID_BS_VERSION 57
77    
78  /*****************************************************************************  /*****************************************************************************
79   * error codes   * error codes
# Line 129  Line 129 
129  #define XVID_PROFILE_S_L1    0x01  #define XVID_PROFILE_S_L1    0x01
130  #define XVID_PROFILE_S_L2    0x02  #define XVID_PROFILE_S_L2    0x02
131  #define XVID_PROFILE_S_L3    0x03  #define XVID_PROFILE_S_L3    0x03
132    #define XVID_PROFILE_S_L4a   0x04
133    #define XVID_PROFILE_S_L5    0x05
134    #define XVID_PROFILE_S_L6    0x06
135  #define XVID_PROFILE_ARTS_L1 0x91 /* advanced realtime simple */  #define XVID_PROFILE_ARTS_L1 0x91 /* advanced realtime simple */
136  #define XVID_PROFILE_ARTS_L2 0x92  #define XVID_PROFILE_ARTS_L2 0x92
137  #define XVID_PROFILE_ARTS_L3 0x93  #define XVID_PROFILE_ARTS_L3 0x93
# Line 236  Line 239 
239  extern int xvid_decore(void *handle, int opt, void *param1, void *param2);  extern int xvid_decore(void *handle, int opt, void *param1, void *param2);
240    
241  /* XVID_DEC_CREATE param 1  /* XVID_DEC_CREATE param 1
242          image width & height may be specified here when the dimensions are          image width & height as well as FourCC code may be specified
243          known in advance. */          here when known in advance (e.g. being read from container) */
244  typedef struct {  typedef struct {
245          int version;          int version;
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 */
250  } xvid_dec_create_t;  } xvid_dec_create_t;
251    
252    
# Line 489  Line 493 
493  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */
494    
495  extern xvid_plugin_func xvid_plugin_ssim;       /*write ssim values to stdout*/  extern xvid_plugin_func xvid_plugin_ssim;       /*write ssim values to stdout*/
496    extern xvid_plugin_func xvid_plugin_psnrhvsm;   /*write psnrhvsm values to stdout*/
497    
498    
499  /* single pass rate control  /* single pass rate control
# Line 555  Line 560 
560          /*accuracy 0 very accurate 4 very fast*/          /*accuracy 0 very accurate 4 very fast*/
561          int acc;          int acc;
562    
563        int cpu_flags; /* XVID_CPU_XXX flags */
564    
565  } xvid_plugin_ssim_t;  } xvid_plugin_ssim_t;
566    
567    typedef struct {
568            int version;
569    
570            int method;      /* [in] masking method to apply. 0 for luminance masking, 1 for variance masking */
571    } xvid_plugin_lumimasking_t;
572    
573  /*****************************************************************************  /*****************************************************************************
574   *                             ENCODER API   *                             ENCODER API
575   ****************************************************************************/   ****************************************************************************/
# Line 754  Line 767 
767          /* ---------------------------------------------- */          /* ---------------------------------------------- */
768    
769          void *handle;                /* [out] encoder instance handle */          void *handle;                /* [out] encoder instance handle */
770    
771            /* ------- v1.3.x ------- */
772            int start_frame_num;         /* [in:opt] frame number of start frame relative to zones definitions. allows to encode sub-sequences */
773  } xvid_enc_create_t;  } xvid_enc_create_t;
774    
775    
Legend:
Removed from v.1.61  
changed lines
  Added in v.1.69
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4