X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Finput_ext-dec.h;h=12c8ceadb4e046130f476317c3cfe7a660a7c47d;hb=7bb574fdf5724bee95a011cf96f33c95f1ff8645;hp=839ee9af384d52747c86a877840708f25df06680;hpb=8d5c85f26f79ef0853bb5f23ff33809a8999716c;p=vlc diff --git a/include/input_ext-dec.h b/include/input_ext-dec.h index 839ee9af38..12c8ceadb4 100644 --- a/include/input_ext-dec.h +++ b/include/input_ext-dec.h @@ -2,7 +2,7 @@ * input_ext-dec.h: structures exported to the VideoLAN decoders ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: input_ext-dec.h,v 1.69 2002/08/12 22:12:50 massiot Exp $ + * $Id: input_ext-dec.h,v 1.80 2003/09/02 20:19:25 gbazin Exp $ * * Authors: Christophe Massiot * Michel Kaempf @@ -25,18 +25,6 @@ #ifndef _VLC_INPUT_EXT_DEC_H #define _VLC_INPUT_EXT_DEC_H 1 -/* ES streams types - see ISO/IEC 13818-1 table 2-29 numbers. - * these values are used in src/input/mpeg_system.c, and in - * the following plugins: mpeg_ts, mpeg_ts_dvbpsi, input_satellite. */ -#define MPEG1_VIDEO_ES 0x01 -#define MPEG2_VIDEO_ES 0x02 -#define MPEG1_AUDIO_ES 0x03 -#define MPEG2_AUDIO_ES 0x04 -#define A52_AUDIO_ES 0x81 -/* These ones might violate the norm : */ -#define DVD_SPU_ES 0x82 -#define LPCM_AUDIO_ES 0x83 - /* Structures exported to the decoders */ /***************************************************************************** @@ -114,14 +102,37 @@ struct decoder_fifo_t input_buffers_t *p_packets_mgt; /* packets management services data */ /* Standard pointers given to the decoders as a toolbox. */ - u16 i_id; + uint16_t i_id; vlc_fourcc_t i_fourcc; es_sys_t * p_demux_data; stream_ctrl_t * p_stream_ctrl; sout_instance_t * p_sout; + void * p_waveformatex; + void * p_bitmapinfoheader; + + decoder_t * p_dec; +}; + +/***************************************************************************** + * decoder_t + ***************************************************************************** + * The decoder descriptor. + *****************************************************************************/ +struct decoder_t +{ + VLC_COMMON_MEMBERS /* Module properties */ - module_t * p_module; + 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 */ + + /* Tmp field for old decoder api */ int ( * pf_run ) ( decoder_fifo_t * ); }; @@ -131,7 +142,7 @@ struct decoder_fifo_t * This type describes a bit fifo used to store bits while working with the * input stream at the bit level. *****************************************************************************/ -typedef u32 WORD_TYPE; +typedef uint32_t WORD_TYPE; typedef struct bit_fifo_t { @@ -179,7 +190,9 @@ struct bit_stream_t /* * Byte structures */ - /* Current data packet (in the current PES packet of the PES stream) */ + /* Current PES packet (extracted from the PES stream) */ + pes_packet_t * p_pes; + /* Current data packet (in the current PES packet) */ data_packet_t * p_data; /* Pointer to the next byte that is to be read (in the current packet) */ byte_t * p_byte; @@ -206,12 +219,12 @@ struct bit_stream_t * results will be returned. Use RealignBits() if unsure. */ -#if (WORD_TYPE == u32) +#if (WORD_TYPE == uint32_t) # define WORD_AT U32_AT -# define WORD_SIGNED s32 -#elif (WORD_TYPE == u64) +# define WORD_SIGNED int32_t +#elif (WORD_TYPE == uint64_t) # define WORD_AT U64_AT -# define WORD_SIGNED s64 +# define WORD_SIGNED int64_t #else # error Unsupported WORD_TYPE #endif @@ -219,13 +232,17 @@ struct bit_stream_t /***************************************************************************** * Prototypes from input_ext-dec.c *****************************************************************************/ -VLC_EXPORT( void, InitBitstream, ( bit_stream_t *, decoder_fifo_t *, void ( * )( bit_stream_t *, vlc_bool_t ), void * p_callback_arg ) ); -VLC_EXPORT( vlc_bool_t, NextDataPacket, ( decoder_fifo_t *, data_packet_t ** ) ); +VLC_EXPORT( void, input_ExtractPES, ( decoder_fifo_t *, pes_packet_t ** ) ); +VLC_EXPORT( void, input_DeletePES, ( input_buffers_t *, pes_packet_t * ) ); +VLC_EXPORT( int, InitBitstream, ( bit_stream_t *, decoder_fifo_t *, void ( * )( bit_stream_t *, vlc_bool_t ), void * p_callback_arg ) ); +VLC_EXPORT( vlc_bool_t, NextDataPacket, ( decoder_fifo_t *, bit_stream_t * ) ); VLC_EXPORT( void, BitstreamNextDataPacket, ( bit_stream_t * ) ); -VLC_EXPORT( u32, UnalignedShowBits, ( bit_stream_t *, unsigned int ) ); +VLC_EXPORT( uint32_t, UnalignedShowBits, ( bit_stream_t *, unsigned int ) ); VLC_EXPORT( void, UnalignedRemoveBits, ( bit_stream_t * ) ); -VLC_EXPORT( u32, UnalignedGetBits, ( bit_stream_t *, unsigned int ) ); +VLC_EXPORT( uint32_t, UnalignedGetBits, ( bit_stream_t *, unsigned int ) ); +VLC_EXPORT( void, CloseBitstream, ( bit_stream_t * ) ); VLC_EXPORT( void, CurrentPTS, ( bit_stream_t *, mtime_t *, mtime_t * ) ); +VLC_EXPORT( void, NextPTS, ( bit_stream_t *, mtime_t *, mtime_t * ) ); /***************************************************************************** * AlignWord : fill in the bit buffer so that the byte pointer be aligned @@ -258,9 +275,10 @@ static inline void AlignWord( bit_stream_t * p_bit_stream ) /***************************************************************************** * ShowBits : return i_bits bits from the bit stream *****************************************************************************/ -static inline u32 ShowBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) +static inline uint32_t ShowBits( bit_stream_t * p_bit_stream, + unsigned int i_bits ) { - if( p_bit_stream->fifo.i_available >= i_bits ) + if( (unsigned int)p_bit_stream->fifo.i_available >= i_bits ) { return( p_bit_stream->fifo.buffer >> (8 * sizeof(WORD_TYPE) - i_bits) ); } @@ -280,10 +298,10 @@ static inline u32 ShowBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) * ShowSignedBits : return i_bits bits from the bit stream, using signed * arithmetic *****************************************************************************/ -static inline s32 ShowSignedBits( bit_stream_t * p_bit_stream, - unsigned int i_bits ) +static inline int32_t ShowSignedBits( bit_stream_t * p_bit_stream, + unsigned int i_bits ) { - if( p_bit_stream->fifo.i_available >= i_bits ) + if( (unsigned int)p_bit_stream->fifo.i_available >= i_bits ) { return( (WORD_SIGNED)p_bit_stream->fifo.buffer >> (8 * sizeof(WORD_TYPE) - i_bits) ); @@ -326,7 +344,7 @@ static inline void RemoveBits( bit_stream_t * p_bit_stream, * RemoveBits32 : removes 32 bits from the bit buffer (and as a side effect, * refill it) *****************************************************************************/ -#if (WORD_TYPE == u32) +#if (WORD_TYPE == uint32_t) static inline void RemoveBits32( bit_stream_t * p_bit_stream ) { if( p_bit_stream->p_byte <= p_bit_stream->p_end - sizeof(WORD_TYPE) ) @@ -356,9 +374,10 @@ static inline void RemoveBits32( bit_stream_t * p_bit_stream ) * GetBits : returns i_bits bits from the bit stream and removes them * XXX: do not use for 32 bits, see GetBits32 *****************************************************************************/ -static inline u32 GetBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) +static inline uint32_t GetBits( bit_stream_t * p_bit_stream, + unsigned int i_bits ) { - u32 i_result; + uint32_t i_result; p_bit_stream->fifo.i_available -= i_bits; @@ -393,12 +412,12 @@ static inline u32 GetBits( bit_stream_t * p_bit_stream, unsigned int i_bits ) * using signed arithmetic * XXX: do not use for 32 bits *****************************************************************************/ -static inline s32 GetSignedBits( bit_stream_t * p_bit_stream, - unsigned int i_bits ) +static inline int32_t GetSignedBits( bit_stream_t * p_bit_stream, + unsigned int i_bits ) { - if( p_bit_stream->fifo.i_available >= i_bits ) + if( (unsigned int)p_bit_stream->fifo.i_available >= i_bits ) { - s32 i_result; + int32_t i_result; p_bit_stream->fifo.i_available -= i_bits; i_result = (WORD_SIGNED)p_bit_stream->fifo.buffer @@ -415,10 +434,10 @@ static inline s32 GetSignedBits( bit_stream_t * p_bit_stream, /***************************************************************************** * GetBits32 : returns 32 bits from the bit stream and removes them *****************************************************************************/ -#if (WORD_TYPE == u32) -static inline u32 GetBits32( bit_stream_t * p_bit_stream ) +#if (WORD_TYPE == uint32_t) +static inline uint32_t GetBits32( bit_stream_t * p_bit_stream ) { - u32 i_result; + uint32_t i_result; if( p_bit_stream->fifo.i_available == 32 ) { @@ -487,8 +506,8 @@ static inline void GetChunk( bit_stream_t * p_bit_stream, p_bit_stream->fifo.i_available -= 8; } - if( (i_available = p_bit_stream->p_end - p_bit_stream->p_byte) - >= i_buf_len ) + i_available = p_bit_stream->p_end - p_bit_stream->p_byte; + if( i_available >= (ptrdiff_t)i_buf_len ) { p_bit_stream->p_decoder_fifo->p_vlc->pf_memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len ); @@ -508,7 +527,7 @@ static inline void GetChunk( bit_stream_t * p_bit_stream, return; } while( (i_available = p_bit_stream->p_end - p_bit_stream->p_byte) - <= i_buf_len ); + <= (ptrdiff_t)i_buf_len ); if( i_buf_len ) {