/*****************************************************************************
* 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.31 2002/03/14 01:35:28 stef 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 <videolan/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_config_t * CreateDecoderConfig( input_thread_t * p_input,
+ es_descriptor_t * p_es );
+static void DeleteDecoderConfig( decoder_config_t * p_config );
/*****************************************************************************
* input_RunDecoder: spawns a new decoder thread
*****************************************************************************/
-vlc_thread_t input_RunDecoder( void * p_data )
+vlc_thread_t input_RunDecoder( input_thread_t * p_input,
+ es_descriptor_t * p_es )
{
- decoder_config_t * p_config;
- probedata_t probedata;
+ vlc_thread_t thread_id;
+ char * psz_plugin = NULL;
- 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 )
+ if( p_es->i_type == MPEG1_AUDIO_ES || p_es->i_type == MPEG2_AUDIO_ES )
+ {
+ psz_plugin = config_GetPszVariable( "mpeg_adec" );
+ }
+ if( p_es->i_type == AC3_AUDIO_ES )
+ {
+ psz_plugin = config_GetPszVariable( "ac3_adec" );
+ }
+
+ /* Get a suitable module */
+ p_es->p_module = module_Need( MODULE_CAPABILITY_DECODER, psz_plugin,
+ (void *)&p_es->i_type );
+ if( psz_plugin ) free( psz_plugin );
+ if( p_es->p_module == NULL )
{
- intf_ErrMsg( "dec error: no suitable dec module for type 0x%x",
- p_config->i_type );
+ intf_ErrMsg( "input error: no suitable decoder module for type 0x%x",
+ p_es->i_type );
+ return( 0 );
+ }
+
+ /* Create the decoder configuration structure */
+ p_es->p_config = CreateDecoderConfig( p_input, p_es );
+
+ if( p_es->p_config == NULL )
+ {
+ intf_ErrMsg( "input error: could not create decoder config" );
+ module_Unneed( p_es->p_module );
return( 0 );
}
/* 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( &thread_id, "decoder",
+ (vlc_thread_func_t)p_es->p_module->
+ p_functions->dec.functions.dec.pf_run,
+ (void *)p_es->p_config) )
{
- intf_ErrMsg( "dec error: can't spawn decoder thread \"%s\"",
- p_config->p_dec_module->psz_name );
+ intf_ErrMsg( "input error: can't spawn decoder thread \"%s\"",
+ p_es->p_module->psz_name );
+ free( p_es->p_config );
+ module_Unneed( p_es->p_module );
return( 0 );
}
- intf_DbgMsg( "dec debug: decoder \"%s\"thread (%p) created",
- p_config->p_dec_module->psz_name, p_dec );
-
- return p_config->thread_id;
+ return thread_id;
}
vlc_thread_join( p_es->thread_id );
// vlc_mutex_lock( &p_input->stream.stream_lock );
- /* Unneed module*/
- module_Unneed( p_es->p_dec_config->p_dec_module );
+ /* Delete decoder configuration */
+ DeleteDecoderConfig( p_es->p_config );
- /* 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 );
- }
-
- /* 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 );
+ /* Unneed module */
+ module_Unneed( p_es->p_module );
- free( p_es->p_decoder_fifo );
+ /* Tell the input there is no more decoder */
p_es->p_decoder_fifo = NULL;
}
{
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 );
}
}
}
+/*****************************************************************************
+ * CreateDecoderConfig: create a decoder_config_t
+ *****************************************************************************/
+static decoder_config_t * CreateDecoderConfig( input_thread_t * p_input,
+ es_descriptor_t * p_es )
+{
+ decoder_config_t * p_config;
+
+ p_config = (decoder_config_t *)malloc( sizeof(decoder_config_t) );
+ if( p_config == NULL )
+ {
+ intf_ErrMsg( "Unable to allocate memory in CreateDecoderConfig" );
+ return NULL;
+ }
+
+ /* Decoder FIFO */
+ if( (p_config->p_decoder_fifo =
+ (decoder_fifo_t *)malloc( sizeof(decoder_fifo_t) )) == NULL )
+ {
+ intf_ErrMsg( "Out of memory" );
+ free( p_config );
+ 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 )
+ {
+ intf_ErrMsg( "Unable to realloc memory" );
+ free( p_config->p_decoder_fifo );
+ free( p_config );
+ return NULL;
+ }
+ p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number - 1]
+ = p_es;
+
+ /* Initialize the p_config structure */
+ vlc_mutex_init(&p_config->p_decoder_fifo->data_lock);
+ vlc_cond_init(&p_config->p_decoder_fifo->data_wait);
+ p_es->p_decoder_fifo = p_config->p_decoder_fifo;
+
+ p_config->i_id = p_es->i_id;
+ p_config->i_type = p_es->i_type;
+ p_config->p_demux_data = p_es->p_demux_data;
+
+ p_config->p_stream_ctrl = &p_input->stream.control;
+
+ p_config->p_decoder_fifo->p_first = NULL;
+ p_config->p_decoder_fifo->pp_last = &p_config->p_decoder_fifo->p_first;
+ p_config->p_decoder_fifo->i_depth = 0;
+ p_config->p_decoder_fifo->b_die = p_config->p_decoder_fifo->b_error = 0;
+ p_config->p_decoder_fifo->p_packets_mgt = p_input->p_method_data;
+
+ return p_config;
+}
+
+/*****************************************************************************
+ * DeleteDecoderConfig: create a decoder_config_t
+ *****************************************************************************/
+static void DeleteDecoderConfig( decoder_config_t * p_config )
+{
+ intf_StatMsg( "input stats: killing decoder for 0x%x, type 0x%x, %d PES in FIFO",
+ p_config->i_id, p_config->i_type,
+ p_config->p_decoder_fifo->i_depth );
+ /* Free all packets still in the decoder fifo. */
+ input_DeletePES( p_config->p_decoder_fifo->p_packets_mgt,
+ p_config->p_decoder_fifo->p_first );
+
+ /* Destroy the lock and cond */
+ vlc_cond_destroy( &p_config->p_decoder_fifo->data_wait );
+ vlc_mutex_destroy( &p_config->p_decoder_fifo->data_lock );
+
+ free( p_config->p_decoder_fifo );
+
+ free( p_config );
+}
+
projects / vlc / blobdiff