* input_ext-dec.h: structures exported to the VideoLAN decoders
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-dec.h,v 1.20 2001/01/24 19:05:55 massiot Exp $
+ * $Id: input_ext-dec.h,v 1.34 2001/08/22 17:21:45 massiot 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
*/
/* 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;
+ /* 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;
/*****************************************************************************
#if (WORD_TYPE == u32)
# define WORD_AT U32_AT
+# define WORD_SIGNED s32
#elif (WORD_TYPE == u64)
# define WORD_AT U64_AT
+# define WORD_SIGNED s64
#else
# error Unsupported WORD_TYPE
#endif
/*****************************************************************************
* Protoypes from input_ext-dec.c
*****************************************************************************/
-u32 UnalignedShowBits( struct bit_stream_s *, unsigned int );
+void UnalignedShowBits( struct bit_stream_s *, unsigned int );
void UnalignedRemoveBits( struct bit_stream_s * );
u32 UnalignedGetBits( struct bit_stream_s *, unsigned int );
*****************************************************************************/
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 )
>> (8 * sizeof(WORD_TYPE) - i_bits) );
}
- return UnalignedShowBits( p_bit_stream, i_bits );
+ UnalignedShowBits( p_bit_stream, i_bits );
+ return( p_bit_stream->fifo.buffer >> (8 * sizeof(WORD_TYPE) - 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 )
+{
+ if( p_bit_stream->fifo.i_available >= i_bits )
+ {
+ return( (WORD_SIGNED)p_bit_stream->fifo.buffer
+ >> (8 * sizeof(WORD_TYPE) - i_bits) );
+ }
+
+ /* You can probably do something a little faster, but now I'm tired. */
+ return( (WORD_SIGNED)(ShowBits( p_bit_stream, i_bits ) << (32 - i_bits))
+ >> (32 - i_bits) );
}
/*****************************************************************************
return UnalignedGetBits( p_bit_stream, i_bits );
}
+/*****************************************************************************
+ * GetSignedBits : returns i_bits bits from the bit stream and removes them,
+ * using signed arithmetic
+ * XXX: do not use for 32 bits
+ *****************************************************************************/
+static __inline__ s32 GetSignedBits( bit_stream_t * p_bit_stream,
+ unsigned int i_bits )
+{
+ if( p_bit_stream->fifo.i_available >= i_bits )
+ {
+ s32 i_result;
+
+ p_bit_stream->fifo.i_available -= i_bits;
+ i_result = (WORD_SIGNED)p_bit_stream->fifo.buffer
+ >> (8 * sizeof(WORD_TYPE) - i_bits);
+ p_bit_stream->fifo.buffer <<= i_bits;
+ return( i_result );
+ }
+
+ /* You can probably do something a little faster, but now I'm tired. */
+ return( (WORD_SIGNED)(GetBits( p_bit_stream, i_bits ) << (32 - i_bits))
+ >> (32 - i_bits) );
+}
+
/*****************************************************************************
* GetBits32 : returns 32 bits from the bit stream and removes them
*****************************************************************************/
* GetChunk : reads a large chunk of data
*****************************************************************************
* The position in the stream must be byte-aligned, if unsure call
- * RealignBits(). p_buffer must to a buffer at least as big as i_buf_len
+ * 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,
{
ptrdiff_t i_available;
- if( p_bit_stream->fifo.i_available )
+ /* We need to take care because i_buf_len may be < 4. */
+ while( p_bit_stream->fifo.i_available > 0 && i_buf_len )
{
- *((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;
- p_bit_stream->fifo.i_available = 0;
+ *p_buffer = p_bit_stream->fifo.buffer >> (8 * sizeof(WORD_TYPE) - 8);
+ p_buffer++;
+ i_buf_len--;
+ p_bit_stream->fifo.buffer <<= 8;
+ p_bit_stream->fifo.i_available -= 8;
}
if( (i_available = p_bit_stream->p_end - p_bit_stream->p_byte)
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;
/*****************************************************************************
typedef struct vdec_config_s
{
- struct vout_thread_s * p_vout;
-
struct picture_s * (* pf_create_picture)( struct vout_thread_s *,
int i_type, int i_width,
int i_height );
*****************************************************************************
* 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;
projects / vlc / blobdiff