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

Diff of /trunk/xvidcore/src/xvid.h

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

revision 1764, Wed Dec 6 19:55:07 2006 UTC revision 1890, Tue Aug 10 14:17:40 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-2004 Peter Ross <pross@xvid.org>
7   *   *
# Line 19  Line 19 
19   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
20   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
21   *   *
22   * $Id: xvid.h,v 1.60 2006-12-06 19:55:07 Isibaar Exp $   * $Id: xvid.h,v 1.67 2010-08-10 14:17:23 Isibaar Exp $
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
# 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 171  Line 171 
171  #define XVID_CPU_SSE      (1<< 2) /*       sse : pentium3, athlonXP */  #define XVID_CPU_SSE      (1<< 2) /*       sse : pentium3, athlonXP */
172  #define XVID_CPU_SSE2     (1<< 3) /*      sse2 : pentium4, athlon64 */  #define XVID_CPU_SSE2     (1<< 3) /*      sse2 : pentium4, athlon64 */
173  #define XVID_CPU_SSE3     (1<< 8) /*      sse3 : pentium4, athlon64 */  #define XVID_CPU_SSE3     (1<< 8) /*      sse3 : pentium4, athlon64 */
174    #define XVID_CPU_SSE41    (1<< 9) /*      sse41: penryn */
175  #define XVID_CPU_3DNOW    (1<< 4) /*     3dnow : k6-2 */  #define XVID_CPU_3DNOW    (1<< 4) /*     3dnow : k6-2 */
176  #define XVID_CPU_3DNOWEXT (1<< 5) /* 3dnow-ext : athlon */  #define XVID_CPU_3DNOWEXT (1<< 5) /* 3dnow-ext : athlon */
177  #define XVID_CPU_TSC      (1<< 6) /*       tsc : Pentium */  #define XVID_CPU_TSC      (1<< 6) /*       tsc : Pentium */
# Line 235  Line 236 
236  extern int xvid_decore(void *handle, int opt, void *param1, void *param2);  extern int xvid_decore(void *handle, int opt, void *param1, void *param2);
237    
238  /* XVID_DEC_CREATE param 1  /* XVID_DEC_CREATE param 1
239          image width & height may be specified here when the dimensions are          image width & height as well as FourCC code may be specified
240          known in advance. */          here when known in advance (e.g. being read from container) */
241  typedef struct {  typedef struct {
242          int version;          int version;
243          int width;     /* [in:opt] image width */          int width;     /* [in:opt] image width */
244          int height;    /* [in:opt] image width */          int height;    /* [in:opt] image width */
245          void * handle; /* [out]    decore context handle */          void * handle; /* [out]    decore context handle */
246            int fourcc;     /* [in:opt] fourcc of the video */
247  } xvid_dec_create_t;  } xvid_dec_create_t;
248    
249    
# Line 554  Line 556 
556          /*accuracy 0 very accurate 4 very fast*/          /*accuracy 0 very accurate 4 very fast*/
557          int acc;          int acc;
558    
559        int cpu_flags; /* XVID_CPU_XXX flags */
560    
561  } xvid_plugin_ssim_t;  } xvid_plugin_ssim_t;
562    
563    typedef struct {
564            int version;
565    
566            int method;      /* [in] masking method to apply. 0 for luminance masking, 1 for variance masking */
567    } xvid_plugin_lumimasking_t;
568    
569  /*****************************************************************************  /*****************************************************************************
570   *                             ENCODER API   *                             ENCODER API
571   ****************************************************************************/   ****************************************************************************/
# Line 753  Line 763 
763          /* ---------------------------------------------- */          /* ---------------------------------------------- */
764    
765          void *handle;                /* [out] encoder instance handle */          void *handle;                /* [out] encoder instance handle */
766    
767            /* ------- v1.3.x ------- */
768            int start_frame_num;         /* [in:opt] frame number of start frame relative to zones definitions. allows to encode sub-sequences */
769  } xvid_enc_create_t;  } xvid_enc_create_t;
770    
771    

Legend:
Removed from v.1764  
changed lines
  Added in v.1890

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