* input_ext-dec.h: structures exported to the VideoLAN decoders
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-dec.h,v 1.15 2001/01/18 17:40:06 massiot Exp $
+ * $Id: input_ext-dec.h,v 1.31 2001/05/01 04:18:17 sam Exp $
*
- * Authors:
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ * Michel Kaempf <maxx@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
{
/* Nothing before this line, the code relies on that */
byte_t * p_buffer; /* raw data packet */
+ long l_size; /* buffer size */
/* Decoders information */
byte_t * p_payload_start;
byte_t * p_payload_end; /* guess ? :-) */
boolean_t b_discard_payload; /* is the packet messed up ? */
+ int * pi_refcount;
+
/* Used to chain the TS packets that carry data for a same PES or PSI */
struct data_packet_s * p_next;
} data_packet_t;
typedef struct pes_packet_s
{
/* PES properties */
- boolean_t b_messed_up; /* At least one of the data packets
- * has a questionable content */
boolean_t b_data_alignment; /* used to find the beginning of
* a video or audio unit */
boolean_t b_discontinuity; /* This packet doesn't follow the
* previous one */
- mtime_t i_pts;/* the PTS for this packet (zero if unset) */
- mtime_t i_dts;/* the DTS for this packet (zero if unset) */
+ mtime_t i_pts; /* PTS for this packet (zero if unset) */
+ mtime_t i_dts; /* DTS for this packet (zero if unset) */
+ int i_rate; /* current pace of reading
+ * (see stream_control.h) */
int i_pes_size; /* size of the current PES packet */
*****************************************************************************/
typedef struct bit_stream_s
{
+ /*
+ * Bit structures
+ */
+ bit_fifo_t fifo;
+
/*
* Input structures
*/
*/
/* Current data packet (in the current PES packet of the PES stream) */
data_packet_t * p_data;
- /* Pointer to the next byte that is to be read (in the current TS packet) */
+ /* Pointer to the next byte that is to be read (in the current packet) */
byte_t * p_byte;
- /* Pointer to the last byte that is to be read (in the current TS packet */
+ /* Pointer to the last byte that is to be read (in the current packet */
byte_t * p_end;
-
- /*
- * Bit structures
- */
- bit_fifo_t fifo;
+ /* Temporary buffer in case we're not aligned when changing data packets */
+ WORD_TYPE i_showbits_buffer;
+ data_packet_t showbits_data;
} bit_stream_t;
/*****************************************************************************
*****************************************************************************/
static __inline__ void AlignWord( bit_stream_t * p_bit_stream )
{
- while( (p_bit_stream->p_byte - p_bit_stream->p_data->p_buffer)
+ while( (ptrdiff_t)p_bit_stream->p_byte
& (sizeof(WORD_TYPE) - 1) )
{
if( p_bit_stream->p_byte < p_bit_stream->p_end )
{
u32 i_result;
- if( p_bit_stream->fifo.i_available >= i_bits )
+ p_bit_stream->fifo.i_available -= i_bits;
+
+ if( p_bit_stream->fifo.i_available >= 0 )
{
- p_bit_stream->fifo.i_available -= i_bits;
i_result = p_bit_stream->fifo.buffer
>> (8 * sizeof(WORD_TYPE) - i_bits);
p_bit_stream->fifo.buffer <<= i_bits;
if( p_bit_stream->p_byte <= p_bit_stream->p_end - sizeof(WORD_TYPE) )
{
- p_bit_stream->fifo.i_available -= i_bits;
i_result = p_bit_stream->fifo.buffer
>> (8 * sizeof(WORD_TYPE) - i_bits);
p_bit_stream->fifo.buffer = WORD_AT( p_bit_stream->p_byte );
return( i_result );
}
+ p_bit_stream->fifo.i_available -= 32;
return UnalignedGetBits( p_bit_stream, 32 );
}
#else
if( p_bit_stream->fifo.i_available )
{
- *((WORD_TYPE *)p_buffer) = WORD_AT( p_bit_stream->fifo.buffer );
+ *((WORD_TYPE *)p_buffer) = WORD_AT( &p_bit_stream->fifo.buffer );
p_buffer += p_bit_stream->fifo.i_available >> 3;
i_buf_len -= p_bit_stream->fifo.i_available >> 3;
p_bit_stream->fifo.buffer = 0;
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 * );
+ struct decoder_fifo_s *,
+ void (* pf_bitstream_callback)( struct bit_stream_s *,
+ boolean_t ),
+ void * );
} decoder_config_t;
/*****************************************************************************
*****************************************************************************
* Pointers given to audio decoders threads.
*****************************************************************************/
-struct aout_thread_s;
-
typedef struct adec_config_s
{
- struct aout_thread_s * p_aout;
-
- struct aout_fifo_s * (* pf_create_fifo)( struct aout_thread_s *,
- struct aout_fifo_s * );
- void (* pf_destroy_fifo)( struct aout_thread_s *);
+ struct aout_fifo_s * (* pf_create_fifo)( struct aout_fifo_s * );
+ void (* pf_destroy_fifo)( void );
decoder_config_t decoder_config;
} adec_config_t;