X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput_programs.c;h=7e3bb8d398064594ba6f8ba148ffe0cabea9508b;hb=f6c80a75e25d27a95a9e56e48a7af90a5a70afec;hp=10d85b9794fbfea0c3520daea6ea220c5de3d95b;hpb=ecff1e713f6962d45ff9a397e11410066eaa0ebe;p=vlc diff --git a/src/input/input_programs.c b/src/input/input_programs.c index 10d85b9794..7e3bb8d398 100644 --- a/src/input/input_programs.c +++ b/src/input/input_programs.c @@ -2,9 +2,9 @@ * input_programs.c: es_descriptor_t, pgrm_descriptor_t management ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: input_programs.c,v 1.23 2001/01/10 19:22:11 massiot Exp $ + * $Id: input_programs.c,v 1.42 2001/04/01 07:31:38 stef 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 @@ -51,7 +51,7 @@ /***************************************************************************** * 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; p_input->stream.pp_es = NULL; @@ -63,11 +63,12 @@ void input_InitStream( input_thread_t * p_input, size_t 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 ); } + + return 0; } /***************************************************************************** @@ -75,21 +76,22 @@ 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] ); } + + if( p_input->stream.p_demux_data != NULL ) + { + free( p_input->stream.p_demux_data ); + } } /***************************************************************************** @@ -151,13 +153,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; + input_ClockInit( p_input->stream.pp_programs[i_pgrm_index] ); + 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; + = SYNCHRO_START; p_input->stream.pp_programs[i_pgrm_index]->p_vout = p_input->p_default_vout; @@ -187,16 +186,15 @@ 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] ); } @@ -233,6 +231,91 @@ 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; + + intf_DbgMsg("Adding description for area %d", i_area_index ); + + /* 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_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 ); + + intf_DbgMsg("Deleting description for area %d", p_area->i_id ); + + /* 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 *****************************************************************************/ @@ -282,12 +365,14 @@ 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->b_spu = 0; if( i_data_len ) { @@ -342,7 +427,6 @@ void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es ) if( p_es->p_decoder_fifo != NULL ) { input_EndDecoder( p_input, p_es ); - free( p_es->p_decoder_fifo ); } /* Remove this ES from the description of the program if it is associated to @@ -396,44 +480,6 @@ void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es ) } -#ifdef STATS -/***************************************************************************** - * input_DumpStream: dumps the contents of a stream descriptor - *****************************************************************************/ -void input_DumpStream( input_thread_t * p_input ) -{ - 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++ ) - { -#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 - } - } -} -#endif - /***************************************************************************** * InitDecConfig: initializes a decoder_config_t *****************************************************************************/ @@ -458,12 +504,25 @@ static int InitDecConfig( input_thread_t * p_input, es_descriptor_t * p_es, 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_config->p_decoder_fifo->pf_delete_pes = p_input->pf_delete_pes; p_es->p_decoder_fifo = p_config->p_decoder_fifo; p_config->pf_init_bit_stream = InitBitstream; + 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); + } + p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number - 1] + = p_es; + return( 0 ); } @@ -517,6 +576,9 @@ static adec_config_t * GetAdecConfig( input_thread_t * p_input, /***************************************************************************** * input_SelectES: selects an ES and spawns the associated decoder + ***************************************************************************** + * Remember we are still supposed to have stream_lock when entering this + * function ? *****************************************************************************/ /* FIXME */ vlc_thread_t adec_CreateThread( void * ); @@ -528,6 +590,13 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es ) { /* FIXME ! */ decoder_capabilities_t decoder; + void * p_config; + + if( p_es == NULL ) + { + intf_ErrMsg( "Nothing to do in input_SelectES" ); + return -1; + } #ifdef DEBUG_INPUT intf_DbgMsg( "Selecting ES 0x%x", p_es->i_id ); @@ -535,7 +604,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es ) if( p_es->p_decoder_fifo != NULL ) { - intf_ErrMsg( "ES %d is already selected", p_es->i_id ); + intf_ErrMsg( "ES 0x%x is already selected", p_es->i_id ); return( -1 ); } @@ -546,8 +615,13 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_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 ) ); + p_config = (void *)GetAdecConfig( p_input, p_es ); + + /* 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( &decoder, p_config ); + vlc_mutex_lock( &p_input->stream.stream_lock ); } break; @@ -556,8 +630,13 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_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 ) ); + p_config = (void *)GetVdecConfig( p_input, p_es ); + + /* 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( &decoder, p_config ); + vlc_mutex_lock( &p_input->stream.stream_lock ); } break; @@ -565,8 +644,13 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_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 ) ); + p_config = (void *)GetAdecConfig( p_input, p_es ); + + /* 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( &decoder, p_config ); + vlc_mutex_lock( &p_input->stream.stream_lock ); } break; @@ -574,31 +658,82 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es ) if( p_main->b_video ) { decoder.pf_create_thread = spudec_CreateThread; - p_es->thread_id = input_RunDecoder( &decoder, - (void *)GetVdecConfig( p_input, p_es ) ); + p_config = (void *)GetVdecConfig( p_input, p_es ); + + /* 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( &decoder, p_config ); + vlc_mutex_lock( &p_input->stream.stream_lock ); } break; default: - intf_ErrMsg( "Unknown stream type %d", p_es->i_type ); + intf_ErrMsg( "Unknown stream type 0x%x", p_es->i_type ); return( -1 ); break; } - if( p_es->p_decoder_fifo != NULL ) + if( p_es->thread_id == 0 ) { - p_input->stream.i_selected_es_number++; + return( -1 ); + } + + return( 0 ); +} + +/***************************************************************************** + * input_UnselectES: removes an ES from the list of selected ES + *****************************************************************************/ +int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es ) +{ + + int i_index = 0; + + if( p_es == NULL ) + { + intf_ErrMsg( "Nothing to do in input_UnselectES" ); + return -1; + } + +#ifdef DEBUG_INPUT + intf_DbgMsg( "Unselecting ES 0x%x", p_es->i_id ); +#endif + + if( p_es->p_decoder_fifo == NULL ) + { + intf_ErrMsg( "ES 0x%x is not selected", p_es->i_id ); + return( -1 ); + } + + input_EndDecoder( p_input, p_es ); + + 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 ) && + ( 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 *) ); + if( p_input->stream.pp_selected_es == NULL ) { - intf_ErrMsg( "Unable to realloc memory in input_SelectES" ); - return(-1); + intf_ErrMsg( "No more selected ES in input_UnselectES" ); + vlc_mutex_unlock( &p_input->stream.stream_lock ); + return( 1 ); } - p_input->stream.pp_selected_es[p_input->stream.i_selected_es_number - 1] - = p_es; } + return( 0 ); }