* input_ext-dec.h: structures exported to the VideoLAN decoders
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-dec.h,v 1.28 2001/04/16 12:34:28 asmax Exp $
+ * $Id: input_ext-dec.h,v 1.41 2001/12/07 18:33:07 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Kaempf <maxx@via.ecp.fr>
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
+/* ES streams types - see ISO/IEC 13818-1 table 2-29 numbers */
+#define MPEG1_VIDEO_ES 0x01
+#define MPEG2_VIDEO_ES 0x02
+#define MPEG1_AUDIO_ES 0x03
+#define MPEG2_AUDIO_ES 0x04
+#define AC3_AUDIO_ES 0x81
+/* These ones might violate the norm : */
+#define DVD_SPU_ES 0x82
+#define LPCM_AUDIO_ES 0x83
+#define UNKNOWN_ES 0xFF
+
/* Structures exported to the decoders */
/*****************************************************************************
byte_t * p_byte;
/* 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. */
+ /* 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
*****************************************************************************/
+#ifndef PLUGIN
u32 UnalignedShowBits( struct bit_stream_s *, unsigned int );
void UnalignedRemoveBits( struct bit_stream_s * );
u32 UnalignedGetBits( struct bit_stream_s *, unsigned int );
+#endif
/*****************************************************************************
* AlignWord : fill in the bit buffer so that the byte pointer be aligned
>> (8 * sizeof(WORD_TYPE) - i_bits) );
}
- return UnalignedShowBits( p_bit_stream, i_bits );
+ return( UnalignedShowBits( p_bit_stream, 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)
>= i_buf_len )
{
- memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
+ p_main->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 );
+ p_main->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;
if( i_buf_len )
{
- memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
+ p_main->fast_memcpy( p_buffer, p_bit_stream->p_byte, i_buf_len );
p_bit_stream->p_byte += i_buf_len;
}
}
}
-/*
- * The following functions are now deprecated.
- */
-
-static __inline__ byte_t _GetByte( bit_stream_t * p_bit_stream )
-{
- if ( p_bit_stream->p_byte >= p_bit_stream->p_end )
- {
- p_bit_stream->pf_next_data_packet( p_bit_stream );
- }
-
- return( *(p_bit_stream->p_byte++) );
-}
-
-static __inline__ void NeedBits( bit_stream_t * p_bit_stream, int i_bits )
-{
- while ( p_bit_stream->fifo.i_available < i_bits )
- {
- p_bit_stream->fifo.buffer |= ((WORD_TYPE)_GetByte( p_bit_stream ))
- << (8 * sizeof(WORD_TYPE) - 8
- - p_bit_stream->fifo.i_available);
- p_bit_stream->fifo.i_available += 8;
- }
-}
-
-static __inline__ void DumpBits( bit_stream_t * p_bit_stream, int i_bits )
-{
- p_bit_stream->fifo.buffer <<= i_bits;
- p_bit_stream->fifo.i_available -= i_bits;
-}
-
-
/*
* Communication interface between input and decoders
*/
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;
-/*****************************************************************************
- * vdec_config_t
- *****************************************************************************
- * Pointers given to video decoders threads.
- *****************************************************************************/
-struct vout_thread_s;
-
-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 );
- void (* pf_destroy_picture)( struct vout_thread_s *,
- struct picture_s * );
- void (* pf_display_picture)( struct vout_thread_s *,
- struct picture_s * );
- void (* pf_date_picture)( struct vout_thread_s *,
- struct picture_s *, mtime_t date );
- void (* pf_link_picture)( struct vout_thread_s *,
- struct picture_s *, mtime_t date );
- void (* pf_unlink_picture)( struct vout_thread_s *,
- struct picture_s *, mtime_t date );
- struct subpicture_s *(* pf_create_subpicture)( struct vout_thread_s *,
- int i_type, int i_size );
- void (* pf_destroy_subpicture)( struct vout_thread_s *,
- struct subpicture_s * );
- void (* pf_display_subpicture)( struct vout_thread_s *,
- struct subpicture_s * );
-
- decoder_config_t decoder_config;
-} vdec_config_t;
-
-/*****************************************************************************
- * adec_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 *);
-
- decoder_config_t decoder_config;
-} adec_config_t;
-
-
-/*
- * Communication interface between decoders and input
- */
-
-/*****************************************************************************
- * decoder_capabilities_t
- *****************************************************************************
- * Structure returned by a call to GetCapabilities() of the decoder.
- *****************************************************************************/
-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