X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fts.c;h=7745445179a973b776abd2e9b5b942617e9b6b2e;hb=15643af12d9eb61eff8a8e89d8170f3d2b73d7e1;hp=ccba3df967b5ebba26bc2d537b7d167b1a88d5ee;hpb=ab6f094f506bedfc356190dd9afa8d6af971bdd6;p=vlc diff --git a/modules/demux/ts.c b/modules/demux/ts.c index ccba3df967..7745445179 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -77,7 +78,19 @@ # 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 +#else +# include +#endif + #undef TS_DEBUG /***************************************************************************** @@ -150,17 +163,17 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_DEMUX ) add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, true ) - add_bool( "ts-es-id-pid", 1, NULL, PID_TEXT, PID_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, 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", 0, NULL, SILENT_TEXT, SILENT_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", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, false ) + add_bool( "ts-dump-append", false, NULL, APPEND_TEXT, APPEND_LONGTEXT, false ) add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT, DUMPSIZE_LONGTEXT, true ) @@ -357,6 +370,7 @@ struct demux_sys_t /* */ bool b_dvb_meta; + int64_t i_tdt_delta; int64_t i_dvb_start; int64_t i_dvb_length; @@ -374,6 +388,8 @@ struct demux_sys_t bool b_start_record; }; +static int i_broken_epg; + static int Demux ( demux_t *p_demux ); static int DemuxFile( demux_t *p_demux ); static int Control( demux_t *p_demux, int i_query, va_list args ); @@ -500,6 +516,10 @@ static int Open( vlc_object_t *p_this ) char *psz_event_text = malloc(130); char *psz_ext_text = malloc(1025); + assert( psz_name ); + assert( psz_event_text ); + assert( psz_ext_text ); + // 2 bytes version Uimsbf (4,5) // 2 bytes reserved (6,7) // 2 bytes duration in minutes Uimsbf (8,9( @@ -604,6 +624,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_ts_read = 1500 / p_sys->i_packet_size; } p_sys->buffer = malloc( p_sys->i_packet_size * p_sys->i_ts_read ); + assert( p_sys->buffer ); msg_Info( p_demux, "%s raw stream to file `%s' reading packets %d", b_append ? "appending" : "dumping", p_sys->psz_file, p_sys->i_ts_read ); @@ -621,6 +642,7 @@ 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->i_tdt_delta = 0; p_sys->i_dvb_start = 0; p_sys->i_dvb_length = 0; @@ -660,10 +682,21 @@ static int Open( vlc_object_t *p_this ) eit->psi->handle = dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, p_demux ); +#ifdef TS_USE_TDT + ts_pid_t *tdt = &p_sys->pid[0x14]; + PIDInit( tdt, true, NULL ); + tdt->psi->handle = + dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, + p_demux ); +#endif if( p_sys->b_access_control ) { if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, 0x11, true ) || +#ifdef TS_USE_TDT + stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, 0x14, true ) || +#endif stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, 0x12, true ) ) p_sys->b_access_control = false; @@ -796,9 +829,9 @@ static void Close( vlc_object_t *p_this ) free( pid->psi ); break; default: - if( p_sys->b_dvb_meta && ( pid->i_pid == 0x11 || pid->i_pid == 0x12 ) ) + if( p_sys->b_dvb_meta && ( pid->i_pid == 0x11 || pid->i_pid == 0x12 || pid->i_pid == 0x14 ) ) { - /* SDT or EIT */ + /* SDT or EIT or TDT */ dvbpsi_DetachDemux( pid->psi->handle ); free( pid->psi ); } @@ -1079,7 +1112,7 @@ static int Demux( demux_t *p_demux ) { if( p_pid->psi ) { - if( p_pid->i_pid == 0 || ( p_sys->b_dvb_meta && ( p_pid->i_pid == 0x11 || p_pid->i_pid == 0x12 ) ) ) + if( p_pid->i_pid == 0 || ( p_sys->b_dvb_meta && ( p_pid->i_pid == 0x11 || p_pid->i_pid == 0x12 || p_pid->i_pid == 0x14 ) ) ) { dvbpsi_PushPacket( p_pid->psi->handle, p_pkt->p_buffer ); } @@ -1140,16 +1173,20 @@ static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_ if( pi_time ) *pi_time = 0; - if( p_sys->b_access_control && p_sys->i_dvb_length > 0 ) + if( p_sys->i_dvb_length > 0 ) { - /* FIXME we should not use time() but read the date from the tdt */ - const time_t t = time( NULL ); +#ifdef TS_USE_TDT + const int64_t t = mdate() + p_sys->i_tdt_delta; +#else + const int64_t t = CLOCK_FREQ * time ( NULL ); +#endif + if( p_sys->i_dvb_start <= t && t < p_sys->i_dvb_start + p_sys->i_dvb_length ) { if( pi_length ) - *pi_length = p_sys->i_dvb_length * INT64_C(1000000); + *pi_length = p_sys->i_dvb_length; if( pi_time ) - *pi_time = (t - p_sys->i_dvb_start) * INT64_C(1000000); + *pi_time = t - p_sys->i_dvb_start; return VLC_SUCCESS; } } @@ -1175,7 +1212,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) i64 = stream_Size( p_demux->s ); if( i64 > 0 ) { - *pf = (double)stream_Tell( p_demux->s ) / (double)i64; + double f_current = stream_Tell( p_demux->s ); + *pf = f_current / (double)i64; } else { @@ -1617,8 +1655,8 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) { block_t *p_pes = pid->es->p_pes; uint8_t header[34]; - int i_pes_size = 0; - int i_skip = 0; + unsigned i_pes_size = 0; + unsigned i_skip = 0; mtime_t i_dts = -1; mtime_t i_pts = -1; mtime_t i_length = 0; @@ -1630,8 +1668,8 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) pid->es->pp_last = &pid->es->p_pes; /* FIXME find real max size */ - const int i_max = block_ChainExtract( p_pes, header, 34 ); - + /* 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 ) @@ -1748,16 +1786,12 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) { /* display length */ if( p_pes->i_buffer + 2 <= i_skip ) - { i_length = GetWBE( &p_pes->p_buffer[i_skip] ); - } i_skip += 2; } if( p_pes->i_buffer + 2 <= i_skip ) - { i_pes_size = GetWBE( &p_pes->p_buffer[i_skip] ); - } /* */ i_skip += 2; } @@ -2081,6 +2115,9 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) case 0x85: /* DTS (audio) */ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_DTS ); break; + case 0x87: /* E-AC3 */ + es_format_Init( fmt, AUDIO_ES, VLC_CODEC_EAC3 ); + break; case 0x91: /* A52 vls (audio) */ es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', 'b' ) ); @@ -2546,16 +2583,17 @@ static void ValidateDVBMeta( demux_t *p_demux, int i_pid ) { demux_sys_t *p_sys = p_demux->p_sys; - if( !p_sys->b_dvb_meta || ( i_pid != 0x11 && i_pid != 0x12 ) ) + if( !p_sys->b_dvb_meta || ( i_pid != 0x11 && i_pid != 0x12 && i_pid != 0x14 ) ) return; msg_Warn( p_demux, "Switching to non DVB mode" ); /* This doesn't look like a DVB stream so don't try - * parsing the SDT/EDT */ + * parsing the SDT/EDT/TDT */ - for( int i = 0x11; i <= 0x12; i++ ) + for( int i = 0x11; i <= 0x14; i++ ) { + if( i == 0x13 ) continue; ts_pid_t *p_pid = &p_sys->pid[i]; if( p_pid->psi ) { @@ -2574,6 +2612,155 @@ static void ValidateDVBMeta( demux_t *p_demux, int i_pid ) #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 ) +{ + 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 ( i_broken_epg == 1 ) + { + 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; +} + static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) { demux_sys_t *p_sys = p_demux->p_sys; @@ -2595,6 +2782,8 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) p_sdt->i_ts_id, p_sdt->i_version, p_sdt->b_current_next, p_sdt->i_network_id ); + i_broken_epg = 0; + for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next ) { vlc_meta_t *p_meta; @@ -2637,14 +2826,24 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) "DVB MHP service" }; dvbpsi_service_dr_t *pD = dvbpsi_DecodeServiceDr( p_dr ); - char str1[257]; - char str2[257]; + char *str1 = NULL; + char *str2 = NULL; + + /* Workarounds for broadcasters with broken EPG */ + + if ( p_sdt->i_network_id == 133 ) + i_broken_epg = 1; /* SKY DE & BetaDigital use ISO8859-1 */ + + if ( (pD->i_service_provider_name_length == 4) && + !strncmp(pD->i_service_provider_name, "CSAT", 4) ) + i_broken_epg = 1; /* CanalSat FR uses ISO8859-1 */ + + /* FIXME: Digital+ ES also uses ISO8859-1 */ - memcpy( str1, pD->i_service_provider_name, - pD->i_service_provider_name_length ); - str1[pD->i_service_provider_name_length] = '\0'; - memcpy( str2, pD->i_service_name, pD->i_service_name_length ); - str2[pD->i_service_name_length] = '\0'; + str1 = EITConvertToUTF8(pD->i_service_provider_name, + pD->i_service_provider_name_length); + str2 = EITConvertToUTF8(pD->i_service_name, + pD->i_service_name_length); msg_Dbg( p_demux, " - type=%d provider=%s name=%s", pD->i_service_type, str1, str2 ); @@ -2653,6 +2852,8 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) vlc_meta_SetPublisher( p_meta, str1 ); if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 ) psz_type = ppsz_type[pD->i_service_type]; + free( str1 ); + free( str2 ); } } @@ -2742,135 +2943,20 @@ static int EITConvertDuration( uint32_t i_duration ) } #undef CVT_FROM_BCD -/* FIXME same than dvbsi_to_utf8 from dvb access */ -static char *EITConvertToUTF8( const unsigned char *psz_instring, - size_t i_length ) +#ifdef TS_USE_TDT +static void TDTCallBack( demux_t *p_demux, dvbpsi_tot_t *p_tdt ) { - 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 ) - { - psz_encoding = "ISO_8859-1"; - /* According to the specification, this should be ISO6937, - * but it seems Latin-1 is used instead. */ - 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 ); + demux_sys_t *p_sys = p_demux->p_sys; - *psz_out = '\0'; - } - return psz_outstring; + p_sys->i_tdt_delta = CLOCK_FREQ * EITConvertStartTime( p_tdt->i_utc_time ) + - mdate(); + dvbpsi_DeleteTOT(p_tdt); } +#endif -static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) + +static void EITCallBack( demux_t *p_demux, + dvbpsi_eit_t *p_eit, bool b_current_following ) { demux_sys_t *p_sys = p_demux->p_sys; dvbpsi_eit_event_t *p_evt; @@ -2938,7 +3024,9 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) { msg_Dbg( p_demux, " - text='%s'", psz_text ); - psz_extra = realloc( psz_extra, strlen(psz_extra) + strlen(psz_text) + 1 ); + psz_extra = realloc_or_free( psz_extra, + strlen(psz_extra) + strlen(psz_text) + 1 ); + assert( psz_extra ); strcat( psz_extra, psz_text ); free( psz_text ); } @@ -2953,13 +3041,17 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) if( psz_dsc && psz_itm ) { msg_Dbg( p_demux, " - desc='%s' item='%s'", psz_dsc, psz_itm ); - - psz_extra = realloc( psz_extra, strlen(psz_extra) + strlen(psz_dsc) + strlen(psz_itm) + 3 + 1 ); +#if 0 + psz_extra = realloc_or_free( psz_extra, + strlen(psz_extra) + strlen(psz_dsc) + + strlen(psz_itm) + 3 + 1 ); + assert( psz_extra ); strcat( psz_extra, "(" ); strcat( psz_extra, psz_dsc ); strcat( psz_extra, " " ); strcat( psz_extra, psz_itm ); strcat( psz_extra, ")" ); +#endif } free( psz_dsc ); free( psz_itm ); @@ -2974,7 +3066,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) /* */ if( i_start > 0 ) - vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text, psz_extra ); + vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text, + *psz_extra ? psz_extra : NULL ); /* Update "now playing" field */ if( p_evt->i_running_status == 0x04 && i_start > 0 ) @@ -2987,15 +3080,17 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) } if( p_epg->i_event > 0 ) { - if( p_eit->i_service_id == p_sys->i_current_program ) + if( b_current_following && + ( p_sys->i_current_program == -1 || + p_sys->i_current_program == p_eit->i_service_id ) ) { p_sys->i_dvb_length = 0; p_sys->i_dvb_start = 0; if( p_epg->p_current ) { - p_sys->i_dvb_start = p_epg->p_current->i_start; - p_sys->i_dvb_length = p_epg->p_current->i_duration; + p_sys->i_dvb_start = CLOCK_FREQ * p_epg->p_current->i_start; + p_sys->i_dvb_length = CLOCK_FREQ * p_epg->p_current->i_duration; } } es_out_Control( p_demux->out, ES_OUT_SET_GROUP_EPG, p_eit->i_service_id, p_epg ); @@ -3004,6 +3099,14 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) dvbpsi_DeleteEIT( p_eit ); } +static void EITCallBackCurrentFollowing( demux_t *p_demux, dvbpsi_eit_t *p_eit ) +{ + EITCallBack( p_demux, p_eit, true ); +} +static void EITCallBackSchedule( demux_t *p_demux, dvbpsi_eit_t *p_eit ) +{ + EITCallBack( p_demux, p_eit, false ); +} static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h, uint8_t i_table_id, uint16_t i_extension ) @@ -3027,9 +3130,22 @@ static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h, msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", i_table_id, i_table_id, i_extension, i_extension ); - dvbpsi_AttachEIT( h, i_table_id, i_extension, - (dvbpsi_eit_callback)EITCallBack, p_demux ); + dvbpsi_eit_callback cb = i_table_id == 0x4e ? + (dvbpsi_eit_callback)EITCallBackCurrentFollowing : + (dvbpsi_eit_callback)EITCallBackSchedule; + dvbpsi_AttachEIT( h, i_table_id, i_extension, cb, p_demux ); + } +#ifdef TS_USE_TDT + else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 && + i_table_id == 0x70 ) /* TDT */ + { + msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", + i_table_id, i_table_id, i_extension, i_extension ); + dvbpsi_AttachTOT( h, i_table_id, i_extension, + (dvbpsi_tot_callback)TDTCallBack, p_demux); } +#endif + } #endif @@ -3190,12 +3306,12 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, es_format_t *p_fmt = &pid->es->fmt; ts_teletext_page_t p_page[2 * 64 + 20]; - int i_page = 0; + unsigned i_page = 0; /* Gather pages informations */ #if defined _DVBPSI_DR_56_H_ && \ defined DVBPSI_VERSION && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5) - for( int i_tag_idx = 0; i_tag_idx < 2; i_tag_idx++ ) + for( unsigned i_tag_idx = 0; i_tag_idx < 2; i_tag_idx++ ) { dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, i_tag_idx == 0 ? 0x46 : 0x56 ); if( !p_dr ) @@ -3209,7 +3325,7 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, { const dvbpsi_teletextpage_t *p_src = &p_sub->p_pages[i]; - if( p_src->i_teletext_type < 0 || p_src->i_teletext_type >= 0x06 ) + if( p_src->i_teletext_type >= 0x06 ) continue; assert( i_page < sizeof(p_page)/sizeof(*p_page) ); @@ -3287,7 +3403,7 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, } else { - for( int i = 0; i < i_page; i++ ) + for( unsigned i = 0; i < i_page; i++ ) { ts_es_t *p_es; @@ -3348,8 +3464,8 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ ) { const int i_type = p_sub->p_subtitle[i].i_subtitling_type; - if( ( i_type >= 0x10 && i_type <= 0x13 ) || - ( i_type >= 0x20 && i_type <= 0x23 ) ) + if( ( i_type >= 0x10 && i_type <= 0x14 ) || + ( i_type >= 0x20 && i_type <= 0x24 ) ) i_page++; } #endif @@ -3415,12 +3531,14 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, case 0x11: /* 4:3 */ case 0x12: /* 16:9 */ case 0x13: /* 2.21:1 */ + case 0x14: /* HD monitor */ p_es->fmt.psz_description = strdup( _("DVB subtitles") ); break; case 0x20: /* Hearing impaired unspec. */ case 0x21: /* h.i. 4:3 */ case 0x22: /* h.i. 16:9 */ case 0x23: /* h.i. 2.21:1 */ + case 0x24: /* h.i. HD monitor */ p_es->fmt.psz_description = strdup( _("DVB subtitles: hearing impaired") ); break; default: @@ -3492,14 +3610,17 @@ static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid, case 0x11: /* ... on 4:3 AR monitor */ case 0x12: /* ... on 16:9 AR monitor */ case 0x13: /* ... on 2.21:1 AR monitor */ + case 0x14: /* ... for display on a high definition monitor */ case 0x20: /* DVB Subtitle (impaired) with no monitor AR critical */ case 0x21: /* ... on 4:3 AR monitor */ case 0x22: /* ... on 16:9 AR monitor */ case 0x23: /* ... on 2.21:1 AR monitor */ + case 0x24: /* ... for display on a high definition monitor */ PMTSetupEsDvbSubtitle( p_demux, pid, p_es ); break; default: - msg_Err( p_demux, "Unrecognized DVB subtitle type" ); + msg_Err( p_demux, "Unrecognized DVB subtitle type (0x%x)", + p_sub->p_subtitle[i].i_subtitling_type ); break; } } @@ -3608,6 +3729,7 @@ static void PMTSetupEs0xA0( demux_t *p_demux, ts_pid_t *pid, static void PMTSetupEsHDMV( demux_t *p_demux, ts_pid_t *pid, const dvbpsi_pmt_es_t *p_es ) { + VLC_UNUSED(p_demux); es_format_t *p_fmt = &pid->es->fmt; /* Blu-Ray mapping */ @@ -3631,12 +3753,14 @@ static void PMTSetupEsHDMV( demux_t *p_demux, ts_pid_t *pid, break; case 0x84: /* E-AC3 */ - case 0x87: /* E-AC3 */ case 0xA1: /* Secondary E-AC3 */ p_fmt->i_cat = AUDIO_ES; p_fmt->i_codec = VLC_CODEC_EAC3; break; case 0x90: /* Presentation graphics */ + p_fmt->i_cat = SPU_ES; + p_fmt->i_codec = VLC_CODEC_BD_PG; + break; case 0x91: /* Interactive graphics */ case 0x92: /* Subtitle */ default: @@ -3849,21 +3973,18 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) } else if( p_dr->i_tag == 0x05 ) { - if( p_dr->i_tag == 0x05 ) + /* Registration Descriptor */ + if( p_dr->i_length != 4 ) { - /* Registration Descriptor */ - if( p_dr->i_length != 4 ) - { - msg_Warn( p_demux, "invalid Registration Descriptor" ); - } - else + msg_Warn( p_demux, "invalid Registration Descriptor" ); + } + else + { + msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data ); + if( !memcmp( p_dr->p_data, "HDMV", 4 ) ) { - msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data ); - if( !memcmp( p_dr->p_data, "HDMV", 4 ) ) - { - /* Blu-Ray */ - b_hdmv = true; - } + /* Blu-Ray */ + b_hdmv = true; } } } @@ -4023,16 +4144,11 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) } } - if( ProgramIsSelected( p_demux, prg->i_number ) ) - { - /* Set CAM descrambling */ - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_CA, p_pmt ); - } - else - { + /* Set CAM descrambling */ + if( !ProgramIsSelected( p_demux, prg->i_number ) + || stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_CA, p_pmt ) != VLC_SUCCESS ) dvbpsi_DeletePMT( p_pmt ); - } for( int i = 0; i < i_clean; i++ ) {