[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 1909, Sun Nov 28 15:19:07 2010 UTC revision 2085, Fri Apr 25 15:38:36 2014 UTC
# Line 3  Line 3 
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-2010 Peter Ross <pross@xvid.org>   *  Copyright(C) 2001-2011 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 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.71 2010-11-28 15:18:21 Isibaar Exp $   * $Id$
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
26  #ifndef _XVID_H_  #ifndef _XVID_H_
27  #define _XVID_H_  #define _XVID_H_
28    
   
29  #ifdef __cplusplus  #ifdef __cplusplus
30  extern "C" {  extern "C" {
31  #endif  #endif
32    
33  /*****************************************************************************  /*****************************************************************************
34     * function export defines
35     ****************************************************************************/
36    
37    #ifndef XVID_IMPEXP
38    #define XVID_IMPEXP             extern
39    #endif
40    
41    #ifndef XVID_CALL
42    #define XVID_CALL
43    #endif
44    
45    /*****************************************************************************
46   * versioning   * versioning
47   ****************************************************************************/   ****************************************************************************/
48    
# Line 57  Line 68 
68  #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)  #define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
69  #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)  #define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
70    
71  #define XVID_VERSION             XVID_MAKE_VERSION(1,3,-127)  #define XVID_VERSION             XVID_MAKE_VERSION(1,4,-127)
72  #define XVID_API                 XVID_MAKE_API(4, 3)  #define XVID_API                 XVID_MAKE_API(4, 4)
73    
74  #define XVID_UNSTABLE  #define XVID_UNSTABLE
75    
# Line 73  Line 84 
84   * 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
85   * future   * future
86   */   */
87  #define XVID_BS_VERSION 58  #define XVID_BS_VERSION 73
88    
89  /*****************************************************************************  /*****************************************************************************
90   * error codes   * error codes
# Line 225  Line 236 
236  #define XVID_GBL_INFO    1 /* return some info about xvidcore, and the host computer */  #define XVID_GBL_INFO    1 /* return some info about xvidcore, and the host computer */
237  #define XVID_GBL_CONVERT 2 /* colorspace conversion utility */  #define XVID_GBL_CONVERT 2 /* colorspace conversion utility */
238    
239  extern int xvid_global(void *handle, int opt, void *param1, void *param2);  XVID_IMPEXP int XVID_CALL xvid_global(void *handle, int opt, void *param1, void *param2);
240    
241    
242  /*****************************************************************************  /*****************************************************************************
# Line 236  Line 247 
247  #define XVID_DEC_DESTROY 1 /* destroy decore instance: return 0 on success */  #define XVID_DEC_DESTROY 1 /* destroy decore instance: return 0 on success */
248  #define XVID_DEC_DECODE  2 /* decode a frame: returns number of bytes consumed >= 0 */  #define XVID_DEC_DECODE  2 /* decode a frame: returns number of bytes consumed >= 0 */
249    
250  extern int xvid_decore(void *handle, int opt, void *param1, void *param2);  XVID_IMPEXP int XVID_CALL xvid_decore(void *handle, int opt, void *param1, void *param2);
251    
252  /* XVID_DEC_CREATE param 1  /* XVID_DEC_CREATE param 1
253          image width & height as well as FourCC code may be specified          image width & height as well as FourCC code may be specified
# Line 246  Line 257 
257          int width;      /* [in:opt] image width */          int width;      /* [in:opt] image width */
258          int height;     /* [in:opt] image width */          int height;     /* [in:opt] image width */
259          void * handle;  /* [out]    decore context handle */          void * handle;  /* [out]    decore context handle */
260          int fourcc;     /* [in:opt] fourcc of the video */  /* ------- v1.3.x ------- */
261            int fourcc;     /* [in:opt] fourcc of the input video */
262            int num_threads;/* [in:opt] number of threads to use in decoder */
263  } xvid_dec_create_t;  } xvid_dec_create_t;
264    
265    
# Line 473  Line 486 
486    
487   ****************************************************************************/   ****************************************************************************/
488    
489  typedef int (xvid_plugin_func)(void * handle, int opt, void * param1, void * param2);  typedef int (XVID_CALL xvid_plugin_func)(void * handle, int opt, void * param1, void * param2);
490    
491  typedef struct  typedef struct
492  {  {
# Line 481  Line 494 
494          void * param;          void * param;
495  } xvid_enc_plugin_t;  } xvid_enc_plugin_t;
496    
497    XVID_IMPEXP xvid_plugin_func xvid_plugin_single;   /* single-pass rate control */
498    XVID_IMPEXP xvid_plugin_func xvid_plugin_2pass1;   /* two-pass rate control: first pass */
499    XVID_IMPEXP xvid_plugin_func xvid_plugin_2pass2;   /* two-pass rate control: second pass */
500    
501  extern xvid_plugin_func xvid_plugin_single;   /* single-pass rate control */  XVID_IMPEXP xvid_plugin_func xvid_plugin_lumimasking;  /* lumimasking */
 extern xvid_plugin_func xvid_plugin_2pass1;   /* two-pass rate control: first pass */  
 extern xvid_plugin_func xvid_plugin_2pass2;   /* two-pass rate control: second pass */  
   
 extern xvid_plugin_func xvid_plugin_lumimasking;  /* lumimasking */  
502    
503  extern xvid_plugin_func xvid_plugin_psnr;       /* write psnr values to stdout */  XVID_IMPEXP xvid_plugin_func xvid_plugin_psnr;      /* write psnr values to stdout */
504  extern xvid_plugin_func xvid_plugin_dump;       /* dump before and after yuvpgms */  XVID_IMPEXP xvid_plugin_func xvid_plugin_dump;      /* dump before and after yuvpgms */
505    
506  extern xvid_plugin_func xvid_plugin_ssim;           /*write ssim values to stdout*/  XVID_IMPEXP xvid_plugin_func xvid_plugin_ssim;      /*write ssim values to stdout*/
507  extern xvid_plugin_func xvid_plugin_psnrhvsm;   /*write psnrhvsm values to stdout*/  XVID_IMPEXP xvid_plugin_func xvid_plugin_psnrhvsm;  /*write psnrhvsm values to stdout*/
508    
509    
510  /* single pass rate control  /* single pass rate control
# Line 589  Line 601 
601   * Encoder entry point   * Encoder entry point
602   *--------------------------------------------------------------------------*/   *--------------------------------------------------------------------------*/
603    
604  extern int xvid_encore(void *handle, int opt, void *param1, void *param2);  XVID_IMPEXP int XVID_CALL xvid_encore(void *handle, int opt, void *param1, void *param2);
605    
606  /* Quick API reference  /* Quick API reference
607   *   *
# Line 746  Line 758 
758          int num_plugins;             /* [in:opt] number of plugins */          int num_plugins;             /* [in:opt] number of plugins */
759          xvid_enc_plugin_t * plugins; /*          ^^ plugin array */          xvid_enc_plugin_t * plugins; /*          ^^ plugin array */
760    
761          int num_threads;             /* [in:opt] number of threads */          int num_threads;             /* [in:opt] number of threads to use in encoder */
762          int max_bframes;             /* [in:opt] max sequential bframes (0=disable bframes) */          int max_bframes;             /* [in:opt] max sequential bframes (0=disable bframes) */
763    
764          int global;                  /* [in:opt] global flags; controls encoding behavior */          int global;                  /* [in:opt] global flags; controls encoding behavior */
# Line 772  Line 784 
784    
785          /* ------- v1.3.x ------- */          /* ------- v1.3.x ------- */
786          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 */
787            int num_slices;              /* [in:opt] number of slices to code for each frame */
788  } xvid_enc_create_t;  } xvid_enc_create_t;
789    
790    

Legend:
Removed from v.1909  
changed lines
  Added in v.2085

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