From 1adfba81f18ee80b134e17056f94cfa03cfa1d14 Mon Sep 17 00:00:00 2001 From: Johan Bilien <jobi@videolan.org> Date: Wed, 17 Apr 2002 17:00:58 +0000 Subject: [PATCH] * in TS demux, a program is selected only if a PMT for it was found. This should fix the problem that occured when reading a file directly extracted from a satellite card. * UDP access plugin uses input_SetProgram. --- AUTHORS | 1 + plugins/access/udp.c | 61 +-------------------------- src/input/input_programs.c | 65 +++++++++++++++-------------- src/input/mpeg_system.c | 84 ++++++++------------------------------ 4 files changed, 52 insertions(+), 159 deletions(-) diff --git a/AUTHORS b/AUTHORS index a5e66f842d..4bbc22c440 100644 --- a/AUTHORS +++ b/AUTHORS @@ -45,6 +45,7 @@ N: Johan Bilien E: jobi@via.ecp.fr C: jobi D: VCD input +D: Satellite input S: France N: Julien Blache diff --git a/plugins/access/udp.c b/plugins/access/udp.c index 7f1ccf6876..9d5ec2a428 100644 --- a/plugins/access/udp.c +++ b/plugins/access/udp.c @@ -2,7 +2,7 @@ * udp.c: raw UDP access plug-in ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: udp.c,v 1.7 2002/03/29 00:14:19 massiot Exp $ + * $Id: udp.c,v 1.8 2002/04/17 17:00:58 jobi Exp $ * * Authors: Christophe Massiot <massiot@via.ecp.fr> * @@ -51,7 +51,6 @@ *****************************************************************************/ static void input_getfunctions( function_list_t * ); static int UDPOpen ( struct input_thread_s * ); -static int UDPSetProgram ( struct input_thread_s * , pgrm_descriptor_t * ); /***************************************************************************** * Build configuration tree. @@ -85,7 +84,7 @@ static void input_getfunctions( function_list_t * p_function_list ) input.pf_open = UDPOpen; input.pf_read = input_FDNetworkRead; input.pf_close = input_FDClose; - input.pf_set_program = UDPSetProgram; + input.pf_set_program = input_SetProgram; input.pf_set_area = NULL; input.pf_seek = NULL; #undef input @@ -277,59 +276,3 @@ static int UDPOpen( input_thread_t * p_input ) return( 0 ); } - -/***************************************************************************** - * UDPSetProgram: Selects another program - *****************************************************************************/ -int UDPSetProgram( 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 = 1 ; /* 0 should be the PMT */ - i_es_index < p_input->stream.p_selected_program-> - i_es_number ; - i_es_index ++ ) - { -#define p_es p_input->stream.p_selected_program->pp_es[i_es_index] - if ( p_es->p_decoder_fifo ) - { - input_UnselectES( p_input , p_es ); - p_es->p_pes = NULL; /* FIXME */ - } -#undef p_es - } - } - - for (i_es_index = 1 ; i_es_index < p_new_prg->i_es_number ; i_es_index ++ ) - { -#define p_es p_new_prg->pp_es[i_es_index] - switch( p_es->i_cat ) - { - case MPEG1_VIDEO_ES: - case MPEG2_VIDEO_ES: - if ( p_main->b_video ) - { - input_SelectES( p_input , p_es ); - } - break; - case MPEG1_AUDIO_ES: - case MPEG2_AUDIO_ES: - if ( p_main->b_audio ) - { - input_SelectES( p_input , p_es ); - } - break; - default: - input_SelectES( p_input , p_es ); - break; -#undef p_es - } - } - - p_input->stream.p_selected_program = p_new_prg; - - return( 0 ); -} diff --git a/src/input/input_programs.c b/src/input/input_programs.c index 3d7d52af64..b35bd9e198 100644 --- a/src/input/input_programs.c +++ b/src/input/input_programs.c @@ -2,7 +2,7 @@ * input_programs.c: es_descriptor_t, pgrm_descriptor_t management ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: input_programs.c,v 1.79 2002/04/10 16:26:21 jobi Exp $ + * $Id: input_programs.c,v 1.80 2002/04/17 17:00:58 jobi Exp $ * * Authors: Christophe Massiot <massiot@via.ecp.fr> * @@ -306,7 +306,7 @@ int input_SetProgram( input_thread_t * p_input, pgrm_descriptor_t * p_new_prg ) i_es_index ++ ) { #define p_es p_input->stream.p_selected_program->pp_es[i_es_index] - if ( p_es->p_decoder_fifo ) + if ( p_es->p_decoder_fifo ) /* if the ES was selected */ { input_UnselectES( p_input , p_es ); } @@ -346,37 +346,36 @@ int input_SetProgram( input_thread_t * p_input, pgrm_descriptor_t * p_new_prg ) 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 ); - 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 ); - input_SelectES( p_input, - p_new_prg->pp_es[i_es_index]); - } - break; - /* Not sure this one is fully specification-compliant */ - case 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; - } + { + case 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 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 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 : + intf_WarnMsg( 2, "ES %x has unknown type", + p_new_prg->pp_es[i_es_index]->i_id ); + break; + } } diff --git a/src/input/mpeg_system.c b/src/input/mpeg_system.c index eb6e7c10f5..642cdbed75 100644 --- a/src/input/mpeg_system.c +++ b/src/input/mpeg_system.c @@ -2,7 +2,7 @@ * mpeg_system.c: TS, PS and PES management ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: mpeg_system.c,v 1.89 2002/04/08 14:53:05 jobi Exp $ + * $Id: mpeg_system.c,v 1.90 2002/04/17 17:00:58 jobi Exp $ * * Authors: Christophe Massiot <massiot@via.ecp.fr> * Michel Lespinasse <walken@via.ecp.fr> @@ -1588,18 +1588,6 @@ static void input_DecodePAT( input_thread_t * p_input, es_descriptor_t * p_es ) } #undef p_psi - if( !p_input->stream.p_selected_program ) - { - pgrm_descriptor_t * p_pgrm_to_select; - u16 i_id = config_GetIntVariable( "input_program" ); - - p_pgrm_to_select = input_FindProgram( p_input, i_id ); - - if ( p_pgrm_to_select ) - input_SetProgram( p_input, p_pgrm_to_select ); - else /* take the first one */ - input_SetProgram( p_input, p_input->stream.pp_programs[0] ); - } } /***************************************************************************** @@ -1628,8 +1616,6 @@ static void input_DecodePMT( input_thread_t * p_input, es_descriptor_t * p_es ) int i_section_length,i_current_section; int i_prog_info_length, i_loop; int i_es_info_length, i_pid, i_stream_type; - int i_audio_es, i_spu_es; - int i_required_audio_es, i_required_spu_es; p_current_section = p_psi->buffer; p_current_data = p_psi->buffer; @@ -1637,42 +1623,10 @@ static void input_DecodePMT( input_thread_t * p_input, es_descriptor_t * p_es ) p_pgrm_data->i_pcr_pid = ( ((u32)*(p_current_section + 8) & 0x1F) << 8 ) | *(p_current_section + 9); - i_audio_es = 0; - i_spu_es = 0; /* Lock stream information */ vlc_mutex_lock( &p_input->stream.stream_lock ); - /* 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; - } - /* Delete all ES in this program except the PSI. We start from the * end because i_es_number gets decremented after each deletion. */ for( i_loop = p_es->p_pgrm->i_es_number ; i_loop ; ) @@ -1717,37 +1671,26 @@ static void input_DecodePMT( input_thread_t * p_input, es_descriptor_t * p_es ) /* Tell the interface what kind of stream it is and select * the required ones */ - if ( p_input->stream.p_selected_program == p_new_es->p_pgrm ) { switch( i_stream_type ) { case MPEG1_VIDEO_ES: case MPEG2_VIDEO_ES: p_new_es->i_cat = VIDEO_ES; - input_SelectES( p_input, p_new_es ); break; case MPEG1_AUDIO_ES: case MPEG2_AUDIO_ES: p_new_es->i_cat = AUDIO_ES; - i_audio_es += 1; - if( i_audio_es == i_required_audio_es ) - input_SelectES( p_input, p_new_es ); break; case LPCM_AUDIO_ES : case AC3_AUDIO_ES : p_new_es->i_stream_id = 0xBD; p_new_es->i_cat = AUDIO_ES; - i_audio_es += 1; - if( i_audio_es == i_required_audio_es ) - input_SelectES( p_input, p_new_es ); break; /* Not sure this one is fully specification-compliant */ case DVD_SPU_ES : p_new_es->i_stream_id = 0xBD; p_new_es->i_cat = SPU_ES; - i_spu_es += 1; - if( i_spu_es == i_required_spu_es ) - input_SelectES( p_input, p_new_es ); break; default : p_new_es->i_cat = UNKNOWN_ES; @@ -1765,18 +1708,25 @@ static void input_DecodePMT( input_thread_t * p_input, es_descriptor_t * p_es ) } while( i_current_section < p_psi->i_last_section_number ); - if( i_required_audio_es > i_audio_es ) - { - intf_WarnMsg( 2, "input: non-existing audio ES required" ); - } - - if( i_required_spu_es > i_spu_es ) + p_pgrm_data->i_pmt_version = p_psi->i_version_number; + + /* if no program is selected :*/ + if( !p_input->stream.p_selected_program ) { - intf_WarnMsg( 2, "input: non-existing subtitles ES required" ); + pgrm_descriptor_t * p_pgrm_to_select; + u16 i_id = (u16)config_GetIntVariable( "input_program" ); + + if( i_id != 0 ) /* if user specified a program */ + { + p_pgrm_to_select = input_FindProgram( p_input, i_id ); + + if( p_pgrm_to_select || p_pgrm_to_select == p_es->p_pgrm ) + p_input->pf_set_program( p_input, p_pgrm_to_select ); + } + else + p_input->pf_set_program( p_input, p_es->p_pgrm ); } - p_pgrm_data->i_pmt_version = p_psi->i_version_number; - /* inform interface that stream has changed */ p_input->stream.b_changed = 1; /* Remove lock */ -- 2.25.4