X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_codec.h;h=ffc33e7b6caaaea06873838168c1b2c457dbb814;hb=5ebacd11d10f9acc39afc0b3d41beb280eaac293;hp=5acb0746ee8c1a979e7cfcb3481e9efc0a0b6b13;hpb=8331d3636cf6be25da00f7ac7077f8aabe467522;p=vlc diff --git a/include/vlc_codec.h b/include/vlc_codec.h index 5acb0746ee..ffc33e7b6c 100644 --- a/include/vlc_codec.h +++ b/include/vlc_codec.h @@ -1,8 +1,8 @@ /***************************************************************************** - * vlc_codec.h: codec related structures + * vlc_codec.h: Definition of the decoder and encoder structures ***************************************************************************** - * Copyright (C) 1999-2003 VideoLAN - * $Id: vlc_codec.h,v 1.3 2003/11/05 18:59:01 gbazin Exp $ + * Copyright (C) 1999-2003 the VideoLAN team + * $Id$ * * Authors: Gildas Bazin * @@ -18,16 +18,22 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ + #ifndef _VLC_CODEC_H #define _VLC_CODEC_H 1 +#include +#include + /** * \file * This file defines the structure and types used by decoders and encoders */ +typedef struct decoder_owner_sys_t decoder_owner_sys_t; + /** * \defgroup decoder Decoder * @@ -36,6 +42,11 @@ * @{ */ +/* + * BIG FAT WARNING : the code relies in the first 4 members of filter_t + * and decoder_t to be the same, so if you have anything to add, do it + * at the end of the structure. + */ struct decoder_t { VLC_COMMON_MEMBERS @@ -43,15 +54,53 @@ struct decoder_t /* Module properties */ module_t * p_module; decoder_sys_t * p_sys; - int ( * pf_init ) ( decoder_t * ); - int ( * pf_decode )( decoder_t *, block_t * ); - int ( * pf_end ) ( decoder_t * ); - /* Input properties */ - decoder_fifo_t * p_fifo; /* stores the PES stream data */ + /* 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) */ + bool b_need_packetized; + + /* Tell the decoder if it is allowed to drop frames */ + bool 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 ** ); + + /* Closed Caption (CEA 608/708) extraction. + * If set, it *may* be called after pf_decode_video/pf_packetize + * returned data. It should return CC for the pictures returned by the + * last pf_packetize/pf_decode_video call only, + * pb_present will be used to known which cc channel are present (but + * globaly, not necessary for the current packet */ + block_t * ( * pf_get_cc ) ( decoder_t *, bool pb_present[4] ); + + /* + * Buffers allocation + */ + + /* Audio output callbacks */ + aout_buffer_t * ( * pf_aout_buffer_new) ( decoder_t *, int ); + void ( * pf_aout_buffer_del) ( decoder_t *, aout_buffer_t * ); - /* Tmp field for old decoder api */ - int ( * pf_run ) ( decoder_fifo_t * ); + /* Video output callbacks */ + picture_t * ( * pf_vout_buffer_new) ( decoder_t * ); + void ( * pf_vout_buffer_del) ( decoder_t *, picture_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; }; /** @@ -74,38 +123,32 @@ 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 */ - union { - audio_sample_format_t audio; - video_frame_format_t video; - } format; + es_format_t fmt_in; /* Properties of the output of the encoder */ - vlc_fourcc_t i_fourcc; - int i_bitrate; - - int i_extra_data; - uint8_t *p_extra_data; - - /* FIXME: move these to the ffmpeg encoder */ - int i_frame_rate; - int i_frame_rate_base; - int i_aspect; - int i_key_int; - int i_b_frames; - int i_vtolerance; - int i_qmin; - int i_qmax; - int i_hq; + es_format_t fmt_out; + 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 */ + config_chain_t *p_cfg; }; /** * @} */ +VLC_EXPORT( input_attachment_t *, decoder_GetInputAttachment, ( decoder_t *, const char *psz_name ) ); +VLC_EXPORT( int, decoder_GetInputAttachments, ( decoder_t *p_dec, input_attachment_t ***ppp_attachment, int *pi_attachment ) ); +VLC_EXPORT( mtime_t, decoder_GetDisplayDate, ( decoder_t *, mtime_t ) ); + #endif /* _VLC_CODEC_H */