/*****************************************************************************
* input_dec.c: Functions for the management of decoders
*****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_dec.c,v 1.14 2001/11/13 12:09:18 henri Exp $
+ * Copyright (C) 1999-2001 VideoLAN
+ * $Id: input_dec.c,v 1.47 2002/09/01 21:20:29 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include "defs.h"
-
#include <stdlib.h>
#include <string.h> /* memcpy(), memset() */
#include <sys/types.h> /* off_t */
-#include "config.h"
-#include "common.h"
-#include "threads.h"
-#include "mtime.h"
-#include "intf_msg.h"
+#include <vlc/vlc.h>
#include "stream_control.h"
#include "input_ext-dec.h"
#include "input_ext-intf.h"
#include "input_ext-plugins.h"
-#include "modules.h"
+static decoder_fifo_t * CreateDecoderFifo( input_thread_t *,
+ es_descriptor_t * );
+static void DeleteDecoderFifo( decoder_fifo_t * );
/*****************************************************************************
* input_RunDecoder: spawns a new decoder thread
*****************************************************************************/
-vlc_thread_t input_RunDecoder( void * p_data )
+decoder_fifo_t * input_RunDecoder( input_thread_t * p_input,
+ es_descriptor_t * p_es )
{
- decoder_config_t * p_config;
- probedata_t probedata;
+ decoder_fifo_t *p_fifo;
+ int i_priority;
- p_config = (decoder_config_t *)p_data;
-
- probedata.i_type = p_config->i_type;
- p_config->p_dec_module = module_Need(
- MODULE_CAPABILITY_DEC, &probedata);
- if( p_config->p_dec_module == NULL )
+ /* Create the decoder configuration structure */
+ p_fifo = CreateDecoderFifo( p_input, p_es );
+
+ if( p_fifo == NULL )
+ {
+ msg_Err( p_input, "could not create decoder fifo" );
+ return NULL;
+ }
+
+ /* Get a suitable module */
+ p_fifo->p_module = module_Need( p_fifo, "decoder", "$codec" );
+ if( p_fifo->p_module == NULL )
+ {
+ msg_Err( p_fifo, "no suitable decoder module for fourcc `%4.4s'",
+ (char*)&p_fifo->i_fourcc );
+ DeleteDecoderFifo( p_fifo );
+ vlc_object_destroy( p_fifo );
+ return NULL;
+ }
+
+ if ( p_es->i_cat == AUDIO_ES )
{
- intf_ErrMsg( "dec error: no suitable dec module for type 0x%x",
- p_config->i_type );
- return( 0 );
+ i_priority = VLC_THREAD_PRIORITY_AUDIO;
+ }
+ else
+ {
+ i_priority = VLC_THREAD_PRIORITY_VIDEO;
}
/* Spawn the decoder thread */
- if ( vlc_thread_create(&p_config->thread_id,
- "decoder", (vlc_thread_func_t)p_config->p_dec_module->
- p_functions->dec.functions.dec.pf_RunThread, (void *)p_config) )
+ if( vlc_thread_create( p_fifo, "decoder", p_fifo->pf_run,
+ i_priority, VLC_FALSE ) )
{
- intf_ErrMsg( "dec error: can't spawn decoder thread \"%s\"",
- p_config->p_dec_module->psz_name );
- return( 0 );
+ msg_Err( p_fifo, "cannot spawn decoder thread \"%s\"",
+ p_fifo->p_module->psz_object_name );
+ module_Unneed( p_fifo, p_fifo->p_module );
+ return NULL;
}
- intf_DbgMsg( "dec debug: decoder \"%s\"thread (%p) created",
- p_config->p_dec_module->psz_name, p_dec );
-
- return p_config->thread_id;
+ p_input->stream.b_changed = 1;
+
+ return p_fifo;
}
/* Waiting for the thread to exit */
/* I thought that unlocking was better since thread join can be long
* but it actually creates late pictures and freezes --stef */
-// vlc_mutex_unlock( &p_input->stream.stream_lock );
- vlc_thread_join( p_es->thread_id );
-// vlc_mutex_lock( &p_input->stream.stream_lock );
+ /* vlc_mutex_unlock( &p_input->stream.stream_lock ); */
+ vlc_thread_join( p_es->p_decoder_fifo );
+ /* vlc_mutex_lock( &p_input->stream.stream_lock ); */
- /* Unneed module*/
- module_Unneed( p_es->p_dec_config->p_dec_module );
+ /* Delete decoder configuration */
+ DeleteDecoderFifo( p_es->p_decoder_fifo );
- /* Freeing all packets still in the decoder fifo. */
- while( !DECODER_FIFO_ISEMPTY( *p_es->p_decoder_fifo ) )
- {
- p_es->p_decoder_fifo->pf_delete_pes(
- p_es->p_decoder_fifo->p_packets_mgt,
- DECODER_FIFO_START( *p_es->p_decoder_fifo ) );
- DECODER_FIFO_INCSTART( *p_es->p_decoder_fifo );
- }
+ /* Unneed module */
+ module_Unneed( p_es->p_decoder_fifo, p_es->p_decoder_fifo->p_module );
- /* Destroy the lock and cond */
- vlc_cond_destroy( &p_es->p_decoder_fifo->data_wait );
- vlc_mutex_destroy( &p_es->p_decoder_fifo->data_lock );
+ /* Delete the fifo */
+ vlc_object_destroy( p_es->p_decoder_fifo );
- free( p_es->p_decoder_fifo );
+ /* Tell the input there is no more decoder */
p_es->p_decoder_fifo = NULL;
+
+ p_input->stream.b_changed = 1;
}
/*****************************************************************************
{
vlc_mutex_lock( &p_decoder_fifo->data_lock );
- if( !DECODER_FIFO_ISFULL( *p_decoder_fifo ) )
- {
- p_decoder_fifo->buffer[p_decoder_fifo->i_end] = p_pes;
- DECODER_FIFO_INCEND( *p_decoder_fifo );
+ p_pes->p_next = NULL;
+ *p_decoder_fifo->pp_last = p_pes;
+ p_decoder_fifo->pp_last = &p_pes->p_next;
+ p_decoder_fifo->i_depth++;
- /* Warn the decoder that it's got work to do. */
- vlc_cond_signal( &p_decoder_fifo->data_wait );
- }
- else
- {
- /* The FIFO is full !!! This should not happen. */
- p_decoder_fifo->pf_delete_pes( p_decoder_fifo->p_packets_mgt,
- p_pes );
- intf_ErrMsg( "PES trashed - decoder fifo full !" );
- }
+ /* Warn the decoder that it's got work to do. */
+ vlc_cond_signal( &p_decoder_fifo->data_wait );
vlc_mutex_unlock( &p_decoder_fifo->data_lock );
}
/*****************************************************************************
* input_EscapeDiscontinuity: send a NULL packet to the decoders
*****************************************************************************/
-void input_EscapeDiscontinuity( input_thread_t * p_input,
- pgrm_descriptor_t * p_pgrm )
+void input_EscapeDiscontinuity( input_thread_t * p_input )
{
int i_es, i;
- for( i_es = 0; i_es < p_pgrm->i_es_number; i_es++ )
+ for( i_es = 0; i_es < p_input->stream.i_selected_es_number; i_es++ )
{
- es_descriptor_t * p_es = p_pgrm->pp_es[i_es];
+ es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es];
if( p_es->p_decoder_fifo != NULL )
{
*****************************************************************************/
void input_EscapeAudioDiscontinuity( input_thread_t * p_input )
{
- int i_pgrm, i_es, i;
+ int i_es, i;
- for( i_pgrm = 0; i_pgrm < p_input->stream.i_pgrm_number; i_pgrm++ )
+ for( i_es = 0; i_es < p_input->stream.i_selected_es_number; i_es++ )
{
- pgrm_descriptor_t * p_pgrm = p_input->stream.pp_programs[i_pgrm];
+ es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es];
- for( i_es = 0; i_es < p_pgrm->i_es_number; i_es++ )
+ if( p_es->p_decoder_fifo != NULL && p_es->i_cat == AUDIO_ES )
{
- es_descriptor_t * p_es = p_pgrm->pp_es[i_es];
-
- if( p_es->p_decoder_fifo != NULL && p_es->b_audio )
+ for( i = 0; i < PADDING_PACKET_NUMBER; i++ )
{
- for( i = 0; i < PADDING_PACKET_NUMBER; i++ )
- {
- input_NullPacket( p_input, p_es );
- }
+ input_NullPacket( p_input, p_es );
}
}
}
}
+/*****************************************************************************
+ * CreateDecoderFifo: create a decoder_fifo_t
+ *****************************************************************************/
+static decoder_fifo_t * CreateDecoderFifo( input_thread_t * p_input,
+ es_descriptor_t * p_es )
+{
+ decoder_fifo_t * p_fifo;
+
+ /* Decoder FIFO */
+ p_fifo = vlc_object_create( p_input, VLC_OBJECT_DECODER );
+ if( p_fifo == NULL )
+ {
+ msg_Err( p_input, "out of memory" );
+ return NULL;
+ }
+
+ /* Select a new ES */
+ p_input->stream.i_selected_es_number++;
+ p_input->stream.pp_selected_es = realloc(
+ p_input->stream.pp_selected_es,
+ p_input->stream.i_selected_es_number
+ * sizeof(es_descriptor_t *) );
+ if( p_input->stream.pp_selected_es == NULL )
+ {
+ msg_Err( p_input, "out of memory" );
+ vlc_object_destroy( p_fifo );
+ return NULL;
+ }
+
+ p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number - 1]
+ = p_es;
+
+ /* Initialize the p_fifo structure */
+ vlc_mutex_init( p_input, &p_fifo->data_lock );
+ vlc_cond_init( p_input, &p_fifo->data_wait );
+ p_es->p_decoder_fifo = p_fifo;
+
+ p_fifo->i_id = p_es->i_id;
+ p_fifo->i_fourcc = p_es->i_fourcc;
+ p_fifo->p_demux_data = p_es->p_demux_data;
+
+ p_fifo->p_stream_ctrl = &p_input->stream.control;
+ p_fifo->p_sout = p_input->stream.p_sout;
+
+ p_fifo->p_first = NULL;
+ p_fifo->pp_last = &p_fifo->p_first;
+ p_fifo->i_depth = 0;
+ p_fifo->b_die = p_fifo->b_error = 0;
+ p_fifo->p_packets_mgt = p_input->p_method_data;
+
+ vlc_object_attach( p_fifo, p_input );
+
+ return p_fifo;
+}
+
+/*****************************************************************************
+ * DeleteDecoderFifo: destroy a decoder_fifo_t
+ *****************************************************************************/
+static void DeleteDecoderFifo( decoder_fifo_t * p_fifo )
+{
+ vlc_object_detach( p_fifo );
+
+ msg_Dbg( p_fifo, "killing decoder for 0x%x, fourcc `%4.4s', %d PES in FIFO",
+ p_fifo->i_id, (char*)&p_fifo->i_fourcc, p_fifo->i_depth );
+
+ /* Free all packets still in the decoder fifo. */
+ input_DeletePES( p_fifo->p_packets_mgt,
+ p_fifo->p_first );
+
+ /* Destroy the lock and cond */
+ vlc_cond_destroy( &p_fifo->data_wait );
+ vlc_mutex_destroy( &p_fifo->data_lock );
+}
+