X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fts.c;h=4c209f2caf9f3994040ae2658e1c092080bb0bee;hb=75e52d8c5136f06632f8006fc339ed918277dbe9;hp=99899a6c2b79d22044170f8c8ce5958c3b4656b6;hpb=a7c0e2a065b845e9bdd7f00bb7bd8e86a93b5dbe;p=vlc diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 99899a6c2b..4c209f2caf 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -48,44 +48,22 @@ #include "../mux/mpeg/csa.h" /* Include dvbpsi headers */ -#ifdef HAVE_DVBPSI_DR_H -# include -# include -# include -# include -# include -# include -# include -# include -#else -# include "dvbpsi.h" -# include "demux.h" -# include "descriptor.h" -# include "tables/pat.h" -# include "tables/pmt.h" -# include "tables/sdt.h" -# include "descriptors/dr.h" -# include "psi.h" -#endif +# include +# include +# include +# include +# include +# include +# include +# include /* EIT support */ -#ifdef _DVBPSI_DR_4D_H_ -# define TS_USE_DVB_SI 1 -# ifdef HAVE_DVBPSI_DR_H -# include -# else -# include "tables/eit.h" -# endif -#endif +# include /* TDT support */ #ifdef _DVBPSI_DR_58_H_ # define TS_USE_TDT 1 -# ifdef HAVE_DVBPSI_DR_H -# include -# else -# include "tables/tot.h" -# endif +# include #else # include #endif @@ -152,12 +130,12 @@ static void Close ( vlc_object_t * ); #define DUMPSIZE_TEXT N_("Dump buffer size") #define DUMPSIZE_LONGTEXT N_( \ - "Tweak the buffer size for reading and writing an integer number of packets." \ + "Tweak the buffer size for reading and writing an integer number of packets. " \ "Specify the size of the buffer here and not the number of packets." ) #define SPLIT_ES_TEXT N_("Separate sub-streams") #define SPLIT_ES_LONGTEXT N_( \ - "Separate teletex/dvbs pages into independant ES. " \ + "Separate teletex/dvbs pages into independent ES. " \ "It can be useful to turn off this option when using stream output." ) vlc_module_begin () @@ -166,21 +144,21 @@ vlc_module_begin () set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_DEMUX ) - add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, true ) - add_bool( "ts-es-id-pid", true, NULL, PID_TEXT, PID_LONGTEXT, true ) - add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true ) - add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT, + add_string( "ts-extra-pmt", NULL, PMT_TEXT, PMT_LONGTEXT, true ) + add_bool( "ts-es-id-pid", true, PID_TEXT, PID_LONGTEXT, true ) + add_string( "ts-out", NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true ) + add_integer( "ts-out-mtu", 1400, MTUOUT_TEXT, MTUOUT_LONGTEXT, true ) - add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ) - add_string( "ts-csa2-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ) - add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true ) - add_bool( "ts-silent", false, NULL, SILENT_TEXT, SILENT_LONGTEXT, true ) - - add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, false ) - add_bool( "ts-dump-append", false, NULL, APPEND_TEXT, APPEND_LONGTEXT, false ) - add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT, + add_string( "ts-csa-ck", NULL, CSA_TEXT, CSA_LONGTEXT, true ) + add_string( "ts-csa2-ck", NULL, CSA_TEXT, CSA_LONGTEXT, true ) + add_integer( "ts-csa-pkt", 188, CPKT_TEXT, CPKT_LONGTEXT, true ) + add_bool( "ts-silent", false, SILENT_TEXT, SILENT_LONGTEXT, true ) + + add_savefile( "ts-dump-file", NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, false ) + add_bool( "ts-dump-append", false, APPEND_TEXT, APPEND_LONGTEXT, false ) + add_integer( "ts-dump-size", 16384, DUMPSIZE_TEXT, DUMPSIZE_LONGTEXT, true ) - add_bool( "ts-split-es", true, NULL, SPLIT_ES_TEXT, SPLIT_ES_LONGTEXT, false ) + add_bool( "ts-split-es", true, SPLIT_ES_TEXT, SPLIT_ES_LONGTEXT, false ) set_capability( "demux", 10 ) set_callbacks( Open, Close ) @@ -359,6 +337,7 @@ struct demux_sys_t bool b_user_pmt; int i_pmt; ts_pid_t **pmt; + int i_pmt_es; /* */ bool b_es_id_pid; @@ -383,7 +362,7 @@ struct demux_sys_t /* */ int i_current_program; - vlc_list_t *p_programs_list; + vlc_list_t programs_list; /* TS dump */ char *psz_file; /* file to dump data in */ @@ -400,15 +379,13 @@ static int DemuxFile( demux_t *p_demux ); static int Control( demux_t *p_demux, int i_query, va_list args ); static void PIDInit ( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner ); -static void PIDClean( es_out_t *out, ts_pid_t *pid ); +static void PIDClean( demux_t *, ts_pid_t *pid ); static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ); static void PATCallBack( demux_t *, dvbpsi_pat_t * ); static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ); -#ifdef TS_USE_DVB_SI static void PSINewTableCallBack( demux_t *, dvbpsi_handle, uint8_t i_table_id, uint16_t i_extension ); -#endif static int ChangeKeyCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static inline int PIDGet( block_t *p ) @@ -426,6 +403,9 @@ static void IODFree( iod_descriptor_t * ); #define TS_USER_PMT_NUMBER (0) static int UserPmt( demux_t *p_demux, const char * ); +static int SetPIDFilter( demux_t *, int i_pid, bool b_selected ); +static void SetPrgFilter( demux_t *, int i_prg, bool b_selected ); + #define TS_PACKET_SIZE_188 188 #define TS_PACKET_SIZE_192 192 #define TS_PACKET_SIZE_204 204 @@ -642,6 +622,8 @@ static int Open( vlc_object_t *p_this ) p_sys->b_dvb_meta = true; p_sys->b_access_control = true; p_sys->i_current_program = 0; + p_sys->programs_list.i_count = 0; + p_sys->programs_list.p_values = NULL; p_sys->i_tdt_delta = 0; p_sys->i_dvb_start = 0; p_sys->i_dvb_length = 0; @@ -670,7 +652,6 @@ static int Open( vlc_object_t *p_this ) PIDInit( pat, true, NULL ); pat->psi->handle = dvbpsi_AttachPAT( (dvbpsi_pat_callback)PATCallBack, p_demux ); -#ifdef TS_USE_DVB_SI if( p_sys->b_dvb_meta ) { ts_pid_t *sdt = &p_sys->pid[0x11]; @@ -693,21 +674,18 @@ static int Open( vlc_object_t *p_this ) #endif if( p_sys->b_access_control ) { - if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x11, true ) || + if( SetPIDFilter( p_demux, 0x11, true ) || #ifdef TS_USE_TDT - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x14, true ) || + SetPIDFilter( p_demux, 0x14, true ) || #endif - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x12, true ) ) + SetPIDFilter( p_demux, 0x12, true ) ) p_sys->b_access_control = false; } } -#endif /* Init PMT array */ TAB_INIT( p_sys->i_pmt, p_sys->pmt ); + p_sys->i_pmt_es = 0; /* Read config */ p_sys->b_es_id_pid = var_CreateGetBool( p_demux, "ts-es-id-pid" ); @@ -804,6 +782,14 @@ static int Open( vlc_object_t *p_this ) p_sys->b_silent = var_CreateGetBool( p_demux, "ts-silent" ); p_sys->b_split_es = var_InheritBool( p_demux, "ts-split-es" ); + while( !p_sys->b_file_out && p_sys->i_pmt_es <= 0 && + vlc_object_alive( p_demux ) ) + { + if( p_demux->pf_demux( p_demux ) != 1 ) + break; + } + + return VLC_SUCCESS; } @@ -840,14 +826,14 @@ static void Close( vlc_object_t *p_this ) } else { - PIDClean( p_demux->out, pid ); + PIDClean( p_demux, pid ); } break; } } else if( pid->b_valid && pid->es ) { - PIDClean( p_demux->out, pid ); + PIDClean( p_demux, pid ); } if( pid->b_seen ) @@ -855,13 +841,9 @@ static void Close( vlc_object_t *p_this ) msg_Dbg( p_demux, " - pid[%d] seen", pid->i_pid ); } - if( p_sys->b_access_control && pid->i_pid > 0 ) - { - /* too much */ - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid, - false ); - } + /* too much */ + if( pid->i_pid > 0 ) + SetPIDFilter( p_demux, pid->i_pid, false ); } vlc_mutex_lock( &p_sys->csa_lock ); @@ -875,12 +857,7 @@ static void Close( vlc_object_t *p_this ) TAB_CLEAN( p_sys->i_pmt, p_sys->pmt ); - if( p_sys->p_programs_list ) - { - vlc_value_t val; - val.p_list = p_sys->p_programs_list; - var_FreeList( &val, NULL ); - } + free( p_sys->programs_list.p_values ); /* If in dump mode, then close the file */ if( p_sys->b_file_out ) @@ -1036,6 +1013,7 @@ static int DemuxFile( demux_t *p_demux ) static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; + bool b_wait_es = p_sys->i_pmt_es <= 0; /* We read at most 100 TS packet or until a frame is completed */ for( int i_pkt = 0; i_pkt < p_sys->i_ts_read; i_pkt++ ) @@ -1151,7 +1129,7 @@ static int Demux( demux_t *p_demux ) } p_pid->b_seen = true; - if( b_frame ) + if( b_frame || ( b_wait_es && p_sys->i_pmt_es > 0 ) ) break; } @@ -1272,125 +1250,53 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) #endif case DEMUX_SET_GROUP: { - uint16_t i_vpid = 0, i_apid1 = 0, i_apid2 = 0, i_apid3 = 0; - ts_prg_psi_t *p_prg = NULL; vlc_list_t *p_list; i_int = (int)va_arg( args, int ); p_list = (vlc_list_t *)va_arg( args, vlc_list_t * ); msg_Dbg( p_demux, "DEMUX_SET_GROUP %d %p", i_int, p_list ); - if( p_sys->b_access_control && i_int > 0 && i_int != p_sys->i_current_program ) - { - int i_pmt_pid = -1; - - /* Search pmt to be unselected */ - for( int i = 0; i < p_sys->i_pmt; i++ ) - { - ts_pid_t *pmt = p_sys->pmt[i]; + if( i_int == 0 && p_sys->i_current_program > 0 ) + i_int = p_sys->i_current_program; - for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) - { - if( pmt->psi->prg[i_prg]->i_number == p_sys->i_current_program ) - { - i_pmt_pid = p_sys->pmt[i]->i_pid; - break; - } - } - if( i_pmt_pid > 0 ) break; - } - - if( i_pmt_pid > 0 ) - { - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid, - false ); - /* All ES */ - for( int i = 2; i < 8192; i++ ) - { - ts_pid_t *pid = &p_sys->pid[i]; - - if( !pid->b_valid || pid->psi ) - continue; - - for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ ) - { - if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id ) - { - /* We only remove es that aren't defined by extra pmt */ - stream_Control( p_demux->s, - STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, - i, false ); - break; - } - } - } - } + if( p_sys->i_current_program > 0 ) + { + if( p_sys->i_current_program != i_int ) + SetPrgFilter( p_demux, p_sys->i_current_program, false ); + } + else if( p_sys->i_current_program < 0 ) + { + for( int i = 0; i < p_sys->programs_list.i_count; i++ ) + SetPrgFilter( p_demux, p_sys->programs_list.p_values[i].i_int, false ); + } - /* select new program */ + if( i_int > 0 ) + { p_sys->i_current_program = i_int; - i_pmt_pid = -1; - for( int i = 0; i < p_sys->i_pmt; i++ ) + SetPrgFilter( p_demux, p_sys->i_current_program, true ); + } + else if( i_int < 0 ) + { + p_sys->i_current_program = -1; + p_sys->programs_list.i_count = 0; + if( p_list ) { - ts_pid_t *pmt = p_sys->pmt[i]; + vlc_list_t *p_dst = &p_sys->programs_list; + free( p_dst->p_values ); - for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) + p_dst->p_values = calloc( p_list->i_count, + sizeof(*p_dst->p_values) ); + if( p_dst->p_values ) { - if( pmt->psi->prg[i_prg]->i_number == i_int ) + p_dst->i_count = p_list->i_count; + for( int i = 0; i < p_list->i_count; i++ ) { - i_pmt_pid = p_sys->pmt[i]->i_pid; - p_prg = p_sys->pmt[i]->psi->prg[i_prg]; - break; - } - } - if( i_pmt_pid > 0 ) - break; - } - if( i_pmt_pid > 0 ) - { - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid, - true ); - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr, - true ); - - for( int i = 2; i < 8192; i++ ) - { - ts_pid_t *pid = &p_sys->pid[i]; - - if( !pid->b_valid || pid->psi ) - continue; - - for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ ) - { - if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id ) - { - if ( pid->es->fmt.i_cat == VIDEO_ES && !i_vpid ) - i_vpid = i; - if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid1 ) - i_apid1 = i; - else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid2 ) - i_apid2 = i; - else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid3 ) - i_apid3 = i; - - stream_Control( p_demux->s, - STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, - i, true ); - break; - } + p_dst->p_values[i] = p_list->p_values[i]; + SetPrgFilter( p_demux, p_dst->p_values[i].i_int, true ); } } } } - else - { - p_sys->i_current_program = -1; - p_sys->p_programs_list = p_list; - } return VLC_SUCCESS; } @@ -1522,6 +1428,7 @@ static int UserPmt( demux_t *p_demux, const char *psz_fmt ) (char*)&pid->es->fmt.i_codec ); pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt ); + p_sys->i_pmt_es++; } } @@ -1539,6 +1446,68 @@ error: return VLC_EGENERIC; } +static int SetPIDFilter( demux_t *p_demux, int i_pid, bool b_selected ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + if( !p_sys->b_access_control ) + return VLC_EGENERIC; + + return stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, i_pid, b_selected ); +} + +static void SetPrgFilter( demux_t *p_demux, int i_prg_id, bool b_selected ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + ts_prg_psi_t *p_prg = NULL; + int i_pmt_pid = -1; + + /* Search pmt to be unselected */ + for( int i = 0; i < p_sys->i_pmt; i++ ) + { + ts_pid_t *pmt = p_sys->pmt[i]; + + for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) + { + if( pmt->psi->prg[i_prg]->i_number == i_prg_id ) + { + i_pmt_pid = p_sys->pmt[i]->i_pid; + p_prg = p_sys->pmt[i]->psi->prg[i_prg]; + break; + } + } + if( i_pmt_pid > 0 ) + break; + } + if( i_pmt_pid <= 0 ) + return; + assert( p_prg ); + + SetPIDFilter( p_demux, i_pmt_pid, b_selected ); + if( p_prg->i_pid_pcr > 0 ) + SetPIDFilter( p_demux, p_prg->i_pid_pcr, b_selected ); + + /* All ES */ + for( int i = 2; i < 8192; i++ ) + { + ts_pid_t *pid = &p_sys->pid[i]; + + if( !pid->b_valid || pid->psi ) + continue; + + for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ ) + { + if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id ) + { + /* We only remove/select es that aren't defined by extra pmt */ + SetPIDFilter( p_demux, i, b_selected ); + break; + } + } + } +} + static void PIDInit( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner ) { bool b_old_valid = pid->b_valid; @@ -1558,11 +1527,8 @@ static void PIDInit( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner ) if( !b_old_valid ) { pid->psi = xmalloc( sizeof( ts_psi_t ) ); - if( pid->psi ) - { - pid->psi->handle = NULL; - TAB_INIT( pid->psi->i_prg, pid->psi->prg ); - } + pid->psi->handle = NULL; + TAB_INIT( pid->psi->i_prg, pid->psi->prg ); } assert( pid->psi ); @@ -1603,8 +1569,11 @@ static void PIDInit( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner ) } } -static void PIDClean( es_out_t *out, ts_pid_t *pid ) +static void PIDClean( demux_t *p_demux, ts_pid_t *pid ) { + demux_sys_t *p_sys = p_demux->p_sys; + es_out_t *out = p_demux->out; + if( pid->psi ) { if( pid->psi->handle ) @@ -1623,7 +1592,10 @@ static void PIDClean( es_out_t *out, ts_pid_t *pid ) else { if( pid->es->id ) + { es_out_Del( out, pid->es->id ); + p_sys->i_pmt_es--; + } if( pid->es->p_pes ) block_ChainRelease( pid->es->p_pes ); @@ -1635,7 +1607,10 @@ static void PIDClean( es_out_t *out, ts_pid_t *pid ) for( int i = 0; i < pid->i_extra_es; i++ ) { if( pid->extra_es[i]->id ) + { es_out_Del( out, pid->extra_es[i]->id ); + p_sys->i_pmt_es--; + } if( pid->extra_es[i]->p_pes ) block_ChainRelease( pid->extra_es[i]->p_pes ); @@ -1672,11 +1647,11 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) /* FIXME find real max size */ /* const int i_max = */ block_ChainExtract( p_pes, header, 34 ); - + if( header[0] != 0 || header[1] != 0 || header[2] != 1 ) { if( !p_demux->p_sys->b_silent ) - msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x] (pid: %d)", + msg_Warn( p_demux, "invalid header [0x%02x:%02x:%02x:%02x] (pid: %d)", header[0], header[1],header[2],header[3], pid->i_pid ); block_ChainRelease( p_pes ); return; @@ -1869,6 +1844,9 @@ static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) demux_sys_t *p_sys = p_demux->p_sys; const uint8_t *p = p_bk->p_buffer; + if( p_sys->i_pmt_es <= 0 ) + return; + if( ( p[3]&0x20 ) && /* adaptation */ ( p[5]&0x10 ) && ( p[4] >= 7 ) ) @@ -2561,19 +2539,17 @@ static bool ProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm ) { demux_sys_t *p_sys = p_demux->p_sys; - if( !p_sys->b_access_control ) - return false; - if( ( p_sys->i_current_program == -1 && p_sys->p_programs_list == NULL ) || + if( ( p_sys->i_current_program == -1 && p_sys->programs_list.i_count == 0 ) || p_sys->i_current_program == 0 ) return true; if( p_sys->i_current_program == i_pgrm ) return true; - if( p_sys->p_programs_list != NULL ) + if( p_sys->programs_list.i_count != 0 ) { - for( int i = 0; i < p_sys->p_programs_list->i_count; i++ ) + for( int i = 0; i < p_sys->programs_list.i_count; i++ ) { - if( i_pgrm == p_sys->p_programs_list->p_values[i].i_int ) + if( i_pgrm == p_sys->programs_list.p_values[i].i_int ) return true; } } @@ -2603,160 +2579,20 @@ static void ValidateDVBMeta( demux_t *p_demux, int i_pid ) p_pid->psi = NULL; p_pid->b_valid = false; } - if( p_sys->b_access_control ) - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, i, false ); - + SetPIDFilter( p_demux, i, false ); } p_sys->b_dvb_meta = false; } +#include "dvb-text.h" -#ifdef TS_USE_DVB_SI -/* FIXME same than dvbsi_to_utf8 from dvb access */ static char *EITConvertToUTF8( const unsigned char *psz_instring, size_t i_length, bool b_broken ) { - const char *psz_encoding; - char *psz_outstring; - char psz_encbuf[sizeof( "ISO_8859-123" )]; - size_t i_in, i_out, offset = 1; - vlc_iconv_t iconv_handle; - - if( i_length < 1 ) return NULL; - if( psz_instring[0] >= 0x20 ) - { - /* According to ETSI EN 300 468 Annex A, this should be ISO6937, - * but some broadcasters use different charset... */ - if( b_broken ) - psz_encoding = "ISO_8859-1"; - else - psz_encoding = "ISO_6937"; - - offset = 0; - } - else switch( psz_instring[0] ) - { - case 0x01: - psz_encoding = "ISO_8859-5"; - break; - case 0x02: - psz_encoding = "ISO_8859-6"; - break; - case 0x03: - psz_encoding = "ISO_8859-7"; - break; - case 0x04: - psz_encoding = "ISO_8859-8"; - break; - case 0x05: - psz_encoding = "ISO_8859-9"; - break; - case 0x06: - psz_encoding = "ISO_8859-10"; - break; - case 0x07: - psz_encoding = "ISO_8859-11"; - break; - case 0x08: - psz_encoding = "ISO_8859-12"; - break; - case 0x09: - psz_encoding = "ISO_8859-13"; - break; - case 0x0a: - psz_encoding = "ISO_8859-14"; - break; - case 0x0b: - psz_encoding = "ISO_8859-15"; - break; - case 0x10: -#warning Is Latin-10 (psz_instring[2] == 16) really illegal? - if( i_length < 3 || psz_instring[1] != 0x00 || psz_instring[2] > 15 - || psz_instring[2] == 0 ) - { - psz_encoding = "UTF-8"; - offset = 0; - } - else - { - sprintf( psz_encbuf, "ISO_8859-%u", psz_instring[2] ); - psz_encoding = psz_encbuf; - offset = 3; - } - break; - case 0x11: -#warning Is there a BOM or do we use a fixed endianess? - psz_encoding = "UTF-16"; - break; - case 0x12: - psz_encoding = "KSC5601-1987"; - break; - case 0x13: - psz_encoding = "GB2312"; /* GB-2312-1980 */ - break; - case 0x14: - psz_encoding = "BIG-5"; - break; - case 0x15: - psz_encoding = "UTF-8"; - break; - default: - /* invalid */ - psz_encoding = "UTF-8"; - offset = 0; - } - - i_in = i_length - offset; - i_out = i_in * 6 + 1; - - psz_outstring = malloc( i_out ); - if( !psz_outstring ) - { - return NULL; - } - - iconv_handle = vlc_iconv_open( "UTF-8", psz_encoding ); - if( iconv_handle == (vlc_iconv_t)(-1) ) - { - /* Invalid character set (e.g. ISO_8859-12) */ - memcpy( psz_outstring, &psz_instring[offset], i_in ); - psz_outstring[i_in] = '\0'; - EnsureUTF8( psz_outstring ); - } - else - { - const char *psz_in = (const char *)&psz_instring[offset]; - char *psz_out = psz_outstring; - - while( vlc_iconv( iconv_handle, &psz_in, &i_in, - &psz_out, &i_out ) == (size_t)(-1) ) - { - /* skip naughty byte. This may fail terribly for multibyte stuff, - * but what can we do anyway? */ - psz_in++; - i_in--; - vlc_iconv( iconv_handle, NULL, NULL, NULL, NULL ); /* reset */ - } - vlc_iconv_close( iconv_handle ); - - *psz_out = '\0'; - - /* Convert EIT-coded CR/LFs */ - unsigned char *pbuf = (unsigned char *)psz_outstring; - for( ; pbuf < (unsigned char *)psz_out ; pbuf++) - { - if( pbuf[0] == 0xc2 && pbuf[1] == 0x8a ) - { - pbuf[0] = ' '; - pbuf[1] = '\n'; - } - } - - - } - return psz_outstring; + if( b_broken ) + return FromCharset( "ISO_8859-1", psz_instring, i_length ); + return vlc_from_EIT( psz_instring, i_length ); } static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) @@ -2796,9 +2632,6 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) p_srv->b_eit_present, p_srv->i_running_status, p_srv->b_free_ca ); - if( p_sys->i_current_program != -1 && p_sys->i_current_program != p_srv->i_service_id ) - continue; - p_meta = vlc_meta_New(); for( p_dr = p_srv->p_first_descriptor; p_dr; p_dr = p_dr->p_next ) { @@ -2844,7 +2677,7 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) { const size_t i_length = strlen(ppsz_broken_providers[i]); if( pD->i_service_provider_name_length == i_length && - !strncmp( pD->i_service_provider_name, ppsz_broken_providers[i], i_length ) ) + !strncmp( (char *)pD->i_service_provider_name, ppsz_broken_providers[i], i_length ) ) p_sys->b_broken_charset = true; } @@ -2975,7 +2808,7 @@ static void EITCallBack( demux_t *p_demux, vlc_epg_t *p_epg; msg_Dbg( p_demux, "EITCallBack called" ); - if( !p_eit->b_current_next || ( p_sys->i_current_program != -1 && p_sys->i_current_program != p_eit->i_service_id ) ) + if( !p_eit->b_current_next ) { dvbpsi_DeleteEIT( p_eit ); return; @@ -3164,7 +2997,6 @@ static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h, #endif } -#endif /***************************************************************************** * PMT callback and helpers @@ -3325,7 +3157,7 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, ts_teletext_page_t p_page[2 * 64 + 20]; unsigned i_page = 0; - /* Gather pages informations */ + /* Gather pages information */ #if defined _DVBPSI_DR_56_H_ && \ defined DVBPSI_VERSION && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5) for( unsigned i_tag_idx = 0; i_tag_idx < 2; i_tag_idx++ ) @@ -3540,7 +3372,7 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, /* */ const dvbpsi_subtitle_t *p = &p_sub->p_subtitle[i]; - p_es->fmt.psz_language = strndup( p->i_iso6392_language_code, 3 ); + p_es->fmt.psz_language = strndup( (char *)p->i_iso6392_language_code, 3 ); switch( p->i_subtitling_type ) { case 0x10: /* unspec. */ @@ -3843,6 +3675,7 @@ static void PMTParseEsIso639( demux_t *p_demux, ts_pid_t *pid, switch( p_decoded->code[0].i_audio_type ) { case 0: + pid->es->fmt.i_priority = 1; // prioritize normal audio tracks pid->es->fmt.psz_description = NULL; break; case 1: @@ -3992,15 +3825,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) if( ProgramIsSelected( p_demux, prg->i_number ) ) { /* Set demux filter */ - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, prg->i_pid_pcr, - true ); - } - else if ( p_sys->b_access_control ) - { - msg_Warn( p_demux, "skipping program (not selected)" ); - dvbpsi_DeletePMT(p_pmt); - return; + SetPIDFilter( p_demux, prg->i_pid_pcr, true ); } /* Parse descriptor */ @@ -4156,7 +3981,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) { if( old_pid ) { - PIDClean( p_demux->out, old_pid ); + PIDClean( p_demux, old_pid ); TAB_REMOVE( i_clean, pp_clean, old_pid ); old_pid = 0; } @@ -4167,13 +3992,14 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) pid->extra_es[i]->id = es_out_Add( p_demux->out, &pid->extra_es[i]->fmt ); } + p_sys->i_pmt_es += 1 + pid->i_extra_es; } } /* Add ES to the list */ if( old_pid ) { - PIDClean( p_demux->out, old_pid ); + PIDClean( p_demux, old_pid ); TAB_REMOVE( i_clean, pp_clean, old_pid ); } p_sys->pid[p_es->i_pid] = *pid; @@ -4190,9 +4016,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ( pid->es->id != NULL || p_sys->b_udp_out ) ) { /* Set demux filter */ - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, p_es->i_pid, - true ); + SetPIDFilter( p_demux, p_es->i_pid, true ); } } @@ -4206,12 +4030,10 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) { if( ProgramIsSelected( p_demux, prg->i_number ) ) { - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, pp_clean[i]->i_pid, - false ); + SetPIDFilter( p_demux, pp_clean[i]->i_pid, false ); } - PIDClean( p_demux->out, pp_clean[i] ); + PIDClean( p_demux, pp_clean[i] ); } if( i_clean ) free( pp_clean ); @@ -4290,15 +4112,10 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) if( pid->p_owner->prg[i_prg]->i_pid_pmt != pmt_rm[j]->i_pid ) continue; - if( p_sys->b_access_control && pid->es->id ) - { - if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, i, - false ) ) - p_sys->b_access_control = false; - } + if( pid->es->id ) + SetPIDFilter( p_demux, i, false ); - PIDClean( p_demux->out, pid ); + PIDClean( p_demux, pid ); break; } } @@ -4307,13 +4124,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) /* Delete PMT pid */ for( int i = 0; i < i_pmt_rm; i++ ) { - if( p_sys->b_access_control ) - { - if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, - pmt_rm[i]->i_pid, false ) ) - p_sys->b_access_control = false; - } + SetPIDFilter( p_demux, pmt_rm[i]->i_pid, false ); for( int i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ ) { @@ -4321,7 +4132,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) es_out_Control( p_demux->out, ES_OUT_DEL_GROUP, i_number ); } - PIDClean( p_demux->out, &p_sys->pid[pmt_rm[i]->i_pid] ); + PIDClean( p_demux, &p_sys->pid[pmt_rm[i]->i_pid] ); TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] ); } @@ -4371,18 +4182,13 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) p_program->i_pid; /* Now select PID at access level */ - if( p_sys->b_access_control ) + if( ProgramIsSelected( p_demux, p_program->i_number ) ) { - if( ProgramIsSelected( p_demux, p_program->i_number ) ) - { - if( p_sys->i_current_program == 0 ) - p_sys->i_current_program = p_program->i_number; + if( p_sys->i_current_program == 0 ) + p_sys->i_current_program = p_program->i_number; - if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, - p_program->i_pid, true ) ) - p_sys->b_access_control = false; - } + if( SetPIDFilter( p_demux, p_program->i_pid, true ) ) + p_sys->b_access_control = false; } } }