* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
* Copyright (C) 1999-2002 VideoLAN
- * $Id: input_programs.c,v 1.88 2002/05/17 00:58:14 sam Exp $
+ * $Id: input_programs.c,v 1.94 2002/07/31 20:56:52 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#include <string.h> /* memcpy(), memset() */
#include <sys/types.h> /* off_t */
-#include <videolan/vlc.h>
+#include <vlc/vlc.h>
#include "stream_control.h"
#include "input_ext-intf.h"
{
if ( (p_input->stream.p_demux_data = malloc( i_data_len )) == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_InitStream");
+ msg_Err( p_input, "out of memory" );
return 1;
}
memset( p_input->stream.p_demux_data, 0, i_data_len );
* sizeof(pgrm_descriptor_t *) );
if( p_input->stream.pp_programs == NULL )
{
- intf_ErrMsg( "Unable to realloc memory in input_AddProgram" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
malloc( sizeof(pgrm_descriptor_t) );
if( p_input->stream.pp_programs[i_pgrm_index] == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_AddProgram" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
malloc( i_data_len );
if( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_AddProgram" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
memset( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data, 0,
/* If the program wasn't found, do nothing */
if( i_pgrm_index == p_input->stream.i_pgrm_number )
{
- intf_ErrMsg( "input error: program does not belong to this input" );
+ msg_Err( p_input, "program does not belong to this input" );
return;
}
* sizeof(pgrm_descriptor_t *) );
if( p_input->stream.pp_programs == NULL )
{
- intf_ErrMsg( "input error: unable to realloc program list"
- " in input_DelProgram" );
+ msg_Err( p_input, "cannot realloc memory" );
}
}
else
* sizeof(input_area_t *) );
if( p_input->stream.pp_areas == NULL )
{
- intf_ErrMsg( "Unable to realloc memory in input_AddArea" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
malloc( sizeof(input_area_t) );
if( p_input->stream.pp_areas[i_area_index] == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_AddArea" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
}
}
/* Get the number of the required audio stream */
- if( p_main->b_audio )
+ if( config_GetInt( p_input, "audio" ) )
{
/* Default is the first one */
- i_required_audio_es = config_GetIntVariable( "audio-channel" );
+ i_required_audio_es = config_GetInt( p_input, "audio-channel" );
if( i_required_audio_es < 0 )
{
i_required_audio_es = 1;
}
/* Same thing for subtitles */
- if( p_main->b_video )
+ if( config_GetInt( p_input, "video" ) )
{
/* for spu, default is none */
- i_required_spu_es = config_GetIntVariable( "spu-channel" );
+ i_required_spu_es = config_GetInt( p_input, "spu-channel" );
if( i_required_spu_es < 0 )
{
i_required_spu_es = 0;
i_required_spu_es = 0;
}
- for (i_es_index = 0 ; i_es_index < p_new_prg->i_es_number ; i_es_index ++ )
+ for( i_es_index = 0 ; i_es_index < p_new_prg->i_es_number ; i_es_index ++ )
{
switch( p_new_prg->pp_es[i_es_index]->i_cat )
{
case VIDEO_ES:
- intf_WarnMsg( 4, "Selecting ES %x",
- p_new_prg->pp_es[i_es_index]->i_id );
+ msg_Dbg( p_input, "selecting ES %x",
+ p_new_prg->pp_es[i_es_index]->i_id );
input_SelectES( p_input, p_new_prg->pp_es[i_es_index] );
break;
case AUDIO_ES:
i_audio_es += 1;
if( i_audio_es <= i_required_audio_es )
{
- intf_WarnMsg( 4, "Selecting ES %x",
- p_new_prg->pp_es[i_es_index]->i_id );
+ msg_Dbg( p_input, "selecting ES %x",
+ p_new_prg->pp_es[i_es_index]->i_id );
input_SelectES( p_input, p_new_prg->pp_es[i_es_index]);
}
break;
i_spu_es += 1;
if( i_spu_es <= i_required_spu_es )
{
- intf_WarnMsg( 4, "Selecting ES %x",
- p_new_prg->pp_es[i_es_index]->i_id );
+ msg_Dbg( p_input, "selecting ES %x",
+ p_new_prg->pp_es[i_es_index]->i_id );
input_SelectES( p_input, p_new_prg->pp_es[i_es_index] );
}
break;
default :
- intf_WarnMsg( 2, "ES %x has unknown type",
- p_new_prg->pp_es[i_es_index]->i_id );
+ msg_Dbg( p_input, "ES %x has unknown type",
+ p_new_prg->pp_es[i_es_index]->i_id );
break;
}
/* If the area wasn't found, do nothing */
if( i_area_index == p_input->stream.i_area_nb )
{
- intf_ErrMsg( "input error: area does not belong to this input" );
+ msg_Err( p_input, "area does not belong to this input" );
return;
}
if( p_input->stream.pp_areas == NULL )
{
- intf_ErrMsg( "input error: unable to realloc area list"
- " in input_DelArea" );
+ msg_Err( p_input, "cannot realloc memory" );
}
}
else
p_es = (es_descriptor_t *)malloc( sizeof(es_descriptor_t) );
if( p_es == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_AddES" );
+ msg_Err( p_input, "out of memory" );
return( NULL);
}
p_input->stream.i_es_number++;
* sizeof(es_descriptor_t *) );
if( p_input->stream.pp_es == NULL )
{
- intf_ErrMsg( "Unable to realloc memory in input_AddES" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
p_es->psz_desc[0] = '\0';
p_es->p_pes = NULL;
p_es->p_decoder_fifo = NULL;
- p_es->b_audio = 0;
p_es->i_cat = UNKNOWN_ES;
p_es->i_demux_fd = 0;
+ p_es->c_packets = 0;
+ p_es->c_invalid_packets = 0;
if( i_data_len )
{
p_es->p_demux_data = malloc( i_data_len );
if( p_es->p_demux_data == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_AddES" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
memset( p_es->p_demux_data, 0, i_data_len );
* sizeof(es_descriptor_t *) );
if( p_pgrm->pp_es == NULL )
{
- intf_ErrMsg( "Unable to realloc memory in input_AddES" );
+ msg_Err( p_input, "out of memory" );
return( NULL );
}
/* If the ES wasn't found, do nothing */
if( i_es_index == p_input->stream.i_es_number )
{
- intf_ErrMsg( "input error: ES does not belong to this input" );
+ msg_Err( p_input, "ES does not belong to this input" );
return;
}
* sizeof(es_descriptor_t *));
if( p_pgrm->pp_es == NULL )
{
- intf_ErrMsg( "Unable to realloc memory in "
- "input_DelES" );
+ msg_Err( p_input, "cannot realloc memory" );
}
}
else
free( p_es->p_demux_data );
}
+ /* Find the ES in the ES table */
+ for( i_es_index = 0; i_es_index < p_input->stream.i_es_number;
+ i_es_index++ )
+ {
+ if( p_input->stream.pp_es[i_es_index] == p_es )
+ break;
+ }
+
/* Remove this ES from the stream's list of ES */
p_input->stream.i_es_number--;
p_input->stream.pp_es[i_es_index] =
* sizeof(es_descriptor_t *));
if( p_input->stream.pp_es == NULL )
{
- intf_ErrMsg( "Unable to realloc memory in input_DelES" );
+ msg_Err( p_input, "cannot realloc memory" );
}
}
else
{
if( p_es == NULL )
{
- intf_ErrMsg( "input error: nothing to do in input_SelectES" );
+ msg_Err( p_input, "nothing to do in input_SelectES" );
return -1;
}
- intf_WarnMsg( 4, "input: selecting ES 0x%x", p_es->i_id );
+ msg_Dbg( p_input, "selecting ES 0x%x", p_es->i_id );
if( p_es->p_decoder_fifo != NULL )
{
- intf_ErrMsg( "ES 0x%x is already selected", p_es->i_id );
- return( -1 );
+ msg_Err( p_input, "ES 0x%x is already selected", p_es->i_id );
+ return -1;
}
- p_es->thread_id = 0;
-
- switch( p_es->i_type )
- {
- case AC3_AUDIO_ES:
- case MPEG1_AUDIO_ES:
- case MPEG2_AUDIO_ES:
- case LPCM_AUDIO_ES:
- if( p_main->b_audio )
- {
- /* Release the lock, not to block the input thread during
- * the creation of the thread. */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- p_es->thread_id = input_RunDecoder( p_input, p_es );
- vlc_mutex_lock( &p_input->stream.stream_lock );
- }
- break;
-
- case MPEG1_VIDEO_ES:
- case MPEG2_VIDEO_ES:
- case MPEG4_VIDEO_ES:
- case MSMPEG4v1_VIDEO_ES:
- case MSMPEG4v2_VIDEO_ES:
- case MSMPEG4v3_VIDEO_ES:
- case DVD_SPU_ES:
- if( p_main->b_video )
- {
- /* Release the lock, not to block the input thread during
- * the creation of the thread. */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- p_es->thread_id = input_RunDecoder( p_input, p_es );
- vlc_mutex_lock( &p_input->stream.stream_lock );
- }
- break;
-
- default:
- intf_ErrMsg( "Unknown stream type 0x%x", p_es->i_type );
- return( -1 );
- break;
- }
+ /* Release the lock, not to block the input thread during
+ * the creation of the thread. */
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ p_es->p_decoder_fifo = input_RunDecoder( p_input, p_es );
+ vlc_mutex_lock( &p_input->stream.stream_lock );
- if( p_es->thread_id == 0 )
+ if( p_es->p_decoder_fifo == NULL )
{
- return( -1 );
+ return -1;
}
- return( 0 );
+ return 0;
}
/*****************************************************************************
if( p_es == NULL )
{
- intf_ErrMsg( "Nothing to do in input_UnselectES" );
+ msg_Err( p_input, "nothing to do in input_UnselectES" );
return -1;
}
- intf_WarnMsg( 4, "input: unselecting ES 0x%x", p_es->i_id );
+ msg_Dbg( p_input, "unselecting ES 0x%x", p_es->i_id );
if( p_es->p_decoder_fifo == NULL )
{
- intf_ErrMsg( "ES 0x%x is not selected", p_es->i_id );
+ msg_Err( p_input, "ES 0x%x is not selected", p_es->i_id );
return( -1 );
}
* sizeof(es_descriptor_t *) );
if( p_input->stream.pp_selected_es == NULL )
{
- intf_ErrMsg( "Unable to realloc memory in input_UnselectES" );
+ msg_Err( p_input, "cannot realloc memory" );
return( -1 );
}
}
{
free( p_input->stream.pp_selected_es );
p_input->stream.pp_selected_es = NULL;
- intf_WarnMsg( 4, "input: no more selected ES in input_UnselectES" ); return( 1 );
+ msg_Dbg( p_input, "no more selected ES" );
+ return( 1 );
}
}
projects / vlc / blobdiff