* input_ext-dec.c: services to the decoders
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: input_ext-dec.c,v 1.34 2002/08/26 23:00:23 massiot Exp $
+ * $Id: input_ext-dec.c,v 1.45 2003/03/04 13:21:19 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* Preamble
*****************************************************************************/
#include <string.h> /* memcpy(), memset() */
-#include <sys/types.h> /* off_t */
#include <vlc/vlc.h>
#include "input_ext-intf.h"
#include "input_ext-plugins.h"
-/*****************************************************************************
- * InitBitstream: initialize a bit_stream_t structure
- *****************************************************************************/
-void InitBitstream( bit_stream_t * p_bit_stream, decoder_fifo_t * p_fifo,
- void (* pf_bitstream_callback)( bit_stream_t *, vlc_bool_t ),
- void * p_callback_arg )
+/****************************************************************************
+ * input_ExtractPES
+ *****************************************************************************
+ * Extract a PES from the fifo. If pp_pes is NULL then the PES is just
+ * deleted, otherwise *pp_pes will point to this PES.
+ ****************************************************************************/
+void input_ExtractPES( decoder_fifo_t *p_fifo, pes_packet_t **pp_pes )
{
- p_bit_stream->p_decoder_fifo = p_fifo;
- p_bit_stream->pf_bitstream_callback = pf_bitstream_callback;
- p_bit_stream->p_callback_arg = p_callback_arg;
+ pes_packet_t *p_pes;
- /* Get the first data packet. */
vlc_mutex_lock( &p_fifo->data_lock );
- while ( p_fifo->p_first == NULL )
+
+ if( p_fifo->p_first == NULL )
{
- if ( p_fifo->b_die )
+ if( p_fifo->b_die )
{
vlc_mutex_unlock( &p_fifo->data_lock );
+ if( pp_pes ) *pp_pes = NULL;
return;
}
+
+ /* Signal the input thread we're waiting. This is only
+ * needed in case of slave clock (ES plug-in) but it won't
+ * harm. */
+ vlc_cond_signal( &p_fifo->data_wait );
+
+ /* Wait for the input to tell us when we received a packet. */
vlc_cond_wait( &p_fifo->data_wait, &p_fifo->data_lock );
}
- p_bit_stream->p_data = p_fifo->p_first->p_first;
+
+ p_pes = p_fifo->p_first;
+ p_fifo->p_first = p_pes->p_next;
+ p_pes->p_next = NULL;
+ p_fifo->i_depth--;
+
+ if( !p_fifo->p_first )
+ {
+ /* No PES in the FIFO. p_last is no longer valid. */
+ p_fifo->pp_last = &p_fifo->p_first;
+ }
+
+ vlc_mutex_unlock( &p_fifo->data_lock );
+
+ if( pp_pes )
+ *pp_pes = p_pes;
+ else
+ input_DeletePES( p_fifo->p_packets_mgt, p_pes );
+}
+
+/*****************************************************************************
+ * InitBitstream: initialize a bit_stream_t structure and returns VLC_SUCCESS
+ * on success.
+ *****************************************************************************/
+int InitBitstream( bit_stream_t * p_bit_stream, decoder_fifo_t * p_fifo,
+ void (* pf_bitstream_callback)( bit_stream_t *, vlc_bool_t ),
+ void * p_callback_arg )
+{
+ /* Get the first pes packet */
+ input_ExtractPES( p_fifo, &p_bit_stream->p_pes );
+ if( !p_bit_stream->p_pes )
+ return VLC_EGENERIC;
+
+ p_bit_stream->p_decoder_fifo = p_fifo;
+ p_bit_stream->pf_bitstream_callback = pf_bitstream_callback;
+ p_bit_stream->p_callback_arg = p_callback_arg;
+
+ p_bit_stream->p_data = p_bit_stream->p_pes->p_first;
p_bit_stream->p_byte = p_bit_stream->p_data->p_payload_start;
p_bit_stream->p_end = p_bit_stream->p_data->p_payload_end;
p_bit_stream->fifo.buffer = 0;
p_bit_stream->fifo.i_available = 0;
- p_bit_stream->i_pts = p_fifo->p_first->i_pts;
- p_bit_stream->i_dts = p_fifo->p_first->i_dts;
+ p_bit_stream->i_pts = p_bit_stream->p_pes->i_pts;
+ p_bit_stream->i_dts = p_bit_stream->p_pes->i_dts;
p_bit_stream->p_pts_validity = p_bit_stream->p_byte;
- vlc_mutex_unlock( &p_fifo->data_lock );
/* Call back the decoder. */
if( p_bit_stream->pf_bitstream_callback != NULL )
* sizeof(WORD_TYPE) - 1 empty bytes in the bit buffer. */
AlignWord( p_bit_stream );
}
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * CloseBitstream: free the bitstream structure.
+ *****************************************************************************/
+void CloseBitstream( bit_stream_t * p_bit_stream )
+{
+ if( p_bit_stream->p_pes )
+ input_DeletePES( p_bit_stream->p_decoder_fifo->p_packets_mgt,
+ p_bit_stream->p_pes );
}
/*****************************************************************************
*****************************************************************************/
void DecoderError( decoder_fifo_t * p_fifo )
{
- /* We take the lock, because we are going to read/write the start/end
- * indexes of the decoder fifo */
- vlc_mutex_lock (&p_fifo->data_lock);
+ /* No need to take the lock, because input_ExtractPES already takes it
+ * and also check for p_fifo->b_die */
/* Wait until a `die' order is sent */
- while (!p_fifo->b_die)
+ while( !p_fifo->b_die )
{
/* Trash all received PES packets */
- input_DeletePES( p_fifo->p_packets_mgt, p_fifo->p_first );
- p_fifo->p_first = NULL;
- p_fifo->pp_last = &p_fifo->p_first;
-
- /* If the input is waiting for us, tell him to stop */
- vlc_cond_signal( &p_fifo->data_wait );
-
- /* Waiting for the input thread to put new PES packets in the fifo */
- vlc_cond_wait (&p_fifo->data_wait, &p_fifo->data_lock);
+ input_ExtractPES( p_fifo, NULL );
}
-
- /* We can release the lock before leaving */
- vlc_mutex_unlock (&p_fifo->data_lock);
}
/*****************************************************************************
* NextDataPacket: go to the data packet after *pp_data, return 1 if we
- * changed PES
+ * changed PES. This function can fail in case of end of stream, you can
+ * check p_bit_stream->p_data or p_bit_stream->p_pes to know wether we did get
+ * the next data packet.
*****************************************************************************/
static inline vlc_bool_t _NextDataPacket( decoder_fifo_t * p_fifo,
- data_packet_t ** pp_data )
+ bit_stream_t * p_bit_stream )
{
vlc_bool_t b_new_pes;
* and not just a PES header */
do
{
+ /* Sanity check. Yes, this can happen if the caller doesn't check
+ * for p_fifo->b_die beforehand. */
+ if( p_bit_stream->p_pes == NULL ) return 0;
+
/* We were reading the last data packet of this PES packet... It's
* time to jump to the next PES packet */
- if( (*pp_data)->p_next == NULL )
+ if( p_bit_stream->p_data->p_next == NULL )
{
- pes_packet_t * p_next;
-
- vlc_mutex_lock( &p_fifo->data_lock );
-
- /* Free the previous PES packet. */
- p_next = p_fifo->p_first->p_next;
- p_fifo->p_first->p_next = NULL;
- input_DeletePES( p_fifo->p_packets_mgt, p_fifo->p_first );
- p_fifo->p_first = p_next;
- p_fifo->i_depth--;
-
- if( p_fifo->p_first == NULL )
- {
- /* No PES in the FIFO. p_last is no longer valid. */
- p_fifo->pp_last = &p_fifo->p_first;
-
- /* Signal the input thread we're waiting. This is only
- * needed in case of slave clock (ES plug-in) but it won't
- * harm. */
- vlc_cond_signal( &p_fifo->data_wait );
-
- /* Wait for the input to tell us when we receive a packet. */
- vlc_cond_wait( &p_fifo->data_wait, &p_fifo->data_lock );
- }
-
/* The next packet could be found in the next PES packet */
- *pp_data = p_fifo->p_first->p_first;
-
- vlc_mutex_unlock( &p_fifo->data_lock );
-
+ input_DeletePES( p_fifo->p_packets_mgt, p_bit_stream->p_pes );
+ input_ExtractPES( p_fifo, &p_bit_stream->p_pes );
+ if( !p_bit_stream->p_pes )
+ {
+ /* Couldn't get the next PES, might be an eos */
+ p_bit_stream->p_data = NULL;
+ return 0;
+ }
+ p_bit_stream->p_data = p_bit_stream->p_pes->p_first;
b_new_pes = 1;
}
else
{
/* Perhaps the next data packet of the current PES packet contains
* real data (ie its payload's size is greater than 0). */
- *pp_data = (*pp_data)->p_next;
+ p_bit_stream->p_data = p_bit_stream->p_data->p_next;
b_new_pes = 0;
}
- } while ( (*pp_data)->p_payload_start == (*pp_data)->p_payload_end );
+ } while ( p_bit_stream->p_data->p_payload_start ==
+ p_bit_stream->p_data->p_payload_end );
return( b_new_pes );
}
-vlc_bool_t NextDataPacket( decoder_fifo_t * p_fifo, data_packet_t ** pp_data )
+vlc_bool_t NextDataPacket( decoder_fifo_t * p_fifo,
+ bit_stream_t * p_bit_stream )
{
- return( _NextDataPacket( p_fifo, pp_data ) );
+ return( _NextDataPacket( p_fifo, p_bit_stream ) );
}
/*****************************************************************************
* BitstreamNextDataPacket: go to the next data packet, and update bitstream
- * context
+ * context. This function can fail in case of eos!
*****************************************************************************/
static inline void _BitstreamNextDataPacket( bit_stream_t * p_bit_stream )
{
decoder_fifo_t * p_fifo = p_bit_stream->p_decoder_fifo;
vlc_bool_t b_new_pes;
- b_new_pes = _NextDataPacket( p_fifo, &p_bit_stream->p_data );
+ b_new_pes = _NextDataPacket( p_fifo, p_bit_stream );
+ if( !p_bit_stream->p_pes ) return;
/* We've found a data packet which contains interesting data... */
p_bit_stream->p_byte = p_bit_stream->p_data->p_payload_start;
}
/* Retrieve the PTS. */
- if( b_new_pes && p_fifo->p_first->i_pts )
+ if( b_new_pes && p_bit_stream->p_pes->i_pts )
{
- p_bit_stream->i_pts = p_fifo->p_first->i_pts;
- p_bit_stream->i_dts = p_fifo->p_first->i_dts;
+ p_bit_stream->i_pts = p_bit_stream->p_pes->i_pts;
+ p_bit_stream->i_dts = p_bit_stream->p_pes->i_dts;
p_bit_stream->p_pts_validity = p_bit_stream->p_byte;
}
}
u32 UnalignedShowBits( bit_stream_t * p_bit_stream, unsigned int i_bits )
{
/* We just fill in the bit buffer. */
- while( p_bit_stream->fifo.i_available < i_bits )
+ while( (unsigned int)p_bit_stream->fifo.i_available < i_bits )
{
if( p_bit_stream->p_byte < p_bit_stream->p_end )
{
else
{
_BitstreamNextDataPacket( p_bit_stream );
+ if( p_bit_stream->p_decoder_fifo->b_die ) return 0;
if( (ptrdiff_t)p_bit_stream->p_byte & (sizeof(WORD_TYPE) - 1) )
{
/* We are not aligned anymore. */
if( ((ptrdiff_t)p_bit_stream->p_byte
& (sizeof(WORD_TYPE) - 1)) * 8
- < p_bit_stream->fifo.i_available )
+ < (unsigned int)p_bit_stream->fifo.i_available )
{
/* We are not aligned, and won't be. Copy the first word
* of the packet in a temporary buffer, and we'll see
p_bit_stream->i_showbits_buffer = 0;
- for( j = i = 0 ; i < sizeof(WORD_TYPE) ; i++ )
+ for( j = i = 0 ; i < (int)sizeof(WORD_TYPE) ; i++ )
{
if( p_bit_stream->p_byte >= p_bit_stream->p_end )
{
j = i;
_BitstreamNextDataPacket( p_bit_stream );
+ if( p_bit_stream->p_decoder_fifo->b_die ) return 0;
}
((byte_t *)&p_bit_stream->i_showbits_buffer)[i] =
* p_bit_stream->p_byte;
else
{
_BitstreamNextDataPacket( p_bit_stream );
+ if( p_bit_stream->p_decoder_fifo->b_die ) return 0;
i_result |= *(p_bit_stream->p_byte++) << (i_bits - 8);
i_bits -= 8;
}
else
{
_BitstreamNextDataPacket( p_bit_stream );
+ if( p_bit_stream->p_decoder_fifo->b_die ) return 0;
i_result |= *p_bit_stream->p_byte >> i_tmp;
p_bit_stream->fifo.buffer = *(p_bit_stream->p_byte++)
<< ( sizeof(WORD_TYPE) * 8 - i_tmp );
else
{
_BitstreamNextDataPacket( p_bit_stream );
+ if( p_bit_stream->p_decoder_fifo->b_die ) return;
p_bit_stream->p_byte++;
p_bit_stream->fifo.i_available += 8;
}
else
{
_BitstreamNextDataPacket( p_bit_stream );
+ if( p_bit_stream->p_decoder_fifo->b_die ) return;
p_bit_stream->fifo.buffer = *(p_bit_stream->p_byte++)
<< ( sizeof(WORD_TYPE) * 8 - 8
- p_bit_stream->fifo.i_available );
if( pi_dts != NULL) *pi_dts = 0;
}
}
-
projects / vlc / blobdiff