* modules/gui/wxwindows: disable last commit for now since we don't seem to be able...

[vlc] / include / vlc_codec.h

diff --git a/include/vlc_codec.h b/include/vlc_codec.h
index 5224a1bdd8ebae3ab2779efea5f38f2adf1c0389..b22220c0a177de3d7e512cc75da60139d326c2ab 100644 (file)
--- a/include/vlc_codec.h
+++ b/include/vlc_codec.h
@@ -23,8 +23,6 @@
 #ifndef _VLC_CODEC_H
 #define _VLC_CODEC_H 1
 
-#include "ninput.h"
-
 /**
  * \file
  * This file defines the structure and types used by decoders and encoders
@@ -48,20 +46,23 @@ struct decoder_t
     module_t *          p_module;
     decoder_sys_t *     p_sys;
 
-    picture_t *         ( * pf_decode_video )( decoder_t *, block_t ** );
-    aout_buffer_t *     ( * pf_decode_audio )( decoder_t *, block_t ** );
-    void                ( * pf_decode_sub)   ( decoder_t *, block_t ** );
-    block_t *           ( * pf_packetize )   ( decoder_t *, block_t ** );
-
-    /* Some decoders only accept packetized data (ie. not truncated) */
-    vlc_bool_t          b_need_packetized;
-
     /* Input format ie from demuxer (XXX: a lot of field could be invalid) */
     es_format_t         fmt_in;
 
     /* Output format of decoder/packetizer */
     es_format_t         fmt_out;
 
+    /* Some decoders only accept packetized data (ie. not truncated) */
+    vlc_bool_t          b_need_packetized;
+
+    /* Tell the decoder if it is allowed to drop frames */
+    vlc_bool_t          b_pace_control;
+
+    picture_t *         ( * pf_decode_video )( decoder_t *, block_t ** );
+    aout_buffer_t *     ( * pf_decode_audio )( decoder_t *, block_t ** );
+    subpicture_t *      ( * pf_decode_sub)   ( decoder_t *, block_t ** );
+    block_t *           ( * pf_packetize )   ( decoder_t *, block_t ** );
+
     /*
      * Buffers allocation
      */
@@ -76,6 +77,9 @@ struct decoder_t
     void            ( * pf_picture_link)    ( decoder_t *, picture_t * );
     void            ( * pf_picture_unlink)  ( decoder_t *, picture_t * );
 
+    /* SPU output callbacks */
+    subpicture_t *  ( * pf_spu_buffer_new) ( decoder_t * );
+    void            ( * pf_spu_buffer_del) ( decoder_t *, subpicture_t * );
 
     /* Private structure for the owner of the decoder */
     decoder_owner_sys_t *p_owner;
@@ -101,18 +105,21 @@ struct encoder_t
     module_t *          p_module;
     encoder_sys_t *     p_sys;
 
-    block_t *           ( * pf_header )( encoder_t * );
-    block_t *           ( * pf_encode_video )( encoder_t *, picture_t * );
-    block_t *           ( * pf_encode_audio )( encoder_t *, aout_buffer_t * );
-
     /* Properties of the input data fed to the encoder */
     es_format_t         fmt_in;
 
     /* Properties of the output of the encoder */
     es_format_t         fmt_out;
 
-    /* Number of threads to use during encoding */
-    int                 i_threads;
+    block_t *           ( * pf_encode_video )( encoder_t *, picture_t * );
+    block_t *           ( * pf_encode_audio )( encoder_t *, aout_buffer_t * );
+    block_t *           ( * pf_encode_sub )( encoder_t *, subpicture_t * );
+
+    /* Common encoder options */
+    int i_threads;               /* Number of threads to use during encoding */
+    int i_iframes;               /* One I frame per i_iframes */
+    int i_bframes;               /* One B frame per i_bframes */
+    int i_tolerance;             /* Bitrate tolerance */
 
     /* Encoder config */
     sout_cfg_t *p_cfg;