/*****************************************************************************
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: input_programs.c,v 1.81 2002/04/23 14:16:20 sam Exp $
+ * Copyright (C) 1999-2002 VideoLAN
+ * $Id: input_programs.c,v 1.99 2002/12/06 16:34:08 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*****************************************************************************/
#include <stdlib.h>
#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"
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
-#include "debug.h"
-
/*
* NOTICE : all of these functions expect you to have taken the lock on
* p_input->stream.lock
p_input->stream.pp_programs = NULL;
p_input->stream.p_selected_program = NULL;
p_input->stream.p_new_program = NULL;
-
+
if( i_data_len )
{
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 );
{
free( p_input->stream.pp_selected_es );
}
-
+
if( p_input->stream.p_demux_data != NULL )
{
free( p_input->stream.p_demux_data );
/*****************************************************************************
* input_FindProgram: returns a pointer to a program described by its ID
*****************************************************************************/
-pgrm_descriptor_t * input_FindProgram( input_thread_t * p_input, u16 i_pgrm_id )
+pgrm_descriptor_t * input_FindProgram( input_thread_t * p_input,
+ uint16_t i_pgrm_id )
{
- int i;
+ unsigned int i;
for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
{
}
}
- return( NULL );
+ return NULL;
}
/*****************************************************************************
u16 i_pgrm_id, size_t i_data_len )
{
/* Where to add the pgrm */
- int i_pgrm_index = p_input->stream.i_pgrm_number;
+ pgrm_descriptor_t * p_pgrm = malloc( sizeof(pgrm_descriptor_t) );
- /* Add an entry to the list of program associated with the stream */
- p_input->stream.i_pgrm_number++;
- p_input->stream.pp_programs = realloc( p_input->stream.pp_programs,
- p_input->stream.i_pgrm_number
- * sizeof(pgrm_descriptor_t *) );
- if( p_input->stream.pp_programs == NULL )
- {
- intf_ErrMsg( "Unable to realloc memory in input_AddProgram" );
- return( NULL );
- }
-
- /* Allocate the structure to store this description */
- p_input->stream.pp_programs[i_pgrm_index] =
- malloc( sizeof(pgrm_descriptor_t) );
- if( p_input->stream.pp_programs[i_pgrm_index] == NULL )
+ if( p_pgrm == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_AddProgram" );
- return( NULL );
+ msg_Err( p_input, "out of memory" );
+ return NULL;
}
-
+
/* Init this entry */
- p_input->stream.pp_programs[i_pgrm_index]->i_number = i_pgrm_id;
- p_input->stream.pp_programs[i_pgrm_index]->b_is_ok = 0;
- p_input->stream.pp_programs[i_pgrm_index]->i_version = 0;
+ p_pgrm->i_number = i_pgrm_id;
+ p_pgrm->b_is_ok = 0;
+ p_pgrm->i_version = 0;
- p_input->stream.pp_programs[i_pgrm_index]->i_es_number = 0;
- p_input->stream.pp_programs[i_pgrm_index]->pp_es = NULL;
+ p_pgrm->i_es_number = 0;
+ p_pgrm->pp_es = NULL;
- input_ClockInit( p_input->stream.pp_programs[i_pgrm_index] );
+ input_ClockInit( p_pgrm );
- p_input->stream.pp_programs[i_pgrm_index]->i_synchro_state
- = SYNCHRO_START;
+ p_pgrm->i_synchro_state = SYNCHRO_START;
if( i_data_len )
{
- p_input->stream.pp_programs[i_pgrm_index]->p_demux_data =
- malloc( i_data_len );
- if( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data == NULL )
+ p_pgrm->p_demux_data = malloc( i_data_len );
+ if( p_pgrm->p_demux_data == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_AddProgram" );
- return( NULL );
+ msg_Err( p_input, "out of memory" );
+ return NULL;
}
- memset( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data, 0,
- i_data_len );
+ memset( p_pgrm->p_demux_data, 0, i_data_len );
}
else
{
- p_input->stream.pp_programs[i_pgrm_index]->p_demux_data = NULL;
+ p_pgrm->p_demux_data = NULL;
}
- return p_input->stream.pp_programs[i_pgrm_index];
+ /* Add an entry to the list of program associated with the stream */
+ INSERT_ELEM( p_input->stream.pp_programs,
+ p_input->stream.i_pgrm_number,
+ p_input->stream.i_pgrm_number,
+ p_pgrm );
+
+ return p_pgrm;
}
/*****************************************************************************
*****************************************************************************/
void input_DelProgram( input_thread_t * p_input, pgrm_descriptor_t * p_pgrm )
{
- int i_pgrm_index;
+ unsigned int i_pgrm_index;
+
+ /* Find the program in the programs table */
+ for( i_pgrm_index = 0; i_pgrm_index < p_input->stream.i_pgrm_number;
+ i_pgrm_index++ )
+ {
+ if( p_input->stream.pp_programs[i_pgrm_index] == p_pgrm )
+ break;
+ }
- ASSERT( p_pgrm );
+ /* If the program wasn't found, do nothing */
+ if( i_pgrm_index == p_input->stream.i_pgrm_number )
+ {
+ msg_Err( p_input, "program does not belong to this input" );
+ return;
+ }
/* Free the structures that describe the es that belongs to that program */
while( p_pgrm->i_es_number )
free( p_pgrm->p_demux_data );
}
- /* Find the program in the programs table */
- for( i_pgrm_index = 0; i_pgrm_index < p_input->stream.i_pgrm_number;
- i_pgrm_index++ )
- {
- if( p_input->stream.pp_programs[i_pgrm_index] == p_pgrm )
- break;
- }
-
/* Remove this program from the stream's list of programs */
- p_input->stream.i_pgrm_number--;
-
- p_input->stream.pp_programs[i_pgrm_index] =
- p_input->stream.pp_programs[p_input->stream.i_pgrm_number];
- p_input->stream.pp_programs = realloc( p_input->stream.pp_programs,
- p_input->stream.i_pgrm_number
- * sizeof(pgrm_descriptor_t *) );
-
- if( p_input->stream.i_pgrm_number && p_input->stream.pp_programs == NULL)
- {
- intf_ErrMsg( "input error: unable to realloc program list"
- " in input_DelProgram" );
- }
+ REMOVE_ELEM( p_input->stream.pp_programs,
+ p_input->stream.i_pgrm_number,
+ i_pgrm_index );
/* Free the description of this program */
free( p_pgrm );
input_area_t * input_AddArea( input_thread_t * p_input )
{
/* Where to add the pgrm */
- int i_area_index = p_input->stream.i_area_nb;
+ input_area_t * p_area = malloc( sizeof(input_area_t) );
- /* Add an entry to the list of program associated with the stream */
- p_input->stream.i_area_nb++;
- p_input->stream.pp_areas = realloc( p_input->stream.pp_areas,
- p_input->stream.i_area_nb
- * sizeof(input_area_t *) );
- if( p_input->stream.pp_areas == NULL )
- {
- intf_ErrMsg( "Unable to realloc memory in input_AddArea" );
- return( NULL );
- }
-
- /* Allocate the structure to store this description */
- p_input->stream.pp_areas[i_area_index] =
- malloc( sizeof(input_area_t) );
- if( p_input->stream.pp_areas[i_area_index] == NULL )
+ if( p_area == NULL )
{
- intf_ErrMsg( "Unable to allocate memory in input_AddArea" );
- return( NULL );
+ msg_Err( p_input, "out of memory" );
+ return NULL;
}
-
+
/* Init this entry */
- p_input->stream.pp_areas[i_area_index]->i_id = 0;
- p_input->stream.pp_areas[i_area_index]->i_start = 0;
- p_input->stream.pp_areas[i_area_index]->i_size = 0;
- p_input->stream.pp_areas[i_area_index]->i_tell = 0;
- p_input->stream.pp_areas[i_area_index]->i_seek = NO_SEEK;
- p_input->stream.pp_areas[i_area_index]->i_part_nb = 1;
- p_input->stream.pp_areas[i_area_index]->i_part= 0;
-
- return p_input->stream.pp_areas[i_area_index];
+ p_area->i_id = 0;
+ p_area->i_start = 0;
+ p_area->i_size = 0;
+ p_area->i_tell = 0;
+ p_area->i_seek = NO_SEEK;
+ p_area->i_part_nb = 1;
+ p_area->i_part= 0;
+
+ /* Add an entry to the list of program associated with the stream */
+ INSERT_ELEM( p_input->stream.pp_areas,
+ p_input->stream.i_area_nb,
+ p_input->stream.i_area_nb,
+ p_area );
+
+ return p_area;
}
/*****************************************************************************
*****************************************************************************/
int input_SetProgram( input_thread_t * p_input, pgrm_descriptor_t * p_new_prg )
{
- int i_es_index;
- int i_required_audio_es;
- int i_required_spu_es;
- int i_audio_es = 0;
- int i_spu_es = 0;
+ unsigned int i_es_index;
+ unsigned int i_required_audio_es;
+ unsigned int i_required_spu_es;
+ unsigned int i_audio_es = 0;
+ unsigned int i_spu_es = 0;
if ( p_input->stream.p_selected_program )
{
}
}
/* 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;
}
*****************************************************************************/
void input_DelArea( input_thread_t * p_input, input_area_t * p_area )
{
- int i_area_index;
-
- ASSERT( p_area );
+ unsigned int i_area_index;
/* Find the area in the areas table */
for( i_area_index = 0; i_area_index < p_input->stream.i_area_nb;
break;
}
- /* Remove this area from the stream's list of areas */
- p_input->stream.i_area_nb--;
-
- p_input->stream.pp_areas[i_area_index] =
- p_input->stream.pp_areas[p_input->stream.i_area_nb];
- p_input->stream.pp_areas = realloc( p_input->stream.pp_areas,
- p_input->stream.i_area_nb
- * sizeof(input_area_t *) );
-
- if( p_input->stream.i_area_nb && p_input->stream.pp_areas == NULL)
+ /* If the area wasn't found, do nothing */
+ if( i_area_index == p_input->stream.i_area_nb )
{
- intf_ErrMsg( "input error: unable to realloc area list"
- " in input_DelArea" );
+ msg_Err( p_input, "area does not belong to this input" );
+ return;
}
+ /* Remove this area from the stream's list of areas */
+ REMOVE_ELEM( p_input->stream.pp_areas,
+ p_input->stream.i_area_nb,
+ i_area_index );
+
/* Free the description of this area */
free( p_area );
}
/*****************************************************************************
* input_FindES: returns a pointer to an ES described by its ID
*****************************************************************************/
-es_descriptor_t * input_FindES( input_thread_t * p_input, u16 i_es_id )
+es_descriptor_t * input_FindES( input_thread_t * p_input, uint16_t i_es_id )
{
- int i;
+ unsigned int i;
for( i = 0; i < p_input->stream.i_es_number; i++ )
{
}
}
- return( NULL );
+ return NULL;
}
/*****************************************************************************
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++;
- p_input->stream.pp_es = realloc( p_input->stream.pp_es,
- 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" );
- return( NULL );
- }
- p_input->stream.pp_es[p_input->stream.i_es_number - 1] = p_es;
+
+ INSERT_ELEM( p_input->stream.pp_es,
+ p_input->stream.i_es_number,
+ p_input->stream.i_es_number,
+ p_es );
/* Init its values */
p_es->i_id = i_es_id;
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 );
/* Add this ES to the program definition if one is given */
if( p_pgrm )
{
- p_pgrm->i_es_number++;
- p_pgrm->pp_es = realloc( p_pgrm->pp_es,
- p_pgrm->i_es_number
- * sizeof(es_descriptor_t *) );
- if( p_pgrm->pp_es == NULL )
- {
- intf_ErrMsg( "Unable to realloc memory in input_AddES" );
- return( NULL );
- }
- p_pgrm->pp_es[p_pgrm->i_es_number - 1] = p_es;
+ INSERT_ELEM( p_pgrm->pp_es,
+ p_pgrm->i_es_number,
+ p_pgrm->i_es_number,
+ p_es );
p_es->p_pgrm = p_pgrm;
}
else
*****************************************************************************/
void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es )
{
- int i_index, i_es_index;
+ unsigned int i_index, i_es_index;
pgrm_descriptor_t * p_pgrm;
- ASSERT( p_es );
+ /* 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;
+ }
+
+ /* If the ES wasn't found, do nothing */
+ if( i_es_index == p_input->stream.i_es_number )
+ {
+ msg_Err( p_input, "ES does not belong to this input" );
+ return;
+ }
+
p_pgrm = p_es->p_pgrm;
/* Kill associated decoder, if any. */
{
if( p_pgrm->pp_es[i_index] == p_es )
{
- p_pgrm->i_es_number--;
- p_pgrm->pp_es[i_index] = p_pgrm->pp_es[p_pgrm->i_es_number];
- p_pgrm->pp_es = realloc( p_pgrm->pp_es,
- p_pgrm->i_es_number
- * sizeof(es_descriptor_t *));
- if( p_pgrm->i_es_number && p_pgrm->pp_es == NULL )
- {
- intf_ErrMsg( "Unable to realloc memory in input_DelES" );
- }
+ REMOVE_ELEM( p_pgrm->pp_es,
+ p_pgrm->i_es_number,
+ i_index );
break;
}
}
break;
}
+ /* Remove this ES from the stream's list of ES */
+ REMOVE_ELEM( p_input->stream.pp_es,
+ p_input->stream.i_es_number,
+ i_es_index );
+
/* Free the ES */
free( p_es );
- p_input->stream.i_es_number--;
- p_input->stream.pp_es[i_es_index] =
- p_input->stream.pp_es[p_input->stream.i_es_number];
- p_input->stream.pp_es = realloc( p_input->stream.pp_es,
- p_input->stream.i_es_number
- * sizeof(es_descriptor_t *));
- if( p_input->stream.i_es_number && p_input->stream.pp_es == NULL )
- {
- intf_ErrMsg( "Unable to realloc memory in input_DelES" );
- }
-
}
/*****************************************************************************
{
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 );
-
- if( p_es->p_decoder_fifo != NULL )
+ if( ((p_es->i_cat == VIDEO_ES) || (p_es->i_cat == SPU_ES))
+ && !config_GetInt( p_input, "video" ) )
{
- intf_ErrMsg( "ES 0x%x is already selected", p_es->i_id );
- return( -1 );
+ msg_Dbg( p_input,
+ "video is disabled, not selecting ES 0x%x", p_es->i_id );
+ return -1;
}
- p_es->thread_id = 0;
-
- switch( p_es->i_type )
+ if( (p_es->i_cat == AUDIO_ES) && !config_GetInt( p_input, "audio" ) )
{
- 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;
+ msg_Dbg( p_input,
+ "audio is disabled, not selecting ES 0x%x", p_es->i_id );
+ return -1;
+ }
- case MPEG1_VIDEO_ES:
- case MPEG2_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;
+ msg_Dbg( p_input, "selecting ES 0x%x", p_es->i_id );
- default:
- intf_ErrMsg( "Unknown stream type 0x%x", p_es->i_type );
- return( -1 );
- break;
+ if( p_es->p_decoder_fifo != NULL )
+ {
+ msg_Err( p_input, "ES 0x%x is already selected", p_es->i_id );
+ return -1;
}
- if( p_es->thread_id == 0 )
+ /* 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->p_decoder_fifo == NULL )
{
- return( -1 );
+ return -1;
}
- return( 0 );
+ return 0;
}
/*****************************************************************************
int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
{
- int i_index = 0;
+ unsigned int i_index = 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 );
}
if( ( p_es->p_decoder_fifo == NULL ) &&
( p_input->stream.i_selected_es_number > 0 ) )
{
- p_input->stream.i_selected_es_number--;
-
- while( ( i_index < p_input->stream.i_selected_es_number ) &&
+ while( ( i_index < p_input->stream.i_selected_es_number - 1 ) &&
( p_input->stream.pp_selected_es[i_index] != p_es ) )
{
i_index++;
}
- p_input->stream.pp_selected_es[i_index] =
- p_input->stream.pp_selected_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 *) );
+ /* XXX: no need to memmove, we have unsorted data */
+ REMOVE_ELEM( p_input->stream.pp_selected_es,
+ p_input->stream.i_selected_es_number,
+ i_index );
- if( p_input->stream.pp_selected_es == NULL )
+ if( p_input->stream.i_selected_es_number == 0 )
{
- intf_WarnMsg( 4, "input: no more selected ES in input_UnselectES" );
- return( 1 );
+ msg_Dbg( p_input, "no more selected ES" );
+ return 1;
}
}
- return( 0 );
+ return 0;
}
projects / vlc / blobdiff