X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput_programs.c;h=d0f1f40f2dcda6ac48f93cebe47dc3ff66cb6dbe;hb=ecbcf0b3126804a20cfc0d22f4a994cfc6cc6374;hp=7a477aab39270191535194faacfed245c97f4e25;hpb=3ce24ee9dd032e9a3b644dd2d35d8ae128a6eb43;p=vlc diff --git a/src/input/input_programs.c b/src/input/input_programs.c index 7a477aab39..d0f1f40f2d 100644 --- a/src/input/input_programs.c +++ b/src/input/input_programs.c @@ -1,10 +1,10 @@ /***************************************************************************** * input_programs.c: es_descriptor_t, pgrm_descriptor_t management ***************************************************************************** - * Copyright (C) 1999, 2000 VideoLAN - * $Id: input_programs.c,v 1.22 2001/01/08 18:16:33 sam Exp $ + * Copyright (C) 1999-2001 VideoLAN + * $Id: input_programs.c,v 1.77 2002/03/28 03:53:15 jobi Exp $ * - * Authors: + * Authors: Christophe Massiot * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,25 +24,18 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include "defs.h" - #include +#include /* memcpy(), memset() */ +#include /* off_t */ -#include "config.h" -#include "common.h" -#include "threads.h" -#include "mtime.h" -#include "debug.h" - -#include "intf_msg.h" +#include #include "stream_control.h" #include "input_ext-intf.h" #include "input_ext-dec.h" -#include "input.h" -#include "input_dec.h" +#include "input_ext-plugins.h" -#include "main.h" /* --noaudio --novideo */ +#include "debug.h" /* * NOTICE : all of these functions expect you to have taken the lock on @@ -52,23 +45,37 @@ /***************************************************************************** * input_InitStream: init the stream descriptor of the given input *****************************************************************************/ -void input_InitStream( input_thread_t * p_input, size_t i_data_len ) +int input_InitStream( input_thread_t * p_input, size_t i_data_len ) { + p_input->stream.i_stream_id = 0; + + /* initialized to 0 since we don't give the signal to the interface + * before the end of input initialization */ + p_input->stream.b_changed = 0; p_input->stream.pp_es = NULL; p_input->stream.pp_selected_es = NULL; + p_input->stream.p_removed_es = NULL; + p_input->stream.p_newly_selected_es = NULL; 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"); - /* FIXME : find a way to tell if failed */ - return; + return 1; } memset( p_input->stream.p_demux_data, 0, i_data_len ); } + else + { + p_input->stream.p_demux_data = NULL; + } + + return 0; } /***************************************************************************** @@ -76,21 +83,34 @@ void input_InitStream( input_thread_t * p_input, size_t i_data_len ) *****************************************************************************/ void input_EndStream( input_thread_t * p_input ) { - int i; - /* Free all programs and associated ES, and associated decoders. */ - for( i = 0; i < p_input->stream.i_pgrm_number; i++ ) + while( p_input->stream.i_pgrm_number ) { - /* Don't put i instead of 0 !! */ input_DelProgram( p_input, p_input->stream.pp_programs[0] ); } /* Free standalone ES */ - for( i = 0; i < p_input->stream.i_es_number; i++ ) + while( p_input->stream.i_es_number ) { - /* Don't put i instead of 0 !! */ input_DelES( p_input, p_input->stream.pp_es[0] ); } + + /* Free all areas */ + while( p_input->stream.i_area_nb ) + { + input_DelArea( p_input, p_input->stream.pp_areas[0] ); + } + + /* Free selected ES */ + if( p_input->stream.pp_selected_es != NULL ) + { + free( p_input->stream.pp_selected_es ); + } + + if( p_input->stream.p_demux_data != NULL ) + { + free( p_input->stream.p_demux_data ); + } } /***************************************************************************** @@ -122,8 +142,6 @@ pgrm_descriptor_t * input_AddProgram( input_thread_t * p_input, /* Where to add the pgrm */ int i_pgrm_index = p_input->stream.i_pgrm_number; - intf_DbgMsg("Adding description for pgrm %d", i_pgrm_id); - /* 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, @@ -152,18 +170,10 @@ pgrm_descriptor_t * input_AddProgram( input_thread_t * p_input, p_input->stream.pp_programs[i_pgrm_index]->i_es_number = 0; p_input->stream.pp_programs[i_pgrm_index]->pp_es = NULL; - p_input->stream.pp_programs[i_pgrm_index]->delta_cr = 0; - p_input->stream.pp_programs[i_pgrm_index]->delta_absolute = 0; - p_input->stream.pp_programs[i_pgrm_index]->last_cr = 0; - p_input->stream.pp_programs[i_pgrm_index]->c_average_count = 0; - p_input->stream.pp_programs[i_pgrm_index]->i_synchro_state - = SYNCHRO_NOT_STARTED; - p_input->stream.pp_programs[i_pgrm_index]->b_discontinuity = 0; + input_ClockInit( p_input->stream.pp_programs[i_pgrm_index] ); - p_input->stream.pp_programs[i_pgrm_index]->p_vout - = p_input->p_default_vout; - p_input->stream.pp_programs[i_pgrm_index]->p_aout - = p_input->p_default_aout; + p_input->stream.pp_programs[i_pgrm_index]->i_synchro_state + = SYNCHRO_START; if( i_data_len ) { @@ -177,6 +187,10 @@ pgrm_descriptor_t * input_AddProgram( input_thread_t * p_input, memset( p_input->stream.pp_programs[i_pgrm_index]->p_demux_data, 0, i_data_len ); } + else + { + p_input->stream.pp_programs[i_pgrm_index]->p_demux_data = NULL; + } return p_input->stream.pp_programs[i_pgrm_index]; } @@ -188,16 +202,13 @@ pgrm_descriptor_t * input_AddProgram( input_thread_t * p_input, *****************************************************************************/ void input_DelProgram( input_thread_t * p_input, pgrm_descriptor_t * p_pgrm ) { - int i_index, i_pgrm_index; + int i_pgrm_index; ASSERT( p_pgrm ); - intf_DbgMsg("Deleting description for pgrm %d", p_pgrm->i_number); - /* Free the structures that describe the es that belongs to that program */ - for( i_index = 0; i_index < p_pgrm->i_es_number; i_index++ ) + while( p_pgrm->i_es_number ) { - /* Don't put i_index instead of 0 !! */ input_DelES( p_input, p_pgrm->pp_es[0] ); } @@ -234,6 +245,198 @@ void input_DelProgram( input_thread_t * p_input, pgrm_descriptor_t * p_pgrm ) free( p_pgrm ); } +/***************************************************************************** + * input_AddArea: add and init an area descriptor + ***************************************************************************** + * This area descriptor will be referenced in the given stream descriptor + *****************************************************************************/ +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; + + /* 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 ) + { + intf_ErrMsg( "Unable to allocate memory in input_AddArea" ); + 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]; +} + +/***************************************************************************** + * input_SetProgram: changes the current program + *****************************************************************************/ +int input_SetProgram( input_thread_t * p_input, pgrm_descriptor_t * p_new_prg ) +{ + int i_es_index; + + if ( p_input->stream.p_selected_program ) + { + for ( i_es_index = 0 ; + i_es_index < p_input->stream.i_selected_es_number; + i_es_index ++ ) + { + intf_WarnMsg( 4, "Unselecting ES %d", + p_input->stream.pp_selected_es[i_es_index]->i_id ); + input_UnselectES( p_input , + p_input->stream.pp_selected_es[i_es_index] ); + } + } + + for (i_es_index = 0 ; i_es_index < p_new_prg->i_es_number ; i_es_index ++ ) + { + int i_required_audio_es; + int i_required_spu_es; + int i_audio_es = 0; + int i_spu_es = 0; + + /* Get the number of the required audio stream */ + if( p_main->b_audio ) + { + /* Default is the first one */ + i_required_audio_es = config_GetIntVariable( "input_channel" ); + if( i_required_audio_es < 0 ) + { + i_required_audio_es = 1; + } + } + else + { + i_required_audio_es = 0; + } + + /* Same thing for subtitles */ + if( p_main->b_video ) + { + /* for spu, default is none */ + i_required_spu_es = config_GetIntVariable( "input_subtitle" ); + if( i_required_spu_es < 0 ) + { + i_required_spu_es = 0; + } + } + else + { + i_required_spu_es = 0; + } + switch( p_new_prg->pp_es[i_es_index]->i_cat ) + { + case MPEG1_VIDEO_ES: + case MPEG2_VIDEO_ES: + intf_WarnMsg( 4, "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 MPEG1_AUDIO_ES: + case MPEG2_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 ); + input_SelectES( p_input, + p_new_prg->pp_es[i_es_index]); + } + break; + case LPCM_AUDIO_ES : + case AC3_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 ); + input_SelectES( p_input, + p_new_prg->pp_es[i_es_index] ); + } + break; + /* Not sure this one is fully specification-compliant */ + case DVD_SPU_ES : + 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 ); + input_SelectES( p_input, + p_new_prg->pp_es[i_es_index] ); + } + break; + default : + break; + } + + } + + + p_input->stream.p_selected_program = p_new_prg; + + return( 0 ); +} + + +/***************************************************************************** + * input_DelArea: destroy a area descriptor + ***************************************************************************** + * All ES descriptions referenced in the descriptor will be deleted. + *****************************************************************************/ +void input_DelArea( input_thread_t * p_input, input_area_t * p_area ) +{ + int i_area_index; + + ASSERT( p_area ); + + /* Find the area in the areas table */ + for( i_area_index = 0; i_area_index < p_input->stream.i_area_nb; + i_area_index++ ) + { + if( p_input->stream.pp_areas[i_area_index] == p_area ) + 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) + { + intf_ErrMsg( "input error: unable to realloc area list" + " in input_DelArea" ); + } + + /* Free the description of this area */ + free( p_area ); +} + + /***************************************************************************** * input_FindES: returns a pointer to an ES described by its ID *****************************************************************************/ @@ -265,8 +468,6 @@ es_descriptor_t * input_AddES( input_thread_t * p_input, { es_descriptor_t * p_es; - intf_DbgMsg("Adding description for ES 0x%x", i_es_id); - p_es = (es_descriptor_t *)malloc( sizeof(es_descriptor_t) ); if( p_es == NULL ) { @@ -283,12 +484,17 @@ es_descriptor_t * input_AddES( input_thread_t * p_input, return( NULL ); } p_input->stream.pp_es[p_input->stream.i_es_number - 1] = p_es; - p_es->i_id = i_es_id; /* Init its values */ - p_es->b_discontinuity = 0; + 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; +#ifdef HAVE_SATELLITE + p_es->i_dmx_fd = 0; +#endif if( i_data_len ) { @@ -342,8 +548,7 @@ void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es ) /* Kill associated decoder, if any. */ if( p_es->p_decoder_fifo != NULL ) { - input_EndDecoder( p_es->p_decoder_fifo, p_es->thread_id ); - free( p_es->p_decoder_fifo ); + input_EndDecoder( p_input, p_es ); } /* Remove this ES from the description of the program if it is associated to @@ -397,209 +602,123 @@ void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es ) } -#ifdef STATS /***************************************************************************** - * input_DumpStream: dumps the contents of a stream descriptor + * input_SelectES: selects an ES and spawns the associated decoder + ***************************************************************************** + * Remember we are still supposed to have stream_lock when entering this + * function ? *****************************************************************************/ -void input_DumpStream( input_thread_t * p_input ) +int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es ) { - int i, j; -#define S p_input->stream - intf_Msg( "input info: Dumping stream ID 0x%x", S.i_stream_id ); - if( S.b_seekable ) - intf_Msg( "input info: seekable stream, position: %d/%d", - S.i_tell, S.i_size ); - else - intf_Msg( "input info: %s", S.b_pace_control ? "pace controlled" : - "pace un-controlled" ); -#undef S - for( i = 0; i < p_input->stream.i_pgrm_number; i++ ) + if( p_es == NULL ) { -#define P p_input->stream.pp_programs[i] - intf_Msg( "input info: Dumping program 0x%x, version %d (%s)", - P->i_number, P->i_version, - P->b_is_ok ? "complete" : "partial" ); - if( P->i_synchro_state == SYNCHRO_OK ) - intf_Msg( "input info: synchro absolute delta : %lld (jitter : %lld)", - P->delta_absolute, P->delta_cr ); -#undef P - for( j = 0; j < p_input->stream.pp_programs[i]->i_es_number; j++ ) - { -#define ES p_input->stream.pp_programs[i]->pp_es[j] - intf_Msg( "input info: ES 0x%x, stream 0x%x, type 0x%x, %s", - ES->i_id, ES->i_stream_id, ES->i_type, - ES->p_decoder_fifo != NULL ? "selected" : "not selected"); -#undef ES - } + intf_ErrMsg( "input error: nothing to do in input_SelectES" ); + return -1; } -} -#endif -/***************************************************************************** - * InitDecConfig: initializes a decoder_config_t - *****************************************************************************/ -static int InitDecConfig( input_thread_t * p_input, es_descriptor_t * p_es, - decoder_config_t * p_config ) -{ - p_config->i_id = p_es->i_id; - p_config->i_type = p_es->i_type; - p_config->p_stream_ctrl = - &p_input->stream.control; + intf_WarnMsg( 4, "input: selecting ES 0x%x", p_es->i_id ); - /* Decoder FIFO */ - if( (p_config->p_decoder_fifo = - (decoder_fifo_t *)malloc( sizeof(decoder_fifo_t) )) == NULL ) + if( p_es->p_decoder_fifo != NULL ) { - intf_ErrMsg( "Out of memory" ); + intf_ErrMsg( "ES 0x%x is already selected", p_es->i_id ); return( -1 ); } - vlc_mutex_init(&p_config->p_decoder_fifo->data_lock); - vlc_cond_init(&p_config->p_decoder_fifo->data_wait); - p_config->p_decoder_fifo->i_start = p_config->p_decoder_fifo->i_end = 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; - p_config->p_decoder_fifo->pf_delete_pes = - p_input->p_plugin->pf_delete_pes; - p_es->p_decoder_fifo = p_config->p_decoder_fifo; - - p_config->pf_init_bit_stream = InitBitstream; + p_es->thread_id = 0; - return( 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; -/***************************************************************************** - * GetVdecConfig: returns a valid vdec_config_t - *****************************************************************************/ -static vdec_config_t * GetVdecConfig( input_thread_t * p_input, - es_descriptor_t * p_es ) -{ - vdec_config_t * p_config; + 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; - p_config = (vdec_config_t *)malloc( sizeof(vdec_config_t) ); - if( p_config == NULL ) - { - intf_ErrMsg( "Unable to allocate memory in GetVdecConfig" ); - return( NULL ); + default: + intf_ErrMsg( "Unknown stream type 0x%x", p_es->i_type ); + return( -1 ); + break; } - p_config->p_vout = p_input->p_default_vout; - if( InitDecConfig( p_input, p_es, &p_config->decoder_config ) == -1 ) + + if( p_es->thread_id == 0 ) { - free( p_config ); - return( NULL ); + return( -1 ); } - return( p_config ); + return( 0 ); } /***************************************************************************** - * GetAdecConfig: returns a valid adec_config_t + * input_UnselectES: removes an ES from the list of selected ES *****************************************************************************/ -static adec_config_t * GetAdecConfig( input_thread_t * p_input, - es_descriptor_t * p_es ) +int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es ) { - adec_config_t * p_config; - p_config = (adec_config_t *)malloc( sizeof(adec_config_t)); - if( p_config == NULL ) - { - intf_ErrMsg( "Unable to allocate memory in GetAdecConfig" ); - return( NULL ); - } - p_config->p_aout = p_input->p_default_aout; - if( InitDecConfig( p_input, p_es, &p_config->decoder_config ) == -1 ) + int i_index = 0; + + if( p_es == NULL ) { - free( p_config ); - return( NULL ); + intf_ErrMsg( "Nothing to do in input_UnselectES" ); + return -1; } - return( p_config ); -} - -/***************************************************************************** - * input_SelectES: selects an ES and spawns the associated decoder - *****************************************************************************/ -/* FIXME */ -vlc_thread_t adec_CreateThread( void * ); -vlc_thread_t ac3dec_CreateThread( void * ); -vlc_thread_t vpar_CreateThread( void * ); -vlc_thread_t spudec_CreateThread( void * ); + intf_WarnMsg( 4, "input: unselecting ES 0x%x", p_es->i_id ); -int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es ) -{ - /* FIXME ! */ - decoder_capabilities_t decoder; - -#ifdef DEBUG_INPUT - intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id ); -#endif - - if( p_es->p_decoder_fifo != NULL ) + if( p_es->p_decoder_fifo == NULL ) { - intf_ErrMsg( "ES %d is already selected", p_es->i_id ); + intf_ErrMsg( "ES 0x%x is not selected", p_es->i_id ); return( -1 ); } - switch( p_es->i_type ) - { - case MPEG1_AUDIO_ES: - case MPEG2_AUDIO_ES: - if( p_main->b_audio ) - { - decoder.pf_create_thread = adec_CreateThread; - p_es->thread_id = input_RunDecoder( &decoder, - (void *)GetAdecConfig( p_input, p_es ) ); - } - break; - - case MPEG1_VIDEO_ES: - case MPEG2_VIDEO_ES: - if( p_main->b_video ) - { - decoder.pf_create_thread = vpar_CreateThread; - p_es->thread_id = input_RunDecoder( &decoder, - (void *)GetVdecConfig( p_input, p_es ) ); - } - break; + input_EndDecoder( p_input, p_es ); + free( p_es->p_pes ); - case AC3_AUDIO_ES: - if( p_main->b_audio ) - { - decoder.pf_create_thread = ac3dec_CreateThread; - p_es->thread_id = input_RunDecoder( &decoder, - (void *)GetAdecConfig( p_input, p_es ) ); - } - break; + if( ( p_es->p_decoder_fifo == NULL ) && + ( p_input->stream.i_selected_es_number > 0 ) ) + { + p_input->stream.i_selected_es_number--; - case DVD_SPU_ES: - if( p_main->b_video ) + while( ( i_index < p_input->stream.i_selected_es_number ) && + ( p_input->stream.pp_selected_es[i_index] != p_es ) ) { - decoder.pf_create_thread = spudec_CreateThread; - p_es->thread_id = input_RunDecoder( &decoder, - (void *)GetVdecConfig( p_input, p_es ) ); + i_index++; } - break; - default: - intf_ErrMsg( "Unknown stream type %d", p_es->i_type ); - return( -1 ); - break; - } + p_input->stream.pp_selected_es[i_index] = + p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number]; - if( p_es->p_decoder_fifo != NULL ) - { - 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 in input_SelectES" ); - return(-1); + intf_WarnMsg( 4, "input: no more selected ES in input_UnselectES" ); + return( 1 ); } - p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number - 1] - = p_es; } + return( 0 ); }