X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Finput_ext-dec.h;h=4faa1308659727096a2a610ff8736be473d11acb;hb=db8fd8894ae30aef67036dc171a76cc82d5c5fda;hp=bea98bc345826a65025ae8959718d659f87f561f;hpb=49a0736e1c0224ace17fd8598de948439dd0ed03;p=vlc diff --git a/include/input_ext-dec.h b/include/input_ext-dec.h index bea98bc345..4faa130865 100644 --- a/include/input_ext-dec.h +++ b/include/input_ext-dec.h @@ -1,8 +1,8 @@ /***************************************************************************** * input_ext-dec.h: structures exported to the VideoLAN decoders ***************************************************************************** - * Copyright (C) 1999, 2000 VideoLAN - * $Id: input_ext-dec.h,v 1.37 2001/11/13 12:09:17 henri Exp $ + * Copyright (C) 1999-2001 VideoLAN + * $Id: input_ext-dec.h,v 1.59.2.1 2002/09/25 23:11:51 massiot Exp $ * * Authors: Christophe Massiot * Michel Kaempf @@ -28,9 +28,24 @@ #define MPEG1_AUDIO_ES 0x03 #define MPEG2_AUDIO_ES 0x04 #define AC3_AUDIO_ES 0x81 -/* These ones might violate the norm : */ +/* These ones might violate the usage : */ #define DVD_SPU_ES 0x82 #define LPCM_AUDIO_ES 0x83 +/* These ones are only here to work around a bug in VLS - VLS doesn't + * skip the first bytes of the PES payload (stream private ID) when + * streaming. This is incompatible with all equipments. 'B' is for + * buggy. Please note that they are associated with FOURCCs '***b'. + * --Meuuh 2002-08-30 + */ +#define A52B_AUDIO_ES 0x91 +#define DVDB_SPU_ES 0x92 +#define LPCMB_AUDIO_ES 0x93 + +#define MSMPEG4v1_VIDEO_ES 0x40 +#define MSMPEG4v2_VIDEO_ES 0x41 +#define MSMPEG4v3_VIDEO_ES 0x42 +#define MPEG4_VIDEO_ES 0x50 + #define UNKNOWN_ES 0xFF /* Structures exported to the decoders */ @@ -42,20 +57,19 @@ *****************************************************************************/ typedef struct data_packet_s { - /* Nothing before this line, the code relies on that */ - byte_t * p_buffer; /* raw data packet */ - long l_size; /* buffer size */ + /* Used to chain the packets that carry data for a same PES or PSI */ + struct data_packet_s * p_next; - /* Decoders information */ + /* start of the PS or TS packet */ + byte_t * p_demux_start; + /* start of the PES payload in this packet */ byte_t * p_payload_start; - /* start of the PES payload in this packet */ - byte_t * p_payload_end; /* guess ? :-) */ - boolean_t b_discard_payload; /* is the packet messed up ? */ + byte_t * p_payload_end; /* guess ? :-) */ + /* is the packet messed up ? */ + boolean_t b_discard_payload; - int * pi_refcount; - - /* Used to chain the TS packets that carry data for a same PES or PSI */ - struct data_packet_s * p_next; + /* pointer to the real data */ + struct data_buffer_s * p_buffer; } data_packet_t; /***************************************************************************** @@ -66,6 +80,9 @@ typedef struct data_packet_s *****************************************************************************/ typedef struct pes_packet_s { + /* Chained list to the next PES packet (depending on the context) */ + struct pes_packet_s * p_next; + /* PES properties */ boolean_t b_data_alignment; /* used to find the beginning of * a video or audio unit */ @@ -77,12 +94,15 @@ typedef struct pes_packet_s int i_rate; /* current pace of reading * (see stream_control.h) */ - int i_pes_size; /* size of the current PES packet */ + unsigned int i_pes_size; /* size of the current PES packet */ - /* Pointers to packets (packets are then linked by the p_prev and - p_next fields of the data_packet_t struct) */ + /* Chained list to packets */ data_packet_t * p_first; /* The first packet contained by this * PES (used by decoders). */ + data_packet_t * p_last; /* The last packet contained by this + PES (used by the buffer allocator) */ + unsigned int i_nb_data; /* Number of data packets in the chained + list */ } pes_packet_t; /***************************************************************************** @@ -97,31 +117,17 @@ typedef struct decoder_fifo_s vlc_cond_t data_wait; /* fifo data conditional variable */ /* Data */ - pes_packet_t * buffer[FIFO_SIZE + 1]; - int i_start; - int i_end; + pes_packet_t * p_first; + pes_packet_t ** pp_last; + int i_depth; /* number of PES packets in the stack */ /* Communication interface between input and decoders */ boolean_t b_die; /* the decoder should return now */ boolean_t b_error; /* the decoder is in an error loop */ - void * p_packets_mgt; /* packets management services - * data (netlist...) */ - void (* pf_delete_pes)( void *, pes_packet_t * ); - /* function to use when releasing a PES */ + struct input_buffers_s *p_packets_mgt; /* packets management services + * data */ } decoder_fifo_t; -/* Macros to manage a decoder_fifo_t structure. Please remember to take - * data_lock before using them. */ -#define DECODER_FIFO_ISEMPTY( fifo ) ( (fifo).i_start == (fifo).i_end ) -#define DECODER_FIFO_ISFULL( fifo ) ( ( ((fifo).i_end + 1 - (fifo).i_start)\ - & FIFO_SIZE ) == 0 ) -#define DECODER_FIFO_START( fifo ) ( (fifo).buffer[ (fifo).i_start ] ) -#define DECODER_FIFO_INCSTART( fifo ) ( (fifo).i_start = ((fifo).i_start + 1)\ - & FIFO_SIZE ) -#define DECODER_FIFO_END( fifo ) ( (fifo).buffer[ (fifo).i_end ] ) -#define DECODER_FIFO_INCEND( fifo ) ( (fifo).i_end = ((fifo).i_end + 1) \ - & FIFO_SIZE ) - /***************************************************************************** * bit_fifo_t : bit fifo descriptor ***************************************************************************** @@ -161,9 +167,6 @@ typedef struct bit_stream_s /* The decoder fifo contains the data of the PES stream */ decoder_fifo_t * p_decoder_fifo; - /* Function to jump to the next data packet */ - void (* pf_next_data_packet)( struct bit_stream_s * ); - /* Callback to the decoder used when changing data packets ; set * to NULL if your decoder doesn't need it. */ void (* pf_bitstream_callback)( struct bit_stream_s *, @@ -171,6 +174,12 @@ typedef struct bit_stream_s /* Optional argument to the callback */ void * p_callback_arg; + /* + * PTS retrieval + */ + mtime_t i_pts, i_dts; + byte_t * p_pts_validity; + /* * Byte structures */ @@ -212,12 +221,27 @@ typedef struct bit_stream_s #endif /***************************************************************************** - * Protoypes from input_ext-dec.c + * Prototypes from input_ext-dec.c *****************************************************************************/ -#ifndef PLUGIN +#ifndef __PLUGIN__ +void InitBitstream ( struct bit_stream_s *, struct decoder_fifo_s *, + void (* pf_bitstream_callback)( struct bit_stream_s *, + boolean_t ), + void * p_callback_arg ); +boolean_t NextDataPacket( struct decoder_fifo_s *, struct data_packet_s ** ); +void BitstreamNextDataPacket( struct bit_stream_s * ); u32 UnalignedShowBits( struct bit_stream_s *, unsigned int ); void UnalignedRemoveBits( struct bit_stream_s * ); u32 UnalignedGetBits( struct bit_stream_s *, unsigned int ); +void CurrentPTS( struct bit_stream_s *, mtime_t *, mtime_t * ); +#else +# define InitBitstream p_symbols->InitBitstream +# define NextDataPacket p_symbols->NextDataPacket +# define BitstreamNextDataPacket p_symbols->BitstreamNextDataPacket +# define UnalignedShowBits p_symbols->UnalignedShowBits +# define UnalignedRemoveBits p_symbols->UnalignedRemoveBits +# define UnalignedGetBits p_symbols->UnalignedGetBits +# define CurrentPTS p_symbols->CurrentPTS #endif /***************************************************************************** @@ -225,7 +249,7 @@ u32 UnalignedGetBits( struct bit_stream_s *, unsigned int ); * on a word boundary (XXX: there must be at least sizeof(WORD_TYPE) - 1 * empty bytes in the bit buffer) *****************************************************************************/ -static __inline__ void AlignWord( bit_stream_t * p_bit_stream ) +static inline void AlignWord( bit_stream_t * p_bit_stream ) { while( (ptrdiff_t)p_bit_stream->p_byte & (sizeof(WORD_TYPE) - 1) ) @@ -239,7 +263,7 @@ static __inline__ void AlignWord( bit_stream_t * p_bit_stream ) } else { - p_bit_stream->pf_next_data_packet( p_bit_stream ); + BitstreamNextDataPacket( p_bit_stream ); p_bit_stream->fifo.buffer |= *(p_bit_stream->p_byte++) << (8 * sizeof(WORD_TYPE) - 8 - p_bit_stream->fifo.i_available); @@ -251,8 +275,8 @@ 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 u32 ShowBits( bit_stream_t * p_bit_stream, + unsigned int i_bits ) { if( p_bit_stream->fifo.i_available >= i_bits ) { @@ -274,8 +298,8 @@ static __inline__ u32 ShowBits( bit_stream_t * p_bit_stream, * 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 s32 ShowSignedBits( bit_stream_t * p_bit_stream, + unsigned int i_bits ) { if( p_bit_stream->fifo.i_available >= i_bits ) { @@ -292,8 +316,8 @@ static __inline__ s32 ShowSignedBits( bit_stream_t * p_bit_stream, * RemoveBits : removes i_bits bits from the bit buffer * XXX: do not use for 32 bits, see RemoveBits32 *****************************************************************************/ -static __inline__ void RemoveBits( bit_stream_t * p_bit_stream, - unsigned int i_bits ) +static inline void RemoveBits( bit_stream_t * p_bit_stream, + unsigned int i_bits ) { p_bit_stream->fifo.i_available -= i_bits; @@ -320,7 +344,7 @@ static __inline__ void RemoveBits( bit_stream_t * p_bit_stream, * refill it) *****************************************************************************/ #if (WORD_TYPE == u32) -static __inline__ void RemoveBits32( bit_stream_t * p_bit_stream ) +static inline void RemoveBits32( bit_stream_t * p_bit_stream ) { if( p_bit_stream->p_byte <= p_bit_stream->p_end - sizeof(WORD_TYPE) ) { @@ -347,8 +371,8 @@ 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 u32 GetBits( bit_stream_t * p_bit_stream, + unsigned int i_bits ) { u32 i_result; @@ -384,8 +408,8 @@ static __inline__ u32 GetBits( bit_stream_t * p_bit_stream, * 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 s32 GetSignedBits( bit_stream_t * p_bit_stream, + unsigned int i_bits ) { if( p_bit_stream->fifo.i_available >= i_bits ) { @@ -407,7 +431,7 @@ 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 ) +static inline u32 GetBits32( bit_stream_t * p_bit_stream ) { u32 i_result; @@ -447,7 +471,7 @@ static __inline__ u32 GetBits32( bit_stream_t * p_bit_stream ) /***************************************************************************** * RealignBits : realigns the bit buffer on an 8-bit boundary *****************************************************************************/ -static __inline__ void RealignBits( bit_stream_t * p_bit_stream ) +static inline void RealignBits( bit_stream_t * p_bit_stream ) { p_bit_stream->fifo.buffer <<= (p_bit_stream->fifo.i_available & 0x7); p_bit_stream->fifo.i_available &= ~0x7; @@ -461,8 +485,8 @@ static __inline__ void RealignBits( bit_stream_t * p_bit_stream ) * RealignBits(). p_buffer must point to a buffer at least as big as i_buf_len * otherwise your code will crash. *****************************************************************************/ -static __inline__ void GetChunk( bit_stream_t * p_bit_stream, - byte_t * p_buffer, size_t i_buf_len ) +static inline void GetChunk( bit_stream_t * p_bit_stream, + byte_t * p_buffer, size_t i_buf_len ) { ptrdiff_t i_available; @@ -479,25 +503,27 @@ static __inline__ void GetChunk( bit_stream_t * p_bit_stream, if( (i_available = p_bit_stream->p_end - p_bit_stream->p_byte) >= i_buf_len ) { - memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len ); + FAST_MEMCPY( p_buffer, p_bit_stream->p_byte, i_buf_len ); p_bit_stream->p_byte += i_buf_len; } else { do { - memcpy( p_buffer, p_bit_stream->p_byte, i_available ); + FAST_MEMCPY( p_buffer, p_bit_stream->p_byte, i_available ); p_bit_stream->p_byte = p_bit_stream->p_end; p_buffer += i_available; i_buf_len -= i_available; - p_bit_stream->pf_next_data_packet( p_bit_stream ); + BitstreamNextDataPacket( p_bit_stream ); + if( p_bit_stream->p_decoder_fifo->b_die ) + return; } while( (i_available = p_bit_stream->p_end - p_bit_stream->p_byte) - <= i_buf_len && !p_bit_stream->p_decoder_fifo->b_die ); + <= i_buf_len ); if( i_buf_len ) { - memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len ); + FAST_MEMCPY( p_buffer, p_bit_stream->p_byte, i_buf_len ); p_bit_stream->p_byte += i_buf_len; } } @@ -523,41 +549,17 @@ typedef struct decoder_config_s u16 i_id; u8 i_type; /* type of the elementary stream */ + void * p_demux_data; struct stream_ctrl_s * p_stream_ctrl; struct decoder_fifo_s * p_decoder_fifo; - void (* pf_init_bit_stream)( struct bit_stream_s *, - struct decoder_fifo_s *, - void (* pf_bitstream_callback)( struct bit_stream_s *, - boolean_t ), - void * ); - /* Decoder thread */ - vlc_thread_t thread_id; - - /* Plugin/Builtin properties */ - struct module_s * p_dec_module; - } decoder_config_t; -/* - * Communication interface between decoders and input - */ - /***************************************************************************** - * decoder_capabilities_t - ***************************************************************************** - * Structure returned by a call to GetCapabilities() of the decoder. + * Prototypes from input_dec.c *****************************************************************************/ -typedef struct decoder_capabilities_s -{ - int i_dec_type; - u8 i_stream_type; /* == i_type in es_descriptor_t */ - int i_weight; /* for a given stream type, the decoder - * with higher weight will be spawned */ - - vlc_thread_t (* pf_create_thread)( void * ); -} decoder_capabilities_t; - -/* Decoder types */ -#define NONE_D 0 -#define VIDEO_D 1 -#define AUDIO_D 2 +#ifndef __PLUGIN__ +void DecoderError ( struct decoder_fifo_s * p_fifo ); +#else +# define DecoderError p_symbols->DecoderError +#endif +