X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fts.c;h=49ff2eab1f5406c00efca2e133939393c853655f;hb=c389095ab7b94daaedbbb9ebd2a5295b054e201c;hp=894a56e4f29c9b0a0b8e7cf13a53d02020973089;hpb=a2bc23f8bf0c99e280c6c4f0395ccd97d7151a57;p=vlc diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 894a56e4f2..49ff2eab1f 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -33,7 +33,6 @@ #include #include -#include #include #include /* DVB-specific things */ @@ -44,6 +43,7 @@ #include #include #include +#include #include "../mux/mpeg/csa.h" @@ -77,21 +77,20 @@ # include "tables/eit.h" # endif #endif -#ifdef HAVE_TIME_H + +/* 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 - -/* TODO: - * - XXX: do not mark options message to be translated, they are too osbcure for now ... - * - test it - * - ... - */ -/***************************************************************************** - * Callback prototypes - *****************************************************************************/ -static int ChangeKeyCallback ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); +#undef TS_DEBUG /***************************************************************************** * Module descriptor @@ -156,6 +155,11 @@ static void Close ( vlc_object_t * ); "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 independent ES. " \ + "It can be useful to turn off this option when using stream output." ) + vlc_module_begin () set_description( N_("MPEG Transport Stream demuxer") ) set_shortname ( "MPEG-TS" ) @@ -163,19 +167,20 @@ 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 ); + 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 ); + DUMPSIZE_LONGTEXT, true ) + add_bool( "ts-split-es", true, NULL, SPLIT_ES_TEXT, SPLIT_ES_LONGTEXT, false ) set_capability( "demux", 10 ) set_callbacks( Open, Close ) @@ -321,6 +326,7 @@ typedef struct bool b_seen; bool b_valid; int i_cc; /* countinuity counter */ + bool b_scrambled; /* PSI owner (ie PMT -> PAT, ES -> PMT */ ts_psi_t *p_owner; @@ -353,22 +359,32 @@ struct demux_sys_t bool b_user_pmt; int i_pmt; ts_pid_t **pmt; + int i_pmt_es; /* */ bool b_es_id_pid; csa_t *csa; int i_csa_pkt_size; bool b_silent; + bool b_split_es; bool b_udp_out; int fd; /* udp socket */ uint8_t *buffer; - bool b_dvb_control; - int i_dvb_program; + /* */ + bool b_access_control; + + /* */ + bool b_dvb_meta; + int64_t i_tdt_delta; int64_t i_dvb_start; int64_t i_dvb_length; - vlc_list_t *p_programs_list; + bool b_broken_charset; /* True if broken encoding is used in EPG/SDT */ + + /* */ + int i_current_program; + vlc_list_t programs_list; /* TS dump */ char *psz_file; /* file to dump data in */ @@ -376,9 +392,6 @@ struct demux_sys_t uint64_t i_write; /* bytes written */ bool b_file_out; /* dump mode enabled */ - /* */ - bool b_meta; - /* */ bool b_start_record; }; @@ -388,7 +401,7 @@ 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 * ); @@ -397,6 +410,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ); 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 ) { @@ -413,6 +427,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 @@ -596,7 +613,7 @@ static int Open( vlc_object_t *p_this ) msg_Info( p_demux, "dumping raw stream to standard output" ); p_sys->p_file = stdout; } - else if( ( p_sys->p_file = utf8_fopen( p_sys->psz_file, psz_mode ) ) == NULL ) + else if( ( p_sys->p_file = vlc_fopen( p_sys->psz_file, psz_mode ) ) == NULL ) { msg_Err( p_demux, "cannot create `%s' for writing", p_sys->psz_file ); p_sys->b_file_out = false; @@ -611,7 +628,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 ); + p_sys->buffer = xmalloc( p_sys->i_packet_size * p_sys->i_ts_read ); 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 ); @@ -626,12 +643,17 @@ static int Open( vlc_object_t *p_this ) p_demux->pf_control = Control; /* Init p_sys field */ - p_sys->b_meta = true; - p_sys->b_dvb_control = true; - p_sys->i_dvb_program = 0; + 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; + p_sys->b_broken_charset = false; + for( i = 0; i < 8192; i++ ) { ts_pid_t *pid = &p_sys->pid[i]; @@ -655,7 +677,7 @@ static int Open( vlc_object_t *p_this ) pat->psi->handle = dvbpsi_AttachPAT( (dvbpsi_pat_callback)PATCallBack, p_demux ); #ifdef TS_USE_DVB_SI - if( p_sys->b_meta ) + if( p_sys->b_dvb_meta ) { ts_pid_t *sdt = &p_sys->pid[0x11]; ts_pid_t *eit = &p_sys->pid[0x12]; @@ -668,19 +690,28 @@ static int Open( vlc_object_t *p_this ) eit->psi->handle = dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, p_demux ); - if( p_sys->b_dvb_control ) +#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 ) || - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x12, true ) ) - p_sys->b_dvb_control = false; + if( SetPIDFilter( p_demux, 0x11, true ) || +#ifdef TS_USE_TDT + SetPIDFilter( p_demux, 0x14, true ) || +#endif + 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" ); @@ -775,6 +806,15 @@ static int Open( vlc_object_t *p_this ) free( psz_string ); 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; } @@ -787,10 +827,8 @@ static void Close( vlc_object_t *p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys = p_demux->p_sys; - int i; - msg_Dbg( p_demux, "pid list:" ); - for( i = 0; i < 8192; i++ ) + for( int i = 0; i < 8192; i++ ) { ts_pid_t *pid = &p_sys->pid[i]; @@ -798,26 +836,30 @@ static void Close( vlc_object_t *p_this ) { switch( pid->i_pid ) { - case 0: /* PAT */ - dvbpsi_DetachPAT( pid->psi->handle ); - free( pid->psi ); - break; - case 1: /* CAT */ - free( pid->psi ); - break; - case 0x11: /* SDT */ - case 0x12: /* EIT */ + case 0: /* PAT */ + dvbpsi_DetachPAT( pid->psi->handle ); + free( pid->psi ); + break; + case 1: /* CAT */ + free( pid->psi ); + break; + default: + if( p_sys->b_dvb_meta && ( pid->i_pid == 0x11 || pid->i_pid == 0x12 || pid->i_pid == 0x14 ) ) + { + /* SDT or EIT or TDT */ dvbpsi_DetachDemux( pid->psi->handle ); free( pid->psi ); - break; - default: - PIDClean( p_demux->out, pid ); - break; + } + else + { + 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 ) @@ -825,14 +867,9 @@ static void Close( vlc_object_t *p_this ) msg_Dbg( p_demux, " - pid[%d] seen", pid->i_pid ); } - if( p_sys->b_dvb_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 ); @@ -846,17 +883,12 @@ 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_Change( p_demux, "programs", VLC_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 ) { - msg_Info( p_demux ,"closing %s (%"PRId64" Kbytes dumped)", + msg_Info( p_demux ,"closing %s (%"PRId64" KiB dumped)", p_sys->psz_file, p_sys->i_write / 1024 ); if( p_sys->p_file != stdout ) @@ -905,27 +937,19 @@ static int ChangeKeyCallback( vlc_object_t *p_this, char const *psz_cmd, static int DemuxFile( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - uint8_t *p_buffer = p_sys->buffer; /* Put first on sync byte */ - int i_diff= 0; - int i_data= 0; - int i_pos = 0; - int i_bufsize = p_sys->i_packet_size * p_sys->i_ts_read; + const int i_bufsize = p_sys->i_packet_size * p_sys->i_ts_read; + uint8_t *p_buffer = p_sys->buffer; /* Put first on sync byte */ + const int i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize ); - i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize ); - if( (i_data <= 0) && (i_data < p_sys->i_packet_size) ) + if( i_data <= 0 && i_data < p_sys->i_packet_size ) { msg_Dbg( p_demux, "error reading malformed packets" ); return i_data; } /* Test continuity counter */ - while( i_pos < i_data ) + for( int i_pos = 0; i_pos < i_data; ) { - ts_pid_t *p_pid; /* point to a PID structure */ - bool b_payload; /* indicates a packet with payload */ - bool b_adaptation; /* adaptation field */ - int i_cc = 0; /* continuity counter */ - if( p_sys->buffer[i_pos] != 0x47 ) { msg_Warn( p_demux, "lost sync" ); @@ -945,12 +969,12 @@ static int DemuxFile( demux_t *p_demux ) * diff == 0 and duplicate packet (playload != 0) <- should we * test the content ? */ - i_cc = p_buffer[i_pos+3]&0x0f; - b_payload = p_buffer[i_pos+3]&0x10; - b_adaptation = p_buffer[i_pos+3]&0x20; + const int i_cc = p_buffer[i_pos+3]&0x0f; + const bool b_payload = p_buffer[i_pos+3]&0x10; + const bool b_adaptation = p_buffer[i_pos+3]&0x20; /* Get the PID */ - p_pid = &p_sys->pid[ ((p_buffer[i_pos+1]&0x1f)<<8)|p_buffer[i_pos+2] ]; + ts_pid_t *p_pid = &p_sys->pid[ ((p_buffer[i_pos+1]&0x1f)<<8)|p_buffer[i_pos+2] ]; /* Detect discontinuity indicator in adaptation field */ if( b_adaptation && p_buffer[i_pos + 4] > 0 ) @@ -961,7 +985,7 @@ static int DemuxFile( demux_t *p_demux ) msg_Warn( p_demux, "random access indicator (pid=%d) ", p_pid->i_pid ); } - i_diff = ( i_cc - p_pid->i_cc )&0x0f; + const int i_diff = ( i_cc - p_pid->i_cc )&0x0f; if( b_payload && i_diff == 1 ) { p_pid->i_cc = ( p_pid->i_cc + 1 ) & 0xf; @@ -998,17 +1022,14 @@ static int DemuxFile( demux_t *p_demux ) } /* Then write */ - i_data = fwrite( p_sys->buffer, 1, i_data, p_sys->p_file ); - if( i_data < 0 ) + const int i_write = fwrite( p_sys->buffer, 1, i_data, p_sys->p_file ); + if( i_write < 0 ) { msg_Err( p_demux, "failed to write data" ); return -1; } -#if 0 - msg_Dbg( p_demux, "dumped %d bytes", i_data ); -#endif - p_sys->i_write += i_data; + p_sys->i_write += i_write; return 1; } @@ -1018,14 +1039,13 @@ static int DemuxFile( demux_t *p_demux ) static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - int i_pkt; + bool b_wait_es = p_sys->i_pmt_es <= 0; /* We read at most 100 TS packet or until a frame is completed */ - for( i_pkt = 0; i_pkt < p_sys->i_ts_read; i_pkt++ ) + for( int i_pkt = 0; i_pkt < p_sys->i_ts_read; i_pkt++ ) { bool b_frame = false; block_t *p_pkt; - ts_pid_t *p_pid; /* Get a new TS packet */ if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) ) @@ -1093,20 +1113,19 @@ static int Demux( demux_t *p_demux ) } /* Parse the TS packet */ - p_pid = &p_sys->pid[PIDGet( p_pkt )]; + ts_pid_t *p_pid = &p_sys->pid[PIDGet( p_pkt )]; if( p_pid->b_valid ) { if( p_pid->psi ) { - if( p_pid->i_pid == 0 || 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 ); } else { - int i_prg; - for( i_prg = 0; i_prg < p_pid->psi->i_prg; i_prg++ ) + for( int i_prg = 0; i_prg < p_pid->psi->i_prg; i_prg++ ) { dvbpsi_PushPacket( p_pid->psi->prg[i_prg]->handle, p_pkt->p_buffer ); @@ -1136,10 +1155,8 @@ 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; - } } if( p_sys->b_udp_out ) @@ -1163,21 +1180,23 @@ static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_ if( pi_time ) *pi_time = 0; -#ifdef HAVE_TIME_H - if( p_sys->b_dvb_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; } } -#endif return VLC_EGENERIC; } @@ -1195,208 +1214,135 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) switch( i_query ) { - case DEMUX_GET_POSITION: - pf = (double*) va_arg( args, double* ); - i64 = stream_Size( p_demux->s ); - if( i64 > 0 ) - { - *pf = (double)stream_Tell( p_demux->s ) / (double)i64; - } + case DEMUX_GET_POSITION: + pf = (double*) va_arg( args, double* ); + i64 = stream_Size( p_demux->s ); + if( i64 > 0 ) + { + double f_current = stream_Tell( p_demux->s ); + *pf = f_current / (double)i64; + } + else + { + int64_t i_time, i_length; + if( !DVBEventInformation( p_demux, &i_time, &i_length ) && i_length > 0 ) + *pf = (double)i_time/(double)i_length; else - { - int64_t i_time, i_length; - if( !DVBEventInformation( p_demux, &i_time, &i_length ) && i_length > 0 ) - *pf = (double)i_time/(double)i_length; - else - *pf = 0.0; - } - return VLC_SUCCESS; - case DEMUX_SET_POSITION: - f = (double) va_arg( args, double ); - i64 = stream_Size( p_demux->s ); + *pf = 0.0; + } + return VLC_SUCCESS; + case DEMUX_SET_POSITION: + f = (double) va_arg( args, double ); + i64 = stream_Size( p_demux->s ); - if( stream_Seek( p_demux->s, (int64_t)(i64 * f) ) ) - return VLC_EGENERIC; + if( stream_Seek( p_demux->s, (int64_t)(i64 * f) ) ) + return VLC_EGENERIC; - return VLC_SUCCESS; + return VLC_SUCCESS; #if 0 - case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_time < 0 ) - { - *pi64 = 0; - return VLC_EGENERIC; - } - *pi64 = p_sys->i_time; - return VLC_SUCCESS; - - case DEMUX_GET_LENGTH: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) - { - *pi64 = INT64_C(1000000) * ( stream_Size( p_demux->s ) / 50 ) / - p_sys->i_mux_rate; - return VLC_SUCCESS; - } + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( p_sys->i_time < 0 ) + { *pi64 = 0; return VLC_EGENERIC; -#else - case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( DVBEventInformation( p_demux, pi64, NULL ) ) - *pi64 = 0; - return VLC_SUCCESS; + } + *pi64 = p_sys->i_time; + return VLC_SUCCESS; - case DEMUX_GET_LENGTH: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( DVBEventInformation( p_demux, NULL, pi64 ) ) - *pi64 = 0; - return VLC_SUCCESS; -#endif - case DEMUX_SET_GROUP: + case DEMUX_GET_LENGTH: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( p_sys->i_mux_rate > 0 ) { - 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_dvb_control && i_int > 0 && i_int != p_sys->i_dvb_program ) - { - int i_pmt_pid = -1; - int i; - - /* Search pmt to be unselected */ - for( i = 0; i < p_sys->i_pmt; i++ ) - { - ts_pid_t *pmt = p_sys->pmt[i]; - int i_prg; + *pi64 = INT64_C(1000000) * ( stream_Size( p_demux->s ) / 50 ) / + p_sys->i_mux_rate; + return VLC_SUCCESS; + } + *pi64 = 0; + return VLC_EGENERIC; +#else + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( DVBEventInformation( p_demux, pi64, NULL ) ) + *pi64 = 0; + return VLC_SUCCESS; - for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) - { - if( pmt->psi->prg[i_prg]->i_number == p_sys->i_dvb_program ) - { - i_pmt_pid = p_sys->pmt[i]->i_pid; - break; - } - } - if( i_pmt_pid > 0 ) break; - } + case DEMUX_GET_LENGTH: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( DVBEventInformation( p_demux, NULL, pi64 ) ) + *pi64 = 0; + return VLC_SUCCESS; +#endif + case DEMUX_SET_GROUP: + { + vlc_list_t *p_list; - 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( i = 2; i < 8192; i++ ) - { - ts_pid_t *pid = &p_sys->pid[i]; - int i_prg; + 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( !pid->b_valid || pid->psi ) continue; + if( i_int == 0 && p_sys->i_current_program > 0 ) + i_int = p_sys->i_current_program; - for( 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 */ - p_sys->i_dvb_program = i_int; - i_pmt_pid = -1; - for( i = 0; i < p_sys->i_pmt; i++ ) - { - ts_pid_t *pmt = p_sys->pmt[i]; - int i_prg; + if( i_int > 0 ) + { + p_sys->i_current_program = i_int; + 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 ) + { + vlc_list_t *p_dst = &p_sys->programs_list; + free( p_dst->p_values ); - for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) - { - if( pmt->psi->prg[i_prg]->i_number == i_int ) - { - 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 ) + p_dst->p_values = calloc( p_list->i_count, + sizeof(*p_dst->p_values) ); + if( p_dst->p_values ) { - 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( i = 2; i < 8192; i++ ) + p_dst->i_count = p_list->i_count; + for( int i = 0; i < p_list->i_count; i++ ) { - ts_pid_t *pid = &p_sys->pid[i]; - int i_prg; - - if( !pid->b_valid || pid->psi ) continue; - - for( 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_dvb_program = -1; - p_sys->p_programs_list = p_list; - } - return VLC_SUCCESS; } + return VLC_SUCCESS; + } - case DEMUX_CAN_RECORD: - pb_bool = (bool*)va_arg( args, bool * ); - *pb_bool = true; - return VLC_SUCCESS; + case DEMUX_CAN_RECORD: + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = true; + return VLC_SUCCESS; - case DEMUX_SET_RECORD_STATE: - b_bool = (bool)va_arg( args, int ); + case DEMUX_SET_RECORD_STATE: + b_bool = (bool)va_arg( args, int ); - if( !b_bool ) - stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, false ); - p_sys->b_start_record = b_bool; - return VLC_SUCCESS; + if( !b_bool ) + stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, false ); + p_sys->b_start_record = b_bool; + return VLC_SUCCESS; - case DEMUX_GET_FPS: - case DEMUX_SET_TIME: - default: - return VLC_EGENERIC; + case DEMUX_GET_FPS: + case DEMUX_SET_TIME: + default: + return VLC_EGENERIC; } } @@ -1508,6 +1454,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++; } } @@ -1525,12 +1472,75 @@ 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; pid->b_valid = true; pid->i_cc = 0xff; + pid->b_scrambled = false; pid->p_owner = p_owner; pid->i_owner_number = 0; @@ -1542,7 +1552,7 @@ static void PIDInit( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner ) if( !b_old_valid ) { - pid->psi = malloc( sizeof( ts_psi_t ) ); + pid->psi = xmalloc( sizeof( ts_psi_t ) ); if( pid->psi ) { pid->psi->handle = NULL; @@ -1588,14 +1598,16 @@ 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 ) { - int i; - - if( pid->psi->handle ) dvbpsi_DetachPMT( pid->psi->handle ); - for( i = 0; i < pid->psi->i_prg; i++ ) + if( pid->psi->handle ) + dvbpsi_DetachPMT( pid->psi->handle ); + for( int i = 0; i < pid->psi->i_prg; i++ ) { if( pid->psi->prg[i]->iod ) IODFree( pid->psi->prg[i]->iod ); @@ -1608,10 +1620,11 @@ static void PIDClean( es_out_t *out, ts_pid_t *pid ) } else { - int i; - 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 ); @@ -1620,10 +1633,13 @@ static void PIDClean( es_out_t *out, ts_pid_t *pid ) free( pid->es ); - for( i = 0; i < pid->i_extra_es; i++ ) + 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 ); @@ -1632,7 +1648,8 @@ static void PIDClean( es_out_t *out, ts_pid_t *pid ) free( pid->extra_es[i] ); } - if( pid->i_extra_es ) free( pid->extra_es ); + if( pid->i_extra_es ) + free( pid->extra_es ); } pid->b_valid = false; @@ -1645,12 +1662,11 @@ 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; - int i_max; /* remove the pes from pid */ pid->es->p_pes = NULL; @@ -1659,9 +1675,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 */ - 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 ) @@ -1674,86 +1689,86 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) /* TODO check size */ switch( header[3] ) { - case 0xBC: /* Program stream map */ - case 0xBE: /* Padding */ - case 0xBF: /* Private stream 2 */ - case 0xF0: /* ECM */ - case 0xF1: /* EMM */ - case 0xFF: /* Program stream directory */ - case 0xF2: /* DSMCC stream */ - case 0xF8: /* ITU-T H.222.1 type E stream */ - i_skip = 6; - break; - default: - if( ( header[6]&0xC0 ) == 0x80 ) + case 0xBC: /* Program stream map */ + case 0xBE: /* Padding */ + case 0xBF: /* Private stream 2 */ + case 0xF0: /* ECM */ + case 0xF1: /* EMM */ + case 0xFF: /* Program stream directory */ + case 0xF2: /* DSMCC stream */ + case 0xF8: /* ITU-T H.222.1 type E stream */ + i_skip = 6; + break; + default: + if( ( header[6]&0xC0 ) == 0x80 ) + { + /* mpeg2 PES */ + i_skip = header[8] + 9; + + if( header[7]&0x80 ) /* has pts */ { - /* mpeg2 PES */ - i_skip = header[8] + 9; + i_pts = ((mtime_t)(header[ 9]&0x0e ) << 29)| + (mtime_t)(header[10] << 22)| + ((mtime_t)(header[11]&0xfe) << 14)| + (mtime_t)(header[12] << 7)| + (mtime_t)(header[13] >> 1); - if( header[7]&0x80 ) /* has pts */ + if( header[7]&0x40 ) /* has dts */ { - i_pts = ((mtime_t)(header[ 9]&0x0e ) << 29)| - (mtime_t)(header[10] << 22)| - ((mtime_t)(header[11]&0xfe) << 14)| - (mtime_t)(header[12] << 7)| - (mtime_t)(header[13] >> 1); - - if( header[7]&0x40 ) /* has dts */ - { - i_dts = ((mtime_t)(header[14]&0x0e ) << 29)| - (mtime_t)(header[15] << 22)| - ((mtime_t)(header[16]&0xfe) << 14)| - (mtime_t)(header[17] << 7)| - (mtime_t)(header[18] >> 1); - } + i_dts = ((mtime_t)(header[14]&0x0e ) << 29)| + (mtime_t)(header[15] << 22)| + ((mtime_t)(header[16]&0xfe) << 14)| + (mtime_t)(header[17] << 7)| + (mtime_t)(header[18] >> 1); } } - else + } + else + { + i_skip = 6; + while( i_skip < 23 && header[i_skip] == 0xff ) { - i_skip = 6; - while( i_skip < 23 && header[i_skip] == 0xff ) - { - i_skip++; - } - if( i_skip == 23 ) - { - msg_Err( p_demux, "too much MPEG-1 stuffing" ); - block_ChainRelease( p_pes ); - return; - } - if( ( header[i_skip] & 0xC0 ) == 0x40 ) - { - i_skip += 2; - } + i_skip++; + } + if( i_skip == 23 ) + { + msg_Err( p_demux, "too much MPEG-1 stuffing" ); + block_ChainRelease( p_pes ); + return; + } + if( ( header[i_skip] & 0xC0 ) == 0x40 ) + { + i_skip += 2; + } - if( header[i_skip]&0x20 ) - { - i_pts = ((mtime_t)(header[i_skip]&0x0e ) << 29)| - (mtime_t)(header[i_skip+1] << 22)| - ((mtime_t)(header[i_skip+2]&0xfe) << 14)| - (mtime_t)(header[i_skip+3] << 7)| - (mtime_t)(header[i_skip+4] >> 1); + if( header[i_skip]&0x20 ) + { + i_pts = ((mtime_t)(header[i_skip]&0x0e ) << 29)| + (mtime_t)(header[i_skip+1] << 22)| + ((mtime_t)(header[i_skip+2]&0xfe) << 14)| + (mtime_t)(header[i_skip+3] << 7)| + (mtime_t)(header[i_skip+4] >> 1); - if( header[i_skip]&0x10 ) /* has dts */ - { - i_dts = ((mtime_t)(header[i_skip+5]&0x0e ) << 29)| - (mtime_t)(header[i_skip+6] << 22)| - ((mtime_t)(header[i_skip+7]&0xfe) << 14)| - (mtime_t)(header[i_skip+8] << 7)| - (mtime_t)(header[i_skip+9] >> 1); - i_skip += 10; - } - else - { - i_skip += 5; - } + if( header[i_skip]&0x10 ) /* has dts */ + { + i_dts = ((mtime_t)(header[i_skip+5]&0x0e ) << 29)| + (mtime_t)(header[i_skip+6] << 22)| + ((mtime_t)(header[i_skip+7]&0xfe) << 14)| + (mtime_t)(header[i_skip+8] << 7)| + (mtime_t)(header[i_skip+9] >> 1); + i_skip += 10; } else { - i_skip += 1; + i_skip += 5; } } - break; + else + { + i_skip += 1; + } + } + break; } if( pid->es->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', 'b' ) || @@ -1767,7 +1782,7 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) { i_skip += 1; } - else if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) && + else if( pid->es->fmt.i_codec == VLC_CODEC_SUBT && pid->es->p_mpeg4desc ) { decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr; @@ -1778,21 +1793,17 @@ 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; } #ifdef ZVBI_COMPILED - else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) ) + else if( pid->es->fmt.i_codec == VLC_CODEC_TELETEXT ) i_skip = 0; /*hack for zvbi support */ #endif /* skip header */ @@ -1824,17 +1835,15 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) int i; if( i_dts >= 0 ) - { - p_pes->i_dts = i_dts * 100 / 9; - } + p_pes->i_dts = VLC_TS_0 + i_dts * 100 / 9; + if( i_pts >= 0 ) - { - p_pes->i_pts = i_pts * 100 / 9; - } + p_pes->i_pts = VLC_TS_0 + i_pts * 100 / 9; + p_pes->i_length = i_length * 100 / 9; p_block = block_ChainGather( p_pes ); - if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) ) + if( pid->es->fmt.i_codec == VLC_CODEC_SUBT ) { if( i_pes_size > 0 && p_block->i_buffer > i_pes_size ) { @@ -1864,30 +1873,30 @@ 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 ) ) { - int i; - mtime_t i_pcr; /* 33 bits */ - - i_pcr = ( (mtime_t)p[6] << 25 ) | - ( (mtime_t)p[7] << 17 ) | - ( (mtime_t)p[8] << 9 ) | - ( (mtime_t)p[9] << 1 ) | - ( (mtime_t)p[10] >> 7 ); + /* PCR is 33 bits */ + const mtime_t i_pcr = ( (mtime_t)p[6] << 25 ) | + ( (mtime_t)p[7] << 17 ) | + ( (mtime_t)p[8] << 9 ) | + ( (mtime_t)p[9] << 1 ) | + ( (mtime_t)p[10] >> 7 ); /* Search program and set the PCR */ - for( i = 0; i < p_sys->i_pmt; i++ ) + for( int i = 0; i < p_sys->i_pmt; i++ ) { - int i_prg; - for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ ) + for( int i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ ) { if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr ) { es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR, (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number, - (int64_t)(i_pcr * 100 / 9) ); + (int64_t)(VLC_TS_0 + i_pcr * 100 / 9) ); } } } @@ -1898,15 +1907,15 @@ static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) { const uint8_t *p = p_bk->p_buffer; const bool b_unit_start = p[1]&0x40; + const bool b_scrambled = p[3]&0x80; const bool b_adaptation = p[3]&0x20; const bool b_payload = p[3]&0x10; - const int i_cc = p[3]&0x0f; /* continuity counter */ - bool b_discontinuity = false;/* discontinuity */ + const int i_cc = p[3]&0x0f; /* continuity counter */ + bool b_discontinuity = false; /* discontinuity */ /* transport_scrambling_control is ignored */ int i_skip = 0; - bool i_ret = false; - int i_diff; + bool i_ret = false; #if 0 msg_Dbg( p_demux, "pid=%d unit_start=%d adaptation=%d payload=%d " @@ -1967,7 +1976,7 @@ static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) * diff == 0 and duplicate packet (playload != 0) <- should we * test the content ? */ - i_diff = ( i_cc - pid->i_cc )&0x0f; + const int i_diff = ( i_cc - pid->i_cc )&0x0f; if( b_payload && i_diff == 1 ) { pid->i_cc = ( pid->i_cc + 1 ) & 0xf; @@ -1988,7 +1997,7 @@ static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) pid->i_cc = i_cc; if( pid->es->p_pes && pid->es->fmt.i_cat != VIDEO_ES ) { - /* Small video artifacts are usually better then + /* Small video artifacts are usually better than * dropping full frames */ pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED; } @@ -2003,6 +2012,23 @@ static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) return i_ret; } + /* */ + if( !pid->b_scrambled != !b_scrambled ) + { + msg_Warn( p_demux, "scrambled state changed on pid %d (%d->%d)", + pid->i_pid, pid->b_scrambled, b_scrambled ); + + pid->b_scrambled = b_scrambled; + + for( int i = 0; i < pid->i_extra_es; i++ ) + { + es_out_Control( p_demux->out, ES_OUT_SET_ES_SCRAMBLED_STATE, + pid->extra_es[i]->id, b_scrambled ); + } + es_out_Control( p_demux->out, ES_OUT_SET_ES_SCRAMBLED_STATE, + pid->es->id, b_scrambled ); + } + /* We have to gather it */ p_bk->p_buffer += i_skip; p_bk->i_buffer -= i_skip; @@ -2061,65 +2087,68 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) switch( i_stream_type ) { - case 0x01: /* MPEG-1 video */ - case 0x02: /* MPEG-2 video */ - case 0x80: /* MPEG-2 MOTO video */ - es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', 'g', 'v' ) ); - break; - case 0x03: /* MPEG-1 audio */ - case 0x04: /* MPEG-2 audio */ - es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', 'g', 'a' ) ); - break; - case 0x11: /* MPEG4 (audio) */ - case 0x0f: /* ISO/IEC 13818-7 Audio with ADTS transport syntax */ - es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', '4', 'a' ) ); - break; - case 0x10: /* MPEG4 (video) */ - es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) ); - pid->es->b_gather = true; - break; - case 0x1B: /* H264 <- check transport syntax/needed descriptor */ - es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'h', '2', '6', '4' ) ); - break; + case 0x01: /* MPEG-1 video */ + case 0x02: /* MPEG-2 video */ + case 0x80: /* MPEG-2 MOTO video */ + es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MPGV ); + break; + case 0x03: /* MPEG-1 audio */ + case 0x04: /* MPEG-2 audio */ + es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MPGA ); + break; + case 0x11: /* MPEG4 (audio) LATM */ + case 0x0f: /* ISO/IEC 13818-7 Audio with ADTS transport syntax */ + es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MP4A ); + break; + case 0x10: /* MPEG4 (video) */ + es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MP4V ); + pid->es->b_gather = true; + break; + case 0x1B: /* H264 <- check transport syntax/needed descriptor */ + es_format_Init( fmt, VIDEO_ES, VLC_CODEC_H264 ); + break; - case 0x81: /* A52 (audio) */ - es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', ' ' ) ); - break; - case 0x82: /* DVD_SPU (sub) */ - es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', ' ' ) ); - break; - case 0x83: /* LPCM (audio) */ - es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'l', 'p', 'c', 'm' ) ); - break; - case 0x84: /* SDDS (audio) */ - es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 's' ) ); - break; - case 0x85: /* DTS (audio) */ - es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'd', 't', 's', ' ' ) ); - break; + case 0x81: /* A52 (audio) */ + es_format_Init( fmt, AUDIO_ES, VLC_CODEC_A52 ); + break; + case 0x82: /* DVD_SPU (sub) */ + es_format_Init( fmt, SPU_ES, VLC_CODEC_SPU ); + break; + case 0x83: /* LPCM (audio) */ + es_format_Init( fmt, AUDIO_ES, VLC_CODEC_DVD_LPCM ); + break; + case 0x84: /* SDDS (audio) */ + es_format_Init( fmt, AUDIO_ES, VLC_CODEC_SDDS ); + break; + 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' ) ); - break; - case 0x92: /* DVD_SPU vls (sub) */ - es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', 'b' ) ); - break; + case 0x91: /* A52 vls (audio) */ + es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', 'b' ) ); + break; + case 0x92: /* DVD_SPU vls (sub) */ + es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', 'b' ) ); + break; - case 0x94: /* SDDS (audio) */ - es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 'b' ) ); - break; + case 0x94: /* SDDS (audio) */ + es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 'b' ) ); + break; - case 0xa0: /* MSCODEC vlc (video) (fixed later) */ - es_format_Init( fmt, UNKNOWN_ES, 0 ); - pid->es->b_gather = true; - break; + case 0xa0: /* MSCODEC vlc (video) (fixed later) */ + es_format_Init( fmt, UNKNOWN_ES, 0 ); + pid->es->b_gather = true; + break; - case 0x06: /* PES_PRIVATE (fixed later) */ - case 0x12: /* MPEG-4 generic (sub/scene/...) (fixed later) */ - case 0xEA: /* Privately managed ES (VC-1) (fixed later */ - default: - es_format_Init( fmt, UNKNOWN_ES, 0 ); - break; + case 0x06: /* PES_PRIVATE (fixed later) */ + case 0x12: /* MPEG-4 generic (sub/scene/...) (fixed later) */ + case 0xEA: /* Privately managed ES (VC-1) (fixed later */ + default: + es_format_Init( fmt, UNKNOWN_ES, 0 ); + break; } /* PES packets usually contain truncated frames */ @@ -2314,175 +2343,175 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) switch( i_tag ) { - case 0x03: - { + case 0x03: + { #define es_descr p_iod->es_descr[i_es_index] - int i_decoderConfigDescr_length; + int i_decoderConfigDescr_length; #ifdef TS_DEBUG - fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length ); + fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length ); #endif - es_descr.b_ok = 1; - - es_descr.i_es_id = IODGetWord( &i_data, &p_data ); - i_flags = IODGetByte( &i_data, &p_data ); - es_descr.b_streamDependenceFlag = ( i_flags >> 7 )&0x01; - b_url = ( i_flags >> 6 )&0x01; - es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01; - es_descr.i_streamPriority = i_flags & 0x1f; + es_descr.b_ok = 1; + + es_descr.i_es_id = IODGetWord( &i_data, &p_data ); + i_flags = IODGetByte( &i_data, &p_data ); + es_descr.b_streamDependenceFlag = ( i_flags >> 7 )&0x01; + b_url = ( i_flags >> 6 )&0x01; + es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01; + es_descr.i_streamPriority = i_flags & 0x1f; #ifdef TS_DEBUG - fprintf( stderr, "\n* * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag ); - fprintf( stderr, "\n* * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag ); - fprintf( stderr, "\n* * streamPriority:%d", es_descr.i_streamPriority ); + fprintf( stderr, "\n* * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag ); + fprintf( stderr, "\n* * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag ); + fprintf( stderr, "\n* * streamPriority:%d", es_descr.i_streamPriority ); #endif - if( es_descr.b_streamDependenceFlag ) - { - es_descr.i_dependOn_es_id = IODGetWord( &i_data, &p_data ); + if( es_descr.b_streamDependenceFlag ) + { + es_descr.i_dependOn_es_id = IODGetWord( &i_data, &p_data ); #ifdef TS_DEBUG - fprintf( stderr, "\n* * dependOn_es_id:%d", es_descr.i_dependOn_es_id ); + fprintf( stderr, "\n* * dependOn_es_id:%d", es_descr.i_dependOn_es_id ); #endif - } + } - if( b_url ) - { - es_descr.psz_url = IODGetURL( &i_data, &p_data ); + if( b_url ) + { + es_descr.psz_url = IODGetURL( &i_data, &p_data ); #ifdef TS_DEBUG - fprintf( stderr, "\n* url string:%s", es_descr.psz_url ); + fprintf( stderr, "\n* url string:%s", es_descr.psz_url ); #endif - } - else - { - es_descr.psz_url = NULL; - } + } + else + { + es_descr.psz_url = NULL; + } - if( es_descr.b_OCRStreamFlag ) - { - es_descr.i_OCR_es_id = IODGetWord( &i_data, &p_data ); + if( es_descr.b_OCRStreamFlag ) + { + es_descr.i_OCR_es_id = IODGetWord( &i_data, &p_data ); #ifdef TS_DEBUG - fprintf( stderr, "\n* * OCR_es_id:%d", es_descr.i_OCR_es_id ); + fprintf( stderr, "\n* * OCR_es_id:%d", es_descr.i_OCR_es_id ); #endif - } + } - if( IODGetByte( &i_data, &p_data ) != 0x04 ) - { + if( IODGetByte( &i_data, &p_data ) != 0x04 ) + { #ifdef TS_DEBUG - fprintf( stderr, "\n* ERR missing DecoderConfigDescr" ); + fprintf( stderr, "\n* ERR missing DecoderConfigDescr" ); #endif - es_descr.b_ok = 0; - break; - } - i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data ); + es_descr.b_ok = 0; + break; + } + i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data ); #ifdef TS_DEBUG - fprintf( stderr, "\n* - DecoderConfigDesc length:%d", i_decoderConfigDescr_length ); + fprintf( stderr, "\n* - DecoderConfigDesc length:%d", i_decoderConfigDescr_length ); #endif #define dec_descr es_descr.dec_descr - dec_descr.i_objectTypeIndication = IODGetByte( &i_data, &p_data ); - i_flags = IODGetByte( &i_data, &p_data ); - dec_descr.i_streamType = i_flags >> 2; - dec_descr.b_upStream = ( i_flags >> 1 )&0x01; - dec_descr.i_bufferSizeDB = IODGet3Bytes( &i_data, &p_data ); - dec_descr.i_maxBitrate = IODGetDWord( &i_data, &p_data ); - dec_descr.i_avgBitrate = IODGetDWord( &i_data, &p_data ); + dec_descr.i_objectTypeIndication = IODGetByte( &i_data, &p_data ); + i_flags = IODGetByte( &i_data, &p_data ); + dec_descr.i_streamType = i_flags >> 2; + dec_descr.b_upStream = ( i_flags >> 1 )&0x01; + dec_descr.i_bufferSizeDB = IODGet3Bytes( &i_data, &p_data ); + dec_descr.i_maxBitrate = IODGetDWord( &i_data, &p_data ); + dec_descr.i_avgBitrate = IODGetDWord( &i_data, &p_data ); #ifdef TS_DEBUG - fprintf( stderr, "\n* * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication ); - fprintf( stderr, "\n* * streamType:0x%x", dec_descr.i_streamType ); - fprintf( stderr, "\n* * upStream:%d", dec_descr.b_upStream ); - fprintf( stderr, "\n* * bufferSizeDB:%d", dec_descr.i_bufferSizeDB ); - fprintf( stderr, "\n* * maxBitrate:%d", dec_descr.i_maxBitrate ); - fprintf( stderr, "\n* * avgBitrate:%d", dec_descr.i_avgBitrate ); + fprintf( stderr, "\n* * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication ); + fprintf( stderr, "\n* * streamType:0x%x", dec_descr.i_streamType ); + fprintf( stderr, "\n* * upStream:%d", dec_descr.b_upStream ); + fprintf( stderr, "\n* * bufferSizeDB:%d", dec_descr.i_bufferSizeDB ); + fprintf( stderr, "\n* * maxBitrate:%d", dec_descr.i_maxBitrate ); + fprintf( stderr, "\n* * avgBitrate:%d", dec_descr.i_avgBitrate ); #endif - if( i_decoderConfigDescr_length > 13 && IODGetByte( &i_data, &p_data ) == 0x05 ) + if( i_decoderConfigDescr_length > 13 && IODGetByte( &i_data, &p_data ) == 0x05 ) + { + int i; + dec_descr.i_decoder_specific_info_len = + IODDescriptorLength( &i_data, &p_data ); + if( dec_descr.i_decoder_specific_info_len > 0 ) { - int i; - dec_descr.i_decoder_specific_info_len = - IODDescriptorLength( &i_data, &p_data ); - if( dec_descr.i_decoder_specific_info_len > 0 ) - { - dec_descr.p_decoder_specific_info = - malloc( dec_descr.i_decoder_specific_info_len ); - } - for( i = 0; i < dec_descr.i_decoder_specific_info_len; i++ ) - { - dec_descr.p_decoder_specific_info[i] = IODGetByte( &i_data, &p_data ); - } + dec_descr.p_decoder_specific_info = + malloc( dec_descr.i_decoder_specific_info_len ); } - else + for( i = 0; i < dec_descr.i_decoder_specific_info_len; i++ ) { - dec_descr.i_decoder_specific_info_len = 0; - dec_descr.p_decoder_specific_info = NULL; + dec_descr.p_decoder_specific_info[i] = IODGetByte( &i_data, &p_data ); } } + else + { + dec_descr.i_decoder_specific_info_len = 0; + dec_descr.p_decoder_specific_info = NULL; + } + } #undef dec_descr #define sl_descr es_descr.sl_descr - { - int i_SLConfigDescr_length; - int i_predefined; + { + int i_SLConfigDescr_length; + int i_predefined; - if( IODGetByte( &i_data, &p_data ) != 0x06 ) - { + if( IODGetByte( &i_data, &p_data ) != 0x06 ) + { #ifdef TS_DEBUG - fprintf( stderr, "\n* ERR missing SLConfigDescr" ); + fprintf( stderr, "\n* ERR missing SLConfigDescr" ); #endif - es_descr.b_ok = 0; - break; - } - i_SLConfigDescr_length = IODDescriptorLength( &i_data, &p_data ); + es_descr.b_ok = 0; + break; + } + i_SLConfigDescr_length = IODDescriptorLength( &i_data, &p_data ); #ifdef TS_DEBUG - fprintf( stderr, "\n* - SLConfigDescr length:%d", i_SLConfigDescr_length ); + fprintf( stderr, "\n* - SLConfigDescr length:%d", i_SLConfigDescr_length ); #endif - i_predefined = IODGetByte( &i_data, &p_data ); + i_predefined = IODGetByte( &i_data, &p_data ); #ifdef TS_DEBUG - fprintf( stderr, "\n* * i_predefined:0x%x", i_predefined ); + fprintf( stderr, "\n* * i_predefined:0x%x", i_predefined ); #endif - switch( i_predefined ) + switch( i_predefined ) + { + case 0x01: { - case 0x01: - { - sl_descr.b_useAccessUnitStartFlag = 0; - sl_descr.b_useAccessUnitEndFlag = 0; - sl_descr.b_useRandomAccessPointFlag = 0; - //sl_descr.b_useRandomAccessUnitsOnlyFlag = 0; - sl_descr.b_usePaddingFlag = 0; - sl_descr.b_useTimeStampsFlags = 0; - sl_descr.b_useIdleFlag = 0; - sl_descr.b_durationFlag = 0; // FIXME FIXME - sl_descr.i_timeStampResolution = 1000; - sl_descr.i_OCRResolution = 0; // FIXME FIXME - sl_descr.i_timeStampLength = 32; - sl_descr.i_OCRLength = 0; // FIXME FIXME - sl_descr.i_AU_Length = 0; - sl_descr.i_instantBitrateLength= 0; // FIXME FIXME - sl_descr.i_degradationPriorityLength= 0; - sl_descr.i_AU_seqNumLength = 0; - sl_descr.i_packetSeqNumLength = 0; - if( sl_descr.b_durationFlag ) - { - sl_descr.i_timeScale = 0; // FIXME FIXME - sl_descr.i_accessUnitDuration = 0; // FIXME FIXME - sl_descr.i_compositionUnitDuration= 0; // FIXME FIXME - } - if( !sl_descr.b_useTimeStampsFlags ) - { - sl_descr.i_startDecodingTimeStamp = 0; // FIXME FIXME - sl_descr.i_startCompositionTimeStamp= 0; // FIXME FIXME - } - } - break; - default: + sl_descr.b_useAccessUnitStartFlag = 0; + sl_descr.b_useAccessUnitEndFlag = 0; + sl_descr.b_useRandomAccessPointFlag = 0; + //sl_descr.b_useRandomAccessUnitsOnlyFlag = 0; + sl_descr.b_usePaddingFlag = 0; + sl_descr.b_useTimeStampsFlags = 0; + sl_descr.b_useIdleFlag = 0; + sl_descr.b_durationFlag = 0; // FIXME FIXME + sl_descr.i_timeStampResolution = 1000; + sl_descr.i_OCRResolution = 0; // FIXME FIXME + sl_descr.i_timeStampLength = 32; + sl_descr.i_OCRLength = 0; // FIXME FIXME + sl_descr.i_AU_Length = 0; + sl_descr.i_instantBitrateLength= 0; // FIXME FIXME + sl_descr.i_degradationPriorityLength= 0; + sl_descr.i_AU_seqNumLength = 0; + sl_descr.i_packetSeqNumLength = 0; + if( sl_descr.b_durationFlag ) + { + sl_descr.i_timeScale = 0; // FIXME FIXME + sl_descr.i_accessUnitDuration = 0; // FIXME FIXME + sl_descr.i_compositionUnitDuration= 0; // FIXME FIXME + } + if( !sl_descr.b_useTimeStampsFlags ) + { + sl_descr.i_startDecodingTimeStamp = 0; // FIXME FIXME + sl_descr.i_startCompositionTimeStamp= 0; // FIXME FIXME + } + } + break; + default: #ifdef TS_DEBUG - fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" ); + fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" ); #endif - es_descr.b_ok = 0; - break; - } + es_descr.b_ok = 0; + break; } - break; + } + break; #undef sl_descr #undef es_descr - default: + default: #ifdef TS_DEBUG - fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length ); + fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length ); #endif - break; + break; } p_data = p_data_sav + i_length; @@ -2535,29 +2564,203 @@ static void IODFree( iod_descriptor_t *p_iod ) ** libdvbpsi callbacks **************************************************************************** ****************************************************************************/ -static bool DVBProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm ) +static bool ProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm ) { demux_sys_t *p_sys = p_demux->p_sys; - if ( !p_sys->b_dvb_control ) return false; - if ( (p_sys->i_dvb_program == -1 && p_sys->p_programs_list == NULL) - || p_sys->i_dvb_program == 0 ) + 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->i_dvb_program == i_pgrm ) return true; - if ( p_sys->p_programs_list != NULL ) + if( p_sys->programs_list.i_count != 0 ) { - int i; - for ( 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; } } return false; } +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 && 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/TDT */ + + for( int i = 0x11; i <= 0x14; i++ ) + { + if( i == 0x13 ) continue; + ts_pid_t *p_pid = &p_sys->pid[i]; + if( p_pid->psi ) + { + dvbpsi_DetachDemux( p_pid->psi->handle ); + free( p_pid->psi ); + p_pid->psi = NULL; + p_pid->b_valid = false; + } + SetPIDFilter( p_demux, i, false ); + } + p_sys->b_dvb_meta = false; +} + + #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; +} + static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) { demux_sys_t *p_sys = p_demux->p_sys; @@ -2579,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 ); + p_sys->b_broken_charset = false; + for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next ) { vlc_meta_t *p_meta; @@ -2593,9 +2798,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_dvb_program != -1 && p_sys->i_dvb_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 ) { @@ -2621,14 +2823,38 @@ 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 ) + p_sys->b_broken_charset = true; /* SKY DE & BetaDigital use 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'; + /* List of providers using ISO8859-1 */ + static const char ppsz_broken_providers[][8] = { + "CSAT", /* CanalSat FR */ + "GR1", /* France televisions */ + "MULTI4", /* NT1 */ + "MR5", /* France 2/M6 HD */ + "" + }; + for( int i = 0; *ppsz_broken_providers[i]; i++ ) + { + 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 ) ) + p_sys->b_broken_charset = true; + } + + /* FIXME: Digital+ ES also uses ISO8859-1 */ + + str1 = EITConvertToUTF8(pD->i_service_provider_name, + pD->i_service_provider_name_length, + p_sys->b_broken_charset ); + str2 = EITConvertToUTF8(pD->i_service_name, + pD->i_service_name_length, + p_sys->b_broken_charset ); msg_Dbg( p_demux, " - type=%d provider=%s name=%s", pD->i_service_type, str1, str2 ); @@ -2637,6 +2863,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 ); } } @@ -2726,142 +2954,27 @@ 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; vlc_epg_t *p_epg; msg_Dbg( p_demux, "EITCallBack called" ); - if( !p_eit->b_current_next || ( p_sys->i_dvb_program != -1 && p_sys->i_dvb_program != p_eit->i_service_id ) ) + if( !p_eit->b_current_next ) { dvbpsi_DeleteEIT( p_eit ); return; @@ -2898,10 +3011,14 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) { dvbpsi_short_event_dr_t *pE = dvbpsi_DecodeShortEventDr( p_dr ); - if( pE ) + /* Only take first description, as we don't handle language-info + for epg atm*/ + if( pE && psz_name == NULL) { - psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length); - psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length ); + psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length, + p_sys->b_broken_charset ); + psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length, + p_sys->b_broken_charset ); msg_Dbg( p_demux, " - short event lang=%3.3s '%s' : '%s'", pE->i_iso_639_code, psz_name, psz_text ); } @@ -2911,40 +3028,46 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) dvbpsi_extended_event_dr_t *pE = dvbpsi_DecodeExtendedEventDr( p_dr ); if( pE ) { - int i; msg_Dbg( p_demux, " - extended event lang=%3.3s [%d/%d]", pE->i_iso_639_code, pE->i_descriptor_number, pE->i_last_descriptor_number ); if( pE->i_text_length > 0 ) { - char *psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length ); + char *psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length, + p_sys->b_broken_charset ); if( psz_text ) { msg_Dbg( p_demux, " - text='%s'", psz_text ); - psz_extra = realloc( psz_extra, strlen(psz_extra) + strlen(psz_text) + 1 ); + psz_extra = xrealloc( psz_extra, + strlen(psz_extra) + strlen(psz_text) + 1 ); strcat( psz_extra, psz_text ); free( psz_text ); } } - for( i = 0; i < pE->i_entry_count; i++ ) + for( int i = 0; i < pE->i_entry_count; i++ ) { char *psz_dsc = EITConvertToUTF8( pE->i_item_description[i], - pE->i_item_description_length[i] ); - char *psz_itm = EITConvertToUTF8( pE->i_item[i], pE->i_item_length[i] ); + pE->i_item_description_length[i], + p_sys->b_broken_charset ); + char *psz_itm = EITConvertToUTF8( pE->i_item[i], pE->i_item_length[i], + p_sys->b_broken_charset ); 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 = xrealloc( psz_extra, + strlen(psz_extra) + strlen(psz_dsc) + + strlen(psz_itm) + 3 + 1 ); 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 ); @@ -2959,7 +3082,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 ) @@ -2972,15 +3096,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_dvb_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 ); @@ -2989,6 +3115,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 ) @@ -3002,21 +3136,787 @@ 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_AttachSDT( h, i_table_id, i_extension, - (dvbpsi_sdt_callback)SDTCallBack, p_demux ); + dvbpsi_AttachSDT( h, i_table_id, i_extension, + (dvbpsi_sdt_callback)SDTCallBack, p_demux ); + } + else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 && + ( i_table_id == 0x4e || /* Current/Following */ + (i_table_id >= 0x50 && i_table_id <= 0x5f) ) ) /* Schedule */ + { + msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", + i_table_id, i_table_id, i_extension, i_extension ); + + 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 + +/***************************************************************************** + * PMT callback and helpers + *****************************************************************************/ +static dvbpsi_descriptor_t *PMTEsFindDescriptor( const dvbpsi_pmt_es_t *p_es, + int i_tag ) +{ + dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;; + while( p_dr && ( p_dr->i_tag != i_tag ) ) + p_dr = p_dr->p_next; + return p_dr; +} +static bool PMTEsHasRegistration( demux_t *p_demux, + const dvbpsi_pmt_es_t *p_es, + const char *psz_tag ) +{ + dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x05 ); + if( !p_dr ) + return false; + + if( p_dr->i_length < 4 ) + { + msg_Warn( p_demux, "invalid Registration Descriptor" ); + return false; + } + + assert( strlen(psz_tag) == 4 ); + return !memcmp( p_dr->p_data, psz_tag, 4 ); +} +static void PMTSetupEsISO14496( demux_t *p_demux, ts_pid_t *pid, + const ts_prg_psi_t *prg, const dvbpsi_pmt_es_t *p_es ) +{ + es_format_t *p_fmt = &pid->es->fmt; + + /* MPEG-4 stream: search SL_DESCRIPTOR */ + dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x1f ); + + if( p_dr && p_dr->i_length == 2 ) + { + const int i_es_id = ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1]; + + msg_Warn( p_demux, "found SL_descriptor es_id=%d", i_es_id ); + + pid->es->p_mpeg4desc = NULL; + + for( int i = 0; i < 255; i++ ) + { + iod_descriptor_t *iod = prg->iod; + + if( iod->es_descr[i].b_ok && + iod->es_descr[i].i_es_id == i_es_id ) + { + pid->es->p_mpeg4desc = &iod->es_descr[i]; + break; + } + } + } + if( !pid->es->p_mpeg4desc ) + { + msg_Err( p_demux, "MPEG-4 descriptor not found" ); + return; + } + + const decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr; + if( dcd->i_streamType == 0x04 ) /* VisualStream */ + { + p_fmt->i_cat = VIDEO_ES; + switch( dcd->i_objectTypeIndication ) + { + case 0x0B: /* mpeg4 sub */ + p_fmt->i_cat = SPU_ES; + p_fmt->i_codec = VLC_CODEC_SUBT; + break; + + case 0x20: /* mpeg4 */ + p_fmt->i_codec = VLC_CODEC_MP4V; + break; + case 0x21: /* h264 */ + p_fmt->i_codec = VLC_CODEC_H264; + break; + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: /* mpeg2 */ + p_fmt->i_codec = VLC_CODEC_MPGV; + break; + case 0x6a: /* mpeg1 */ + p_fmt->i_codec = VLC_CODEC_MPGV; + break; + case 0x6c: /* mpeg1 */ + p_fmt->i_codec = VLC_CODEC_JPEG; + break; + default: + p_fmt->i_cat = UNKNOWN_ES; + break; + } + } + else if( dcd->i_streamType == 0x05 ) /* AudioStream */ + { + p_fmt->i_cat = AUDIO_ES; + switch( dcd->i_objectTypeIndication ) + { + case 0x40: /* mpeg4 */ + p_fmt->i_codec = VLC_CODEC_MP4A; + break; + case 0x66: + case 0x67: + case 0x68: /* mpeg2 aac */ + p_fmt->i_codec = VLC_CODEC_MP4A; + break; + case 0x69: /* mpeg2 */ + p_fmt->i_codec = VLC_CODEC_MPGA; + break; + case 0x6b: /* mpeg1 */ + p_fmt->i_codec = VLC_CODEC_MPGA; + break; + default: + p_fmt->i_cat = UNKNOWN_ES; + break; + } + } + else + { + p_fmt->i_cat = UNKNOWN_ES; + } + + if( p_fmt->i_cat != UNKNOWN_ES ) + { + p_fmt->i_extra = dcd->i_decoder_specific_info_len; + if( p_fmt->i_extra > 0 ) + { + p_fmt->p_extra = malloc( p_fmt->i_extra ); + if( p_fmt->p_extra ) + memcpy( p_fmt->p_extra, + dcd->p_decoder_specific_info, + p_fmt->i_extra ); + else + p_fmt->i_extra = 0; + } + } +} + +typedef struct +{ + int i_type; + int i_magazine; + int i_page; + char p_iso639[3]; +} ts_teletext_page_t; + +static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, + const dvbpsi_pmt_es_t *p_es ) +{ + es_format_t *p_fmt = &pid->es->fmt; + + ts_teletext_page_t p_page[2 * 64 + 20]; + 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( 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 ) + continue; + + dvbpsi_teletext_dr_t *p_sub = dvbpsi_DecodeTeletextDr( p_dr ); + if( !p_sub ) + continue; + + for( int i = 0; i < p_sub->i_pages_number; i++ ) + { + const dvbpsi_teletextpage_t *p_src = &p_sub->p_pages[i]; + + if( p_src->i_teletext_type >= 0x06 ) + continue; + + assert( i_page < sizeof(p_page)/sizeof(*p_page) ); + + ts_teletext_page_t *p_dst = &p_page[i_page++]; + + p_dst->i_type = p_src->i_teletext_type; + p_dst->i_magazine = p_src->i_teletext_magazine_number + ? p_src->i_teletext_magazine_number : 8; + p_dst->i_page = p_src->i_teletext_page_number; + memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 ); + } + } +#endif + +#ifdef _DVBPSI_DR_59_H_ + dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 ); + if( p_dr ) + { + dvbpsi_subtitling_dr_t *p_sub = dvbpsi_DecodeSubtitlingDr( p_dr ); + for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ ) + { + dvbpsi_subtitle_t *p_src = &p_sub->p_subtitle[i]; + + if( p_src->i_subtitling_type < 0x01 || p_src->i_subtitling_type > 0x03 ) + continue; + + assert( i_page < sizeof(p_page)/sizeof(*p_page) ); + + ts_teletext_page_t *p_dst = &p_page[i_page++]; + + switch( p_src->i_subtitling_type ) + { + case 0x01: + p_dst->i_type = 0x02; + break; + default: + p_dst->i_type = 0x03; + break; + } + /* FIXME check if it is the right split */ + p_dst->i_magazine = (p_src->i_composition_page_id >> 8) + ? (p_src->i_composition_page_id >> 8) : 8; + p_dst->i_page = p_src->i_composition_page_id & 0xff; + memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 ); + } + } +#endif + + /* */ + es_format_Init( p_fmt, SPU_ES, VLC_CODEC_TELETEXT ); + + if( !p_demux->p_sys->b_split_es || i_page <= 0 ) + { + p_fmt->subs.teletext.i_magazine = -1; + p_fmt->subs.teletext.i_page = 0; + p_fmt->psz_description = strdup( vlc_gettext(ppsz_teletext_type[1]) ); + + dvbpsi_descriptor_t *p_dr; + p_dr = PMTEsFindDescriptor( p_es, 0x46 ); + if( !p_dr ) + p_dr = PMTEsFindDescriptor( p_es, 0x56 ); + + if( !p_demux->p_sys->b_split_es && p_dr && p_dr->i_length > 0 ) + { + /* Descriptor pass-through */ + p_fmt->p_extra = malloc( p_dr->i_length ); + if( p_fmt->p_extra ) + { + p_fmt->i_extra = p_dr->i_length; + memcpy( p_fmt->p_extra, p_dr->p_data, p_dr->i_length ); + } + } + } + else + { + for( unsigned i = 0; i < i_page; i++ ) + { + ts_es_t *p_es; + + /* */ + if( i == 0 ) + { + p_es = pid->es; + } + else + { + p_es = malloc( sizeof(*p_es) ); + if( !p_es ) + break; + + es_format_Copy( &p_es->fmt, &pid->es->fmt ); + free( p_es->fmt.psz_language ); + free( p_es->fmt.psz_description ); + p_es->fmt.psz_language = NULL; + p_es->fmt.psz_description = NULL; + + p_es->id = NULL; + p_es->p_pes = NULL; + p_es->i_pes_size = 0; + p_es->i_pes_gathered = 0; + p_es->pp_last = &p_es->p_pes; + p_es->p_mpeg4desc = NULL; + p_es->b_gather = false; + + TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es ); + } + + /* */ + const ts_teletext_page_t *p = &p_page[i]; + p_es->fmt.i_priority = (p->i_type == 0x02 || p->i_type == 0x05) ? 0 : -1; + p_es->fmt.psz_language = strndup( p->p_iso639, 3 ); + p_es->fmt.psz_description = strdup(vlc_gettext(ppsz_teletext_type[p->i_type])); + p_es->fmt.subs.teletext.i_magazine = p->i_magazine; + p_es->fmt.subs.teletext.i_page = p->i_page; + + msg_Dbg( p_demux, + " * ttxt type=%s lan=%s page=%d%02x", + p_es->fmt.psz_description, + p_es->fmt.psz_language, + p->i_magazine, p->i_page ); + } + } +} +static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, + const dvbpsi_pmt_es_t *p_es ) +{ + es_format_t *p_fmt = &pid->es->fmt; + + es_format_Init( p_fmt, SPU_ES, VLC_CODEC_DVBS ); + + dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 ); + int i_page = 0; +#ifdef _DVBPSI_DR_59_H_ + dvbpsi_subtitling_dr_t *p_sub = dvbpsi_DecodeSubtitlingDr( p_dr ); + 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 <= 0x14 ) || + ( i_type >= 0x20 && i_type <= 0x24 ) ) + i_page++; + } +#endif + + if( !p_demux->p_sys->b_split_es || i_page <= 0 ) + { + p_fmt->subs.dvb.i_id = -1; + p_fmt->psz_description = strdup( _("DVB subtitles") ); + + if( !p_demux->p_sys->b_split_es && p_dr && p_dr->i_length > 0 ) + { + /* Descriptor pass-through */ + p_fmt->p_extra = malloc( p_dr->i_length ); + if( p_fmt->p_extra ) + { + p_fmt->i_extra = p_dr->i_length; + memcpy( p_fmt->p_extra, p_dr->p_data, p_dr->i_length ); + } + } + } + else + { +#ifdef _DVBPSI_DR_59_H_ + for( int i = 0; i < p_sub->i_subtitles_number; i++ ) + { + ts_es_t *p_es; + + /* */ + if( i == 0 ) + { + p_es = pid->es; + } + else + { + p_es = malloc( sizeof(*p_es) ); + if( !p_es ) + break; + + es_format_Copy( &p_es->fmt, &pid->es->fmt ); + free( p_es->fmt.psz_language ); + free( p_es->fmt.psz_description ); + p_es->fmt.psz_language = NULL; + p_es->fmt.psz_description = NULL; + + p_es->id = NULL; + p_es->p_pes = NULL; + p_es->i_pes_size = 0; + p_es->i_pes_gathered = 0; + p_es->pp_last = &p_es->p_pes; + p_es->p_mpeg4desc = NULL; + p_es->b_gather = false; + + TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es ); + } + + /* */ + const dvbpsi_subtitle_t *p = &p_sub->p_subtitle[i]; + p_es->fmt.psz_language = strndup( p->i_iso6392_language_code, 3 ); + switch( p->i_subtitling_type ) + { + case 0x10: /* unspec. */ + 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: + break; + } + + /* Hack, FIXME */ + p_es->fmt.subs.dvb.i_id = ( p->i_composition_page_id << 0 ) | + ( p->i_ancillary_page_id << 16 ); + } +#endif + } +} +static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid, + const dvbpsi_pmt_es_t *p_es ) +{ + es_format_t *p_fmt = &pid->es->fmt; + + if( PMTEsHasRegistration( p_demux, p_es, "AC-3" ) || + PMTEsFindDescriptor( p_es, 0x6a ) || + PMTEsFindDescriptor( p_es, 0x81 ) ) + { + p_fmt->i_cat = AUDIO_ES; + p_fmt->i_codec = VLC_CODEC_A52; + } + else if( PMTEsFindDescriptor( p_es, 0x7a ) ) + { + /* DVB with stream_type 0x06 (ETS EN 300 468) */ + p_fmt->i_cat = AUDIO_ES; + p_fmt->i_codec = VLC_CODEC_EAC3; + } + else if( PMTEsHasRegistration( p_demux, p_es, "DTS1" ) || + PMTEsHasRegistration( p_demux, p_es, "DTS2" ) || + PMTEsHasRegistration( p_demux, p_es, "DTS3" ) || + PMTEsFindDescriptor( p_es, 0x73 ) ) + { + /*registration descriptor(ETSI TS 101 154 Annex F)*/ + p_fmt->i_cat = AUDIO_ES; + p_fmt->i_codec = VLC_CODEC_DTS; + } + else if( PMTEsHasRegistration( p_demux, p_es, "BSSD" ) ) + { + p_fmt->i_cat = AUDIO_ES; + p_fmt->b_packetized = true; + p_fmt->i_codec = VLC_CODEC_302M; + } + else + { + /* Subtitle/Teletext/VBI fallbacks */ + dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 ); + +#ifdef _DVBPSI_DR_59_H_ + dvbpsi_subtitling_dr_t *p_sub; + if( p_dr && ( p_sub = dvbpsi_DecodeSubtitlingDr( p_dr ) ) ) + { + for( int i = 0; i < p_sub->i_subtitles_number; i++ ) + { + if( p_fmt->i_cat != UNKNOWN_ES ) + break; + + switch( p_sub->p_subtitle[i].i_subtitling_type ) + { + case 0x01: /* EBU Teletext subtitles */ + case 0x02: /* Associated EBU Teletext */ + case 0x03: /* VBI data */ + PMTSetupEsTeletext( p_demux, pid, p_es ); + break; + case 0x10: /* DVB Subtitle (normal) with no monitor AR critical */ + 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 (0x%x)", + p_sub->p_subtitle[i].i_subtitling_type ); + break; + } + } + } +#else + if( p_fmt->i_cat == UNKNOWN_ES && p_dr ) + PMTSetupEsDvbSubtitle( p_demux, pid, p_es ); +#endif + if( p_fmt->i_cat == UNKNOWN_ES && + ( PMTEsFindDescriptor( p_es, 0x45 ) || /* VBI Data descriptor */ + PMTEsFindDescriptor( p_es, 0x46 ) || /* VBI Teletext descriptor */ + PMTEsFindDescriptor( p_es, 0x56 ) ) ) /* EBU Teletext descriptor */ + { + /* Teletext/VBI */ + PMTSetupEsTeletext( p_demux, pid, p_es ); + } + } + +#ifdef _DVBPSI_DR_52_H_ + /* FIXME is it useful ? */ + if( PMTEsFindDescriptor( p_es, 0x52 ) ) + { + dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x52 ); + dvbpsi_stream_identifier_dr_t *p_si = dvbpsi_DecodeStreamIdentifierDr( p_dr ); + + msg_Dbg( p_demux, " * Stream Component Identifier: %d", p_si->i_component_tag ); + } +#endif +} + +static void PMTSetupEs0xEA( demux_t *p_demux, ts_pid_t *pid, + const dvbpsi_pmt_es_t *p_es ) +{ + /* Registration Descriptor */ + if( !PMTEsHasRegistration( p_demux, p_es, "VC-1" ) ) + { + msg_Err( p_demux, "Registration descriptor not found or invalid" ); + return; + } + + es_format_t *p_fmt = &pid->es->fmt; + + /* registration descriptor for VC-1 (SMPTE rp227) */ + p_fmt->i_cat = VIDEO_ES; + p_fmt->i_codec = VLC_CODEC_VC1; + + /* XXX With Simple and Main profile the SEQUENCE + * header is modified: video width and height are + * inserted just after the start code as 2 int16_t + * The packetizer will take care of that. */ +} + +static void PMTSetupEs0xD1( demux_t *p_demux, ts_pid_t *pid, + const dvbpsi_pmt_es_t *p_es ) +{ + /* Registration Descriptor */ + if( !PMTEsHasRegistration( p_demux, p_es, "drac" ) ) + { + msg_Err( p_demux, "Registration descriptor not found or invalid" ); + return; + } + + es_format_t *p_fmt = &pid->es->fmt; + + /* registration descriptor for Dirac + * (backwards compatable with VC-2 (SMPTE Sxxxx:2008)) */ + p_fmt->i_cat = VIDEO_ES; + p_fmt->i_codec = VLC_CODEC_DIRAC; +} + +static void PMTSetupEs0xA0( demux_t *p_demux, ts_pid_t *pid, + const dvbpsi_pmt_es_t *p_es ) +{ + /* MSCODEC sent by vlc */ + dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0xa0 ); + if( !p_dr || p_dr->i_length < 10 ) + { + msg_Warn( p_demux, + "private MSCODEC (vlc) without bih private descriptor" ); + return; + } + + es_format_t *p_fmt = &pid->es->fmt; + p_fmt->i_cat = VIDEO_ES; + p_fmt->i_codec = VLC_FOURCC( p_dr->p_data[0], p_dr->p_data[1], + p_dr->p_data[2], p_dr->p_data[3] ); + p_fmt->video.i_width = GetWBE( &p_dr->p_data[4] ); + p_fmt->video.i_height = GetWBE( &p_dr->p_data[6] ); + p_fmt->i_extra = GetWBE( &p_dr->p_data[8] ); + + if( p_fmt->i_extra > 0 ) + { + p_fmt->p_extra = malloc( p_fmt->i_extra ); + if( p_fmt->p_extra ) + memcpy( p_fmt->p_extra, &p_dr->p_data[10], + __MIN( p_fmt->i_extra, p_dr->i_length - 10 ) ); + else + p_fmt->i_extra = 0; + } + /* For such stream we will gather them ourself and don't launch a + * packetizer. + * Yes it's ugly but it's the only way to have DIV3 working */ + p_fmt->b_packetized = true; +} + +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 */ + switch( p_es->i_type ) + { + case 0x80: + p_fmt->i_cat = AUDIO_ES; + p_fmt->i_codec = VLC_CODEC_BD_LPCM; + break; + case 0x82: + case 0x85: /* DTS-HD High resolution audio */ + case 0x86: /* DTS-HD Master audio */ + case 0xA2: /* Secondary DTS audio */ + p_fmt->i_cat = AUDIO_ES; + p_fmt->i_codec = VLC_CODEC_DTS; + break; + + case 0x83: /* TrueHD AC3 */ + p_fmt->i_cat = AUDIO_ES; + p_fmt->i_codec = VLC_CODEC_TRUEHD; + break; + + case 0x84: /* 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: + break; + } +} + +static void PMTSetupEsRegistration( demux_t *p_demux, ts_pid_t *pid, + const dvbpsi_pmt_es_t *p_es ) +{ + static const struct + { + char psz_tag[5]; + int i_cat; + vlc_fourcc_t i_codec; + } p_regs[] = { + { "AC-3", AUDIO_ES, VLC_CODEC_A52 }, + { "DTS1", AUDIO_ES, VLC_CODEC_DTS }, + { "DTS2", AUDIO_ES, VLC_CODEC_DTS }, + { "DTS3", AUDIO_ES, VLC_CODEC_DTS }, + { "BSSD", AUDIO_ES, VLC_CODEC_302M }, + { "VC-1", VIDEO_ES, VLC_CODEC_VC1 }, + { "drac", VIDEO_ES, VLC_CODEC_DIRAC }, + { "", UNKNOWN_ES, 0 } + }; + es_format_t *p_fmt = &pid->es->fmt; + + for( int i = 0; p_regs[i].i_cat != UNKNOWN_ES; i++ ) + { + if( PMTEsHasRegistration( p_demux, p_es, p_regs[i].psz_tag ) ) + { + p_fmt->i_cat = p_regs[i].i_cat; + p_fmt->i_codec = p_regs[i].i_codec; + break; + } + } +} + +static void PMTParseEsIso639( demux_t *p_demux, ts_pid_t *pid, + const dvbpsi_pmt_es_t *p_es ) +{ + /* get language descriptor */ + dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x0a ); + + if( !p_dr ) + return; + + dvbpsi_iso639_dr_t *p_decoded = dvbpsi_DecodeISO639Dr( p_dr ); + if( !p_decoded ) + { + msg_Err( p_demux, "Failed to decode a ISO 639 descriptor" ); + return; + } + +#if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2) + pid->es->fmt.psz_language = malloc( 4 ); + if( pid->es->fmt.psz_language ) + { + memcpy( pid->es->fmt.psz_language, + p_decoded->code[0].iso_639_code, 3 ); + pid->es->fmt.psz_language[3] = 0; + msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language); } - else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 && - ( i_table_id == 0x4e || /* Current/Following */ - (i_table_id >= 0x50 && i_table_id <= 0x5f) ) ) /* Schedule */ + switch( p_decoded->code[0].i_audio_type ) { - msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", - i_table_id, i_table_id, i_extension, i_extension ); + case 0: + pid->es->fmt.psz_description = NULL; + break; + case 1: + pid->es->fmt.psz_description = + strdup(_("clean effects")); + break; + case 2: + pid->es->fmt.psz_description = + strdup(_("hearing impaired")); + break; + case 3: + pid->es->fmt.psz_description = + strdup(_("visual impaired commentary")); + break; + default: + msg_Dbg( p_demux, "unknown audio type: %d", + p_decoded->code[0].i_audio_type); + pid->es->fmt.psz_description = NULL; + break; + } + pid->es->fmt.i_extra_languages = p_decoded->i_code_count-1; + if( pid->es->fmt.i_extra_languages > 0 ) + pid->es->fmt.p_extra_languages = + malloc( sizeof(*pid->es->fmt.p_extra_languages) * + pid->es->fmt.i_extra_languages ); + if( pid->es->fmt.p_extra_languages ) + { + for( int i = 0; i < pid->es->fmt.i_extra_languages; i++ ) + { + msg_Dbg( p_demux, "bang" ); + pid->es->fmt.p_extra_languages[i].psz_language = + malloc(4); + if( pid->es->fmt.p_extra_languages[i].psz_language ) + { + memcpy( pid->es->fmt.p_extra_languages[i].psz_language, + p_decoded->code[i+1].iso_639_code, 3 ); + pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0'; + } + switch( p_decoded->code[i].i_audio_type ) + { + case 0: + pid->es->fmt.p_extra_languages[i].psz_description = + NULL; + break; + case 1: + pid->es->fmt.p_extra_languages[i].psz_description = + strdup(_("clean effects")); + break; + case 2: + pid->es->fmt.p_extra_languages[i].psz_description = + strdup(_("hearing impaired")); + break; + case 3: + pid->es->fmt.p_extra_languages[i].psz_description = + strdup(_("visual impaired commentary")); + break; + default: + msg_Dbg( p_demux, "unknown audio type: %d", + p_decoded->code[i].i_audio_type); + pid->es->fmt.psz_description = NULL; + break; + } - dvbpsi_AttachEIT( h, i_table_id, i_extension, - (dvbpsi_eit_callback)EITCallBack, p_demux ); + } + } +#else + pid->es->fmt.psz_language = malloc( 4 ); + if( pid->es->fmt.psz_language ) + { + memcpy( pid->es->fmt.psz_language, + p_decoded->i_iso_639_code, 3 ); + pid->es->fmt.psz_language[3] = 0; } -} #endif +} static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) { @@ -3028,13 +3928,13 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ts_prg_psi_t *prg = NULL; ts_pid_t **pp_clean = NULL; - int i_clean = 0, i; + int i_clean = 0; bool b_hdmv = false; msg_Dbg( p_demux, "PMTCallBack called" ); /* First find this PMT declared in PAT */ - for( i = 0; i < p_sys->i_pmt; i++ ) + for( int i = 0; i < p_sys->i_pmt; i++ ) { int i_prg; for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ ) @@ -3047,7 +3947,8 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) break; } } - if( pmt ) break; + if( pmt ) + break; } if( pmt == NULL ) @@ -3065,7 +3966,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) } /* Clean this program (remove all es) */ - for( i = 0; i < 8192; i++ ) + for( int i = 0; i < 8192; i++ ) { ts_pid_t *pid = &p_sys->pid[i]; @@ -3086,14 +3987,13 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) prg->i_pid_pcr = p_pmt->i_pcr_pid; prg->i_version = p_pmt->i_version; - if( DVBProgramIsSelected( p_demux, prg->i_number ) ) + ValidateDVBMeta( p_demux, prg->i_pid_pcr ); + 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 ); + SetPIDFilter( p_demux, prg->i_pid_pcr, true ); } - else if ( p_sys->b_dvb_control ) + else { msg_Warn( p_demux, "skipping program (not selected)" ); dvbpsi_DeletePMT(p_pmt); @@ -3118,21 +4018,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; } } } @@ -3147,7 +4044,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ts_pid_t tmp_pid, *old_pid = 0, *pid = &tmp_pid; /* Find out if the PID was already declared */ - for( i = 0; i < i_clean; i++ ) + for( int i = 0; i < i_clean; i++ ) { if( pp_clean[i] == &p_sys->pid[p_es->i_pid] ) { @@ -3155,25 +4052,20 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) break; } } + ValidateDVBMeta( p_demux, p_es->i_pid ); if( !old_pid && p_sys->pid[p_es->i_pid].b_valid ) { - ts_pid_t *pid = &p_sys->pid[p_es->i_pid]; - if( ( pid->i_pid == 0x11 /* SDT */ || - pid->i_pid == 0x12 /* EDT */ ) && pid->psi ) - { - /* This doesn't look like a DVB stream so don't try - * parsing the SDT/EDT */ - dvbpsi_DetachDemux( pid->psi->handle ); - free( pid->psi ); - pid->psi = NULL; - } - else - { - msg_Warn( p_demux, "pmt error: pid=%d already defined", - p_es->i_pid ); - continue; - } + msg_Warn( p_demux, "pmt error: pid=%d already defined", + p_es->i_pid ); + continue; + } + + for( p_dr = p_es->p_first_descriptor; p_dr != NULL; + p_dr = p_dr->p_next ) + { + msg_Dbg( p_demux, " * es pid=%d type=%d dr->i_tag=0x%x", + p_es->i_pid, p_es->i_type, p_dr->i_tag ); } PIDInit( pid, false, pmt->psi ); @@ -3185,654 +4077,45 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) if( p_es->i_type == 0x10 || p_es->i_type == 0x11 || p_es->i_type == 0x12 || p_es->i_type == 0x0f ) { - /* MPEG-4 stream: search SL_DESCRIPTOR */ - dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;; - - while( p_dr && ( p_dr->i_tag != 0x1f ) ) p_dr = p_dr->p_next; - - if( p_dr && p_dr->i_length == 2 ) - { - int i_es_id = ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1]; - - msg_Warn( p_demux, "found SL_descriptor es_id=%d", i_es_id ); - - pid->es->p_mpeg4desc = NULL; - - for( i = 0; i < 255; i++ ) - { - iod_descriptor_t *iod = prg->iod; - - if( iod->es_descr[i].b_ok && - iod->es_descr[i].i_es_id == i_es_id ) - { - pid->es->p_mpeg4desc = &iod->es_descr[i]; - break; - } - } - } - - if( pid->es->p_mpeg4desc != NULL ) - { - decoder_config_descriptor_t *dcd = - &pid->es->p_mpeg4desc->dec_descr; - - if( dcd->i_streamType == 0x04 ) /* VisualStream */ - { - pid->es->fmt.i_cat = VIDEO_ES; - switch( dcd->i_objectTypeIndication ) - { - case 0x0B: /* mpeg4 sub */ - pid->es->fmt.i_cat = SPU_ES; - pid->es->fmt.i_codec = VLC_FOURCC('s','u','b','t'); - break; - - case 0x20: /* mpeg4 */ - pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','v'); - break; - case 0x21: /* h264 */ - pid->es->fmt.i_codec = VLC_FOURCC('h','2','6','4'); - break; - case 0x60: - case 0x61: - case 0x62: - case 0x63: - case 0x64: - case 0x65: /* mpeg2 */ - pid->es->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' ); - break; - case 0x6a: /* mpeg1 */ - pid->es->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' ); - break; - case 0x6c: /* mpeg1 */ - pid->es->fmt.i_codec = VLC_FOURCC( 'j','p','e','g' ); - break; - default: - pid->es->fmt.i_cat = UNKNOWN_ES; - break; - } - } - else if( dcd->i_streamType == 0x05 ) /* AudioStream */ - { - pid->es->fmt.i_cat = AUDIO_ES; - switch( dcd->i_objectTypeIndication ) - { - case 0x40: /* mpeg4 */ - pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','a'); - break; - case 0x66: - case 0x67: - case 0x68: /* mpeg2 aac */ - pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','a'); - break; - case 0x69: /* mpeg2 */ - pid->es->fmt.i_codec = VLC_FOURCC('m','p','g','a'); - break; - case 0x6b: /* mpeg1 */ - pid->es->fmt.i_codec = VLC_FOURCC('m','p','g','a'); - break; - default: - pid->es->fmt.i_cat = UNKNOWN_ES; - break; - } - } - else - { - pid->es->fmt.i_cat = UNKNOWN_ES; - } - - if( pid->es->fmt.i_cat != UNKNOWN_ES ) - { - pid->es->fmt.i_extra = dcd->i_decoder_specific_info_len; - if( pid->es->fmt.i_extra > 0 ) - { - pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra ); - if( pid->es->fmt.p_extra ) - memcpy( pid->es->fmt.p_extra, - dcd->p_decoder_specific_info, - pid->es->fmt.i_extra ); - } - } - } + PMTSetupEsISO14496( p_demux, pid, prg, p_es ); } else if( p_es->i_type == 0x06 ) { - dvbpsi_descriptor_t *p_dr; - - for( p_dr = p_es->p_first_descriptor; p_dr != NULL; - p_dr = p_dr->p_next ) - { - msg_Dbg( p_demux, " * es pid=%d type=%d dr->i_tag=0x%x", - p_es->i_pid, p_es->i_type, p_dr->i_tag ); - - if( p_dr->i_tag == 0x05 ) - { - /* Registration Descriptor */ - if( p_dr->i_length != 4 ) - { - msg_Warn( p_demux, "invalid Registration Descriptor" ); - } - else - { - if( !memcmp( p_dr->p_data, "AC-3", 4 ) ) - { - /* ATSC with stream_type 0x81 (but this descriptor - * is then not mandatory */ - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.i_codec = VLC_FOURCC('a','5','2',' '); - } - else if( !memcmp( p_dr->p_data, "DTS1", 4 ) || - !memcmp( p_dr->p_data, "DTS2", 4 ) || - !memcmp( p_dr->p_data, "DTS3", 4 ) ) - { - /*registration descriptor(ETSI TS 101 154 Annex F)*/ - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.i_codec = VLC_FOURCC('d','t','s',' '); - } - else if( !memcmp( p_dr->p_data, "BSSD", 4 ) ) - { - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.b_packetized = true; - pid->es->fmt.i_codec = VLC_FOURCC('a','e','s','3'); - } - else - { - msg_Warn( p_demux, - "unknown Registration Descriptor (%4.4s)", - p_dr->p_data ); - } - } - - } - else if( p_dr->i_tag == 0x6a ) - { - /* DVB with stream_type 0x06 */ - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); - } - else if( p_dr->i_tag == 0x81 ) - { - /* ATSC with stream_type 0x06 */ - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); - } - else if( p_dr->i_tag == 0x7a ) - { - /* DVB with stream_type 0x06 (ETS EN 300 468) */ - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.i_codec = VLC_FOURCC( 'e', 'a', 'c', '3' ); - } - else if( p_dr->i_tag == 0x73 ) - { - /* DTS audio descriptor (ETSI TS 101 154 Annex F) */ - msg_Dbg( p_demux, " * DTS audio descriptor not decoded" ); - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' ); - } - else if( p_dr->i_tag == 0x45 ) - { - msg_Dbg( p_demux, " * VBI Data descriptor" ); - /* FIXME : store the information somewhere */ - } - else if( p_dr->i_tag == 0x46 ) - { - msg_Dbg( p_demux, " * VBI Teletext descriptor" ); - /* FIXME : store the information somewhere */ - } -#ifdef _DVBPSI_DR_52_H_ - else if( p_dr->i_tag == 0x52 ) - { - dvbpsi_stream_identifier_dr_t *si; - si = dvbpsi_DecodeStreamIdentifierDr( p_dr ); - - msg_Dbg( p_demux, " * Stream Component Identifier: %d", si->i_component_tag ); - } -#endif - else if( p_dr->i_tag == 0x56 ) - { - msg_Dbg( p_demux, " * EBU Teletext descriptor" ); - pid->es->fmt.i_cat = SPU_ES; - pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' ); - pid->es->fmt.i_extra = p_dr->i_length; - pid->es->fmt.p_extra = p_dr->i_length ? - malloc( p_dr->i_length ) : NULL; - if( pid->es->fmt.p_extra ) - memcpy( pid->es->fmt.p_extra, p_dr->p_data, - p_dr->i_length ); - -#if defined _DVBPSI_DR_56_H_ && defined DVBPSI_VERSION \ - && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5) - pid->es->fmt.i_group = p_pmt->i_program_number; - - /* In stream output mode, only enable descriptor - * pass-through. */ - if( !p_demux->out->b_sout ) - { - uint16_t n, i = 0; - dvbpsi_teletext_dr_t *sub; - - sub = dvbpsi_DecodeTeletextDr( p_dr ); - if( !sub ) continue; - - /* Each subtitle ES contains n languages, - * We are going to create n ES for the n tracks */ - for( n = 0; n < sub->i_pages_number; n++ ) - { - dvbpsi_teletextpage_t *p_page = &sub->p_pages[n]; - if( p_page->i_teletext_type > 0x0 && - p_page->i_teletext_type < 0x6 ) - { - ts_es_t *p_es; - - if( i == 0 ) - { - p_es = pid->es; - } - else - { - p_es = malloc( sizeof( ts_es_t ) ); - if( !p_es ) break; - - es_format_Copy( &p_es->fmt, &pid->es->fmt ); - free( p_es->fmt.psz_language ); - free( p_es->fmt.psz_description ); - p_es->fmt.psz_language = NULL; - p_es->fmt.psz_description = NULL; - p_es->id = NULL; - p_es->p_pes = NULL; - p_es->i_pes_size = 0; - p_es->i_pes_gathered = 0; - p_es->pp_last = &p_es->p_pes; - p_es->p_mpeg4desc = NULL; - - TAB_APPEND( pid->i_extra_es, pid->extra_es, - p_es ); - } - - p_es->fmt.psz_language = malloc( 4 ); - if( p_es->fmt.psz_language ) - { - memcpy( p_es->fmt.psz_language, - p_page->i_iso6392_language_code, 3 ); - p_es->fmt.psz_language[3] = 0; - } - p_es->fmt.psz_description = strdup(_(ppsz_teletext_type[p_page->i_teletext_type])); - - msg_Dbg( p_demux, - " * ttxt type=%s lan=%s page=%d%02x", - p_es->fmt.psz_description, - p_es->fmt.psz_language, - p_page->i_teletext_magazine_number, - p_page->i_teletext_page_number ); - - /* Hack, FIXME This stores the initial page for this track, - so that it can be used by the telx and zvbi decoders. */ - p_es->fmt.subs.dvb.i_id = - p_page->i_teletext_page_number; - p_es->fmt.subs.dvb.i_id |= - ((int)p_page->i_teletext_magazine_number << 16); - - i++; - } - } - - if( !i ) - pid->es->fmt.i_cat = UNKNOWN_ES; - } - else -#endif /* defined _DVBPSI_DR_56_H_ && DVBPSI_VERSION(0,1,6) */ - { - pid->es->fmt.subs.dvb.i_id = -1; - pid->es->fmt.psz_description = strdup( _(ppsz_teletext_type[1]) ); - } - } - else if( p_dr->i_tag == 0x59 ) - { - /* DVB subtitles */ - pid->es->fmt.i_cat = SPU_ES; - pid->es->fmt.i_codec = VLC_FOURCC( 'd', 'v', 'b', 's' ); - pid->es->fmt.i_extra = p_dr->i_length; - pid->es->fmt.p_extra = malloc( p_dr->i_length ); - if( pid->es->fmt.p_extra ) - memcpy( pid->es->fmt.p_extra, p_dr->p_data, - p_dr->i_length ); - -#ifdef _DVBPSI_DR_59_H_ - pid->es->fmt.i_group = p_pmt->i_program_number; - - /* In stream output mode, only enable descriptor - * pass-through. */ - if( !p_demux->out->b_sout ) - { - uint16_t n, i = 0; - dvbpsi_subtitling_dr_t *sub; - - sub = dvbpsi_DecodeSubtitlingDr( p_dr ); - if( !sub ) continue; - - for( n = 0; n < sub->i_subtitles_number; n++ ) - { - dvbpsi_subtitle_t *p_sub = &sub->p_subtitle[n]; - ts_es_t *p_es; - - if( i == 0 ) - { - p_es = pid->es; - } - else - { - p_es = malloc( sizeof( ts_es_t ) ); - if( !p_es ) break; - es_format_Copy( &p_es->fmt, &pid->es->fmt ); - free( p_es->fmt.psz_language ); p_es->fmt.psz_language = NULL; - free( p_es->fmt.psz_description ); p_es->fmt.psz_description = NULL; - - p_es->id = NULL; - p_es->p_pes = NULL; - p_es->i_pes_size = 0; - p_es->i_pes_gathered = 0; - p_es->pp_last = &p_es->p_pes; - p_es->p_mpeg4desc = NULL; - - TAB_APPEND( pid->i_extra_es, pid->extra_es, - p_es ); - } - - p_es->fmt.psz_language = malloc( 4 ); - if( p_es->fmt.psz_language ) - { - memcpy( p_es->fmt.psz_language, - p_sub->i_iso6392_language_code, 3 ); - p_es->fmt.psz_language[3] = 0; - } - - switch( p_sub->i_subtitling_type ) - { - case 0x10: /* unspec. */ - case 0x11: /* 4:3 */ - case 0x12: /* 16:9 */ - case 0x13: /* 2.21:1 */ - 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 */ - p_es->fmt.psz_description = - strdup(_("DVB subtitles: hearing impaired")); - break; - default: - break; - } - - p_es->fmt.subs.dvb.i_id = - p_sub->i_composition_page_id; - /* Hack, FIXME */ - p_es->fmt.subs.dvb.i_id |= - ((int)p_sub->i_ancillary_page_id << 16); - - i++; - } - - if( !i ) - pid->es->fmt.i_cat = UNKNOWN_ES; - } - else -#endif /* _DVBPSI_DR_59_H_ */ - { - pid->es->fmt.subs.dvb.i_id = -1; - pid->es->fmt.psz_description = strdup( _("DVB subtitles") ); - } - } - } + PMTSetupEs0x06( p_demux, pid, p_es ); } else if( p_es->i_type == 0xEA ) { - dvbpsi_descriptor_t *p_dr; - - for( p_dr = p_es->p_first_descriptor; p_dr != NULL; - p_dr = p_dr->p_next ) - { - msg_Dbg( p_demux, " * es pid=%d type=%d dr->i_tag=0x%x", - p_es->i_pid, p_es->i_type, p_dr->i_tag ); - - if( p_dr->i_tag == 0x05 ) - { - /* Registration Descriptor */ - if( p_dr->i_length < 4 ) // XXX VC-1 has extended this descriptor with sub-descriptor - { - msg_Warn( p_demux, "invalid Registration Descriptor" ); - } - else - { - if( !memcmp( p_dr->p_data, "VC-1", 4 ) ) - { - /* registration descriptor for VC-1 (SMPTE rp227) */ - pid->es->fmt.i_cat = VIDEO_ES; - pid->es->fmt.i_codec = VLC_FOURCC('W','V','C','1'); - - /* XXX With Simple and Main profile the SEQUENCE - * header is modified: video width and height are - * inserted just after the start code as 2 int16_t - * The packetizer will take care of that. */ - } - else - { - msg_Warn( p_demux, - "unknown Registration Descriptor (%4.4s)", - p_dr->p_data ); - } - } - } - } + PMTSetupEs0xEA( p_demux, pid, p_es ); } else if( p_es->i_type == 0xd1 ) { - dvbpsi_descriptor_t *p_dr; - - for( p_dr = p_es->p_first_descriptor; p_dr != NULL; - p_dr = p_dr->p_next ) - { - msg_Dbg( p_demux, " * es pid=%d type=%d dr->i_tag=0x%x", - p_es->i_pid, p_es->i_type, p_dr->i_tag ); - - if( p_dr->i_tag == 0x05 ) - { - /* Registration Descriptor */ - if( !memcmp( p_dr->p_data, "drac", 4 ) ) - { - /* registration descriptor for Dirac - * (backwards compatable with VC-2 (SMPTE Sxxxx:2008)) */ - pid->es->fmt.i_cat = VIDEO_ES; - pid->es->fmt.i_codec = VLC_FOURCC('d','r','a','c'); - } - else - { - msg_Warn( p_demux, - "unknown Registration Descriptor (%4.4s)", - p_dr->p_data ); - } - } - } + PMTSetupEs0xD1( p_demux, pid, p_es ); } else if( p_es->i_type == 0xa0 ) { - /* MSCODEC sent by vlc */ - dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor; - - while( p_dr && ( p_dr->i_tag != 0xa0 ) ) p_dr = p_dr->p_next; - - if( p_dr && p_dr->i_length >= 8 ) - { - pid->es->fmt.i_cat = VIDEO_ES; - pid->es->fmt.i_codec = - VLC_FOURCC( p_dr->p_data[0], p_dr->p_data[1], - p_dr->p_data[2], p_dr->p_data[3] ); - pid->es->fmt.video.i_width = - ( p_dr->p_data[4] << 8 ) | p_dr->p_data[5]; - pid->es->fmt.video.i_height = - ( p_dr->p_data[6] << 8 ) | p_dr->p_data[7]; - pid->es->fmt.i_extra = - (p_dr->p_data[8] << 8) | p_dr->p_data[9]; - - if( pid->es->fmt.i_extra > 0 ) - { - pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra ); - if( pid->es->fmt.p_extra ) - memcpy( pid->es->fmt.p_extra, &p_dr->p_data[10], - pid->es->fmt.i_extra ); - } - } - else - { - msg_Warn( p_demux, "private MSCODEC (vlc) without bih private " - "descriptor" ); - } - /* For such stream we will gather them ourself and don't launch a - * packetizer. - * Yes it's ugly but it's the only way to have DIV3 working */ - pid->es->fmt.b_packetized = true; + PMTSetupEs0xA0( p_demux, pid, p_es ); } else if( b_hdmv ) { - /* Blu-Ray mapping */ - switch( p_es->i_type ) - { - case 0x80: - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.i_codec = VLC_FOURCC( 'b', 'p', 'c', 'm' ); - break; - case 0x82: - case 0x85: /* DTS-HD High resolution audio */ - case 0x86: /* DTS-HD Master audio */ - case 0xA2: /* Secondary DTS audio */ - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' ); - break; - - case 0x83: /* TrueHD AC3 */ - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.i_codec = VLC_FOURCC( 'm', 'l', 'p', ' ' ); - break; - - case 0x84: /* E-AC3 */ - case 0x87: /* E-AC3 */ - case 0xA1: /* Secondary E-AC3 */ - pid->es->fmt.i_cat = AUDIO_ES; - pid->es->fmt.i_codec = VLC_FOURCC( 'e', 'a', 'c', '3' ); - break; - case 0x90: /* Presentation graphics */ - case 0x91: /* Interactive graphics */ - case 0x92: /* Subtitle */ - default: - break; - } + PMTSetupEsHDMV( p_demux, pid, p_es ); + } + else if( p_es->i_type >= 0x80 ) + { + PMTSetupEsRegistration( p_demux, pid, p_es ); } if( pid->es->fmt.i_cat == AUDIO_ES || ( pid->es->fmt.i_cat == SPU_ES && - pid->es->fmt.i_codec != VLC_FOURCC('d','v','b','s') && - pid->es->fmt.i_codec != VLC_FOURCC('t','e','l','x') ) ) + pid->es->fmt.i_codec != VLC_CODEC_DVBS && + pid->es->fmt.i_codec != VLC_CODEC_TELETEXT ) ) { - /* get language descriptor */ - dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor; - while( p_dr && ( p_dr->i_tag != 0x0a ) ) p_dr = p_dr->p_next; - - if( p_dr ) - { - dvbpsi_iso639_dr_t *p_decoded = dvbpsi_DecodeISO639Dr( p_dr ); - - if( p_decoded ) - { -#if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2) - pid->es->fmt.psz_language = malloc( 4 ); - if( pid->es->fmt.psz_language ) - { - memcpy( pid->es->fmt.psz_language, - p_decoded->code[0].iso_639_code, 3 ); - pid->es->fmt.psz_language[3] = 0; - msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language); - } - switch( p_decoded->code[0].i_audio_type ) { - case 0: - pid->es->fmt.psz_description = NULL; - break; - case 1: - pid->es->fmt.psz_description = - strdup(_("clean effects")); - break; - case 2: - pid->es->fmt.psz_description = - strdup(_("hearing impaired")); - break; - case 3: - pid->es->fmt.psz_description = - strdup(_("visual impaired commentary")); - break; - default: - msg_Dbg( p_demux, "unknown audio type: %d", - p_decoded->code[0].i_audio_type); - pid->es->fmt.psz_description = NULL; - break; - } - pid->es->fmt.i_extra_languages = p_decoded->i_code_count-1; - if( pid->es->fmt.i_extra_languages > 0 ) - pid->es->fmt.p_extra_languages = - malloc( sizeof(*pid->es->fmt.p_extra_languages) * - pid->es->fmt.i_extra_languages ); - if( pid->es->fmt.p_extra_languages ) - { - for( i = 0; i < pid->es->fmt.i_extra_languages; i++ ) - { - msg_Dbg( p_demux, "bang" ); - pid->es->fmt.p_extra_languages[i].psz_language = - malloc(4); - if( pid->es->fmt.p_extra_languages[i].psz_language ) - { - memcpy( pid->es->fmt.p_extra_languages[i].psz_language, - p_decoded->code[i+1].iso_639_code, 3 ); - pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0'; - } - switch( p_decoded->code[i].i_audio_type ) { - case 0: - pid->es->fmt.p_extra_languages[i].psz_description = - NULL; - break; - case 1: - pid->es->fmt.p_extra_languages[i].psz_description = - strdup(_("clean effects")); - break; - case 2: - pid->es->fmt.p_extra_languages[i].psz_description = - strdup(_("hearing impaired")); - break; - case 3: - pid->es->fmt.p_extra_languages[i].psz_description = - strdup(_("visual impaired commentary")); - break; - default: - msg_Dbg( p_demux, "unknown audio type: %d", - p_decoded->code[i].i_audio_type); - pid->es->fmt.psz_description = NULL; - break; - } - - } - } -#else - pid->es->fmt.psz_language = malloc( 4 ); - if( pid->es->fmt.psz_language ) - { - memcpy( pid->es->fmt.psz_language, - p_decoded->i_iso_639_code, 3 ); - pid->es->fmt.psz_language[3] = 0; - } -#endif - } - } + PMTParseEsIso639( p_demux, pid, p_es ); } pid->es->fmt.i_group = p_pmt->i_program_number; + for( int i = 0; i < pid->i_extra_es; i++ ) + pid->extra_es[i]->fmt.i_group = p_pmt->i_program_number; + if( pid->es->fmt.i_cat == UNKNOWN_ES ) { msg_Dbg( p_demux, " * es pid=%d type=%d *unknown*", @@ -3860,7 +4143,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) { pid->es->id = old_pid->es->id; old_pid->es->id = NULL; - for( i = 0; i < pid->i_extra_es; i++ ) + for( int i = 0; i < pid->i_extra_es; i++ ) { pid->extra_es[i]->id = old_pid->extra_es[i]->id; old_pid->extra_es[i]->id = NULL; @@ -3870,73 +4153,62 @@ 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; } pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt ); - for( i = 0; i < pid->i_extra_es; i++ ) + for( int i = 0; i < pid->i_extra_es; i++ ) { 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; - for( p_dr = p_es->p_first_descriptor; p_dr != NULL; - p_dr = p_dr->p_next ) + p_dr = PMTEsFindDescriptor( p_es, 0x09 ); + if( p_dr && p_dr->i_length >= 2 ) { - if( p_dr->i_tag == 0x9 ) - { - uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8) - | p_dr->p_data[1]; - msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", - i_sysid ); - } + uint16_t i_sysid = (p_dr->p_data[0] << 8) | p_dr->p_data[1]; + msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", + i_sysid ); } - if( DVBProgramIsSelected( p_demux, prg->i_number ) - && (pid->es->id != NULL || p_sys->b_udp_out) ) + if( ProgramIsSelected( p_demux, prg->i_number ) && + ( 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 ); } } - if( DVBProgramIsSelected( 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 ( i = 0; i < i_clean; i++ ) + for( int i = 0; i < i_clean; i++ ) { - if( DVBProgramIsSelected( p_demux, prg->i_number ) ) + 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 ); + if( i_clean ) + free( pp_clean ); } static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) @@ -3944,7 +4216,6 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) demux_sys_t *p_sys = p_demux->p_sys; dvbpsi_pat_program_t *p_program; ts_pid_t *pat = &p_sys->pid[0]; - int i, j; msg_Dbg( p_demux, "PATCallBack called" ); @@ -3967,7 +4238,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) ts_pid_t **pmt_rm = NULL; /* Search pmt to be deleted */ - for( i = 0; i < p_sys->i_pmt; i++ ) + for( int i = 0; i < p_sys->i_pmt; i++ ) { ts_pid_t *pmt = p_sys->pmt[i]; bool b_keep = false; @@ -3977,8 +4248,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) { if( p_program->i_pid == pmt->i_pid ) { - int i_prg; - for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) + for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) { if( p_program->i_number == pmt->psi->prg[i_prg]->i_number ) @@ -3987,7 +4257,8 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) break; } } - if( b_keep ) break; + if( b_keep ) + break; } } @@ -3998,54 +4269,42 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) } /* Delete all ES attached to thoses PMT */ - for( i = 2; i < 8192; i++ ) + for( int i = 2; i < 8192; i++ ) { ts_pid_t *pid = &p_sys->pid[i]; - if( !pid->b_valid || pid->psi ) continue; + if( !pid->b_valid || pid->psi ) + continue; - for( j = 0; j < i_pmt_rm && pid->b_valid; j++ ) + for( int j = 0; j < i_pmt_rm && pid->b_valid; j++ ) { - int i_prg; - for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ ) + for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ ) { /* We only remove es that aren't defined by extra pmt */ - if( pid->p_owner->prg[i_prg]->i_pid_pmt != - pmt_rm[j]->i_pid ) continue; + if( pid->p_owner->prg[i_prg]->i_pid_pmt != pmt_rm[j]->i_pid ) + continue; - if( p_sys->b_dvb_control && pid->es->id ) - { - if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, i, - false ) ) - p_sys->b_dvb_control = false; - } + if( pid->es->id ) + SetPIDFilter( p_demux, i, false ); - PIDClean( p_demux->out, pid ); + PIDClean( p_demux, pid ); break; } } } /* Delete PMT pid */ - for( i = 0; i < i_pmt_rm; i++ ) + for( int i = 0; i < i_pmt_rm; i++ ) { - int i_prg; - if( p_sys->b_dvb_control ) - { - if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, - pmt_rm[i]->i_pid, false ) ) - p_sys->b_dvb_control = false; - } + SetPIDFilter( p_demux, pmt_rm[i]->i_pid, false ); - for( i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ ) + for( int i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ ) { const int i_number = pmt_rm[i]->psi->prg[i_prg]->i_number; 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] ); } @@ -4063,6 +4322,8 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) ts_pid_t *pmt = &p_sys->pid[p_program->i_pid]; bool b_add = true; + ValidateDVBMeta( p_demux, p_program->i_pid ); + if( pmt->b_valid ) { int i_prg; @@ -4093,18 +4354,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_dvb_control ) + if( ProgramIsSelected( p_demux, p_program->i_number ) ) { - if( DVBProgramIsSelected( p_demux, p_program->i_number ) ) - { - if( p_sys->i_dvb_program == 0 ) - p_sys->i_dvb_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_dvb_control = false; - } + if( SetPIDFilter( p_demux, p_program->i_pid, true ) ) + p_sys->b_access_control = false; } } }