X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fts.c;h=20f760ca51f57823e0eb2be6f40ecadad039e2f0;hb=9ea586416c5222941e6be69679d700427bdc9603;hp=68c67cd5f17b74a0bcf556d6479bb44ca8472432;hpb=001a4a94acc7c977144cbe1e6fa38355dc5b3a9b;p=vlc diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 68c67cd5f1..20f760ca51 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -33,6 +33,7 @@ #include "iso_lang.h" #include "network.h" +#include "charset.h" #include "../mux/mpeg/csa.h" @@ -73,6 +74,7 @@ * - ... */ +#define vlc_meta_Add(a,b,c) fprintf(stderr, "FIXME: TS demuxer meta is broken\n" ) /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -81,26 +83,29 @@ static void Close ( vlc_object_t * ); #define PMT_TEXT N_("Extra PMT") #define PMT_LONGTEXT N_( \ - "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])" ) + "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." ) #define PID_TEXT N_("Set id of ES to PID") -#define PID_LONGTEXT N_("set id of es to pid") +#define PID_LONGTEXT N_("Set the internal ID of each elementary stream" \ + " handled by VLC to the same value as the PID in" \ + " the TS stream, instead of 1, 2, 3, etc. Useful to" \ + " do \'#duplicate{..., select=\"es=\"}\'.") #define TSOUT_TEXT N_("Fast udp streaming") #define TSOUT_LONGTEXT N_( \ - "Sends TS to specific ip:port by udp (you must know what you are doing)") + "Sends TS to specific ip:port by udp (you must know what you are doing).") #define MTUOUT_TEXT N_("MTU for out mode") -#define MTUOUT_LONGTEXT N_("MTU for out mode") +#define MTUOUT_LONGTEXT N_("MTU for out mode.") #define CSA_TEXT N_("CSA ck") -#define CSA_LONGTEXT N_("CSA ck") +#define CSA_LONGTEXT N_("Control word for the CSA encryption algorithm") #define SILENT_TEXT N_("Silent mode") -#define SILENT_LONGTEXT N_("do not complain on encrypted PES") +#define SILENT_LONGTEXT N_("Do not complain on encrypted PES.") #define CAPMT_SYSID_TEXT N_("CAPMT System ID") -#define CAPMT_SYSID_LONGTEXT N_("only forward descriptors from this SysID to the CAM") +#define CAPMT_SYSID_LONGTEXT N_("Only forward descriptors from this SysID to the CAM.") #define CPKT_TEXT N_("Packet size in bytes to decrypt") #define CPKT_LONGTEXT N_("Specify the size of the TS packet to decrypt. " \ @@ -108,7 +113,7 @@ static void Close ( vlc_object_t * ); "decrypting. " ) #define TSDUMP_TEXT N_("Filename of dump") -#define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in") +#define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in.") #define APPEND_TEXT N_("Append") #define APPEND_LONGTEXT N_( \ @@ -127,12 +132,12 @@ vlc_module_begin(); set_subcategory( SUBCAT_INPUT_DEMUX ); add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, VLC_TRUE ); - add_bool( "ts-es-id-pid", 0, NULL, PID_TEXT, PID_LONGTEXT, VLC_TRUE ); + add_bool( "ts-es-id-pid", 1, NULL, PID_TEXT, PID_LONGTEXT, VLC_TRUE ); add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, VLC_TRUE ); add_integer( "ts-out-mtu", 1500, NULL, MTUOUT_TEXT, MTUOUT_LONGTEXT, VLC_TRUE ); add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, VLC_TRUE ); - add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE ); + add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE ); add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, VLC_TRUE ); add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, VLC_FALSE ); @@ -325,7 +330,7 @@ struct demux_sys_t FILE *p_file; /* filehandle */ uint64_t i_write; /* bytes written */ vlc_bool_t b_file_out; /* dump mode enabled */ - + /* */ vlc_bool_t b_meta; }; @@ -361,6 +366,7 @@ static void IODFree( iod_descriptor_t * ); #define TS_PACKET_SIZE_192 192 #define TS_PACKET_SIZE_204 204 #define TS_PACKET_SIZE_MAX 204 +#define TS_TOPFIELD_HEADER 1320 /***************************************************************************** * Open @@ -377,25 +383,42 @@ static int Open( vlc_object_t *p_this ) ts_pid_t *pat; char *psz_mode; vlc_bool_t b_append; + vlc_bool_t b_topfield = VLC_FALSE; vlc_value_t val; if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) < TS_PACKET_SIZE_MAX ) return VLC_EGENERIC; + if( p_peek[0] == 'T' && p_peek[1] == 'F' && + p_peek[2] == 'r' && p_peek[3] == 'c' ) + { + b_topfield = VLC_TRUE; + msg_Dbg( p_demux, "this is a topfield file" ); + } + /* Search first sync byte */ for( i_sync = 0; i_sync < TS_PACKET_SIZE_MAX; i_sync++ ) { if( p_peek[i_sync] == 0x47 ) break; } - if( i_sync >= TS_PACKET_SIZE_MAX ) + if( i_sync >= TS_PACKET_SIZE_MAX && !b_topfield ) { if( strcmp( p_demux->psz_demux, "ts" ) ) return VLC_EGENERIC; msg_Warn( p_demux, "this does not look like a TS stream, continuing" ); } - /* Check next 3 sync bytes */ - i_peek = TS_PACKET_SIZE_MAX * 3 + i_sync + 1; + if( b_topfield ) + { + /* Read the entire Topfield header */ + i_peek = TS_TOPFIELD_HEADER; + } + else + { + /* Check next 3 sync bytes */ + i_peek = TS_PACKET_SIZE_MAX * 3 + i_sync + 1; + } + if( ( stream_Peek( p_demux->s, &p_peek, i_peek ) ) < i_peek ) { msg_Err( p_demux, "cannot peek" ); @@ -423,6 +446,73 @@ static int Open( vlc_object_t *p_this ) { i_packet_size = TS_PACKET_SIZE_188; } + else if( b_topfield ) + { + i_packet_size = TS_PACKET_SIZE_188; +#if 0 + /* I used the TF5000PVR 2004 Firmware .doc header documentation, + * http://www.i-topfield.com/data/product/firmware/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc + * but after the filename the offsets seem to be incorrect. - DJ */ + int i_duration, i_name; + char *psz_name = malloc(25); + char *psz_event_name; + char *psz_event_text = malloc(130); + char *psz_ext_text = malloc(1025); + + // 2 bytes version Uimsbf (4,5) + // 2 bytes reserved (6,7) + // 2 bytes duration in minutes Uimsbf (8,9( + i_duration = (int) (p_peek[8] << 8) | p_peek[9]; + msg_Dbg( p_demux, "Topfield recording length: +/- %d minutes", i_duration); + // 2 bytes service number in channel list (10, 11) + // 2 bytes service type Bslbf 0=TV 1=Radio Bslb (12, 13) + // 4 bytes of reserved + tuner info (14,15,16,17) + // 2 bytes of Service ID Bslbf (18,19) + // 2 bytes of PMT PID Uimsbf (20,21) + // 2 bytes of PCR PID Uimsbf (22,23) + // 2 bytes of Video PID Uimsbf (24,25) + // 2 bytes of Audio PID Uimsbf (26,27) + // 24 bytes filename Bslbf + memcpy( psz_name, &p_peek[28], 24 ); + psz_name[24] = '\0'; + msg_Dbg( p_demux, "recordingname=%s", psz_name ); + // 1 byte of sat index Uimsbf (52) + // 3 bytes (1 bit of polarity Bslbf +23 bits reserved) + // 4 bytes of freq. Uimsbf (56,57,58,59) + // 2 bytes of symbol rate Uimsbf (60,61) + // 2 bytes of TS stream ID Uimsbf (62,63) + // 4 bytes reserved + // 2 bytes reserved + // 2 bytes duration Uimsbf (70,71) + //i_duration = (int) (p_peek[70] << 8) | p_peek[71]; + //msg_Dbg( p_demux, "Topfield 2nd duration field: +/- %d minutes", i_duration); + // 4 bytes EventID Uimsbf (72-75) + // 8 bytes of Start and End time info (76-83) + // 1 byte reserved (84) + // 1 byte event name length Uimsbf (89) + i_name = (int)(p_peek[89]&~0x81); + msg_Dbg( p_demux, "event name length = %d", i_name); + psz_event_name = malloc( i_name+1 ); + // 1 byte parental rating (90) + // 129 bytes of event text + memcpy( psz_event_name, &p_peek[91], i_name ); + psz_event_name[i_name] = '\0'; + memcpy( psz_event_text, &p_peek[91+i_name], 129-i_name ); + psz_event_text[129-i_name] = '\0'; + msg_Dbg( p_demux, "event name=%s", psz_event_name ); + msg_Dbg( p_demux, "event text=%s", psz_event_text ); + // 12 bytes reserved (220) + // 6 bytes reserved + // 2 bytes Event Text Length Uimsbf + // 4 bytes EventID Uimsbf + // FIXME We just have 613 bytes. not enough for this entire text + // 1024 bytes Extended Event Text Bslbf + memcpy( psz_ext_text, p_peek+372, 1024 ); + psz_ext_text[1024] = '\0'; + msg_Dbg( p_demux, "extended event text=%s", psz_ext_text ); + // 52 bytes reserved Bslbf +#endif + } else { msg_Warn( p_demux, "TS module discarded (lost sync)" ); @@ -455,7 +545,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 = fopen( p_sys->psz_file, psz_mode ) ) == NULL ) + else if( ( p_sys->p_file = utf8_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 = VLC_FALSE; @@ -500,6 +590,8 @@ static int Open( vlc_object_t *p_this ) pid->b_seen = VLC_FALSE; pid->b_valid = VLC_FALSE; } + /* PID 8191 is padding */ + p_sys->pid[8191].b_seen = VLC_TRUE; p_sys->i_packet_size = i_packet_size; p_sys->b_udp_out = VLC_FALSE; p_sys->i_ts_read = 50; @@ -561,7 +653,7 @@ static int Open( vlc_object_t *p_this ) if( i_port <= 0 ) i_port = 1234; msg_Dbg( p_demux, "resend ts to '%s:%d'", val.psz_string, i_port ); - p_sys->fd = net_OpenUDP( p_demux, "", 0, val.psz_string, i_port ); + p_sys->fd = net_ConnectUDP( p_demux, val.psz_string, i_port, 0 ); if( p_sys->fd < 0 ) { msg_Err( p_demux, "failed to open udp socket, send disabled" ); @@ -688,13 +780,13 @@ static int Open( vlc_object_t *p_this ) ck[0], ck[1], ck[2], ck[3], ck[4], ck[5], ck[6], ck[7] ); #endif p_sys->csa = csa_New(); - + if( p_sys->csa ) { vlc_value_t pkt_val; - + csa_SetCW( p_sys->csa, ck, ck ); - + var_Create( p_demux, "ts-csa-pkt", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); var_Get( p_demux, "ts-csa-pkt", &pkt_val ); if( pkt_val.i_int < 4 || pkt_val.i_int > 188 ) @@ -804,12 +896,13 @@ static void Close( vlc_object_t *p_this ) fclose( p_sys->p_file ); p_sys->p_file = NULL; } - free( p_sys->psz_file ); - p_sys->psz_file = NULL; free( p_sys->buffer ); } + free( p_sys->psz_file ); + p_sys->psz_file = NULL; + free( p_sys ); } @@ -817,18 +910,18 @@ static void Close( vlc_object_t *p_this ) * DemuxFile: *****************************************************************************/ 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; - + i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize ); if( (i_data <= 0) && (i_data < p_sys->i_packet_size) ) { - msg_Dbg( p_demux, "Error reading malformed packets" ); + msg_Dbg( p_demux, "error reading malformed packets" ); return i_data; } @@ -839,7 +932,7 @@ static int DemuxFile( demux_t *p_demux ) vlc_bool_t b_payload; /* indicates a packet with payload */ vlc_bool_t b_adaptation; /* adaptation field */ int i_cc = 0; /* continuity counter */ - + if( p_sys->buffer[i_pos] != 0x47 ) { msg_Warn( p_demux, "lost sync" ); @@ -852,7 +945,7 @@ static int DemuxFile( demux_t *p_demux ) if( !p_demux->b_die ) msg_Warn( p_demux, "sync found" ); } - + /* continuous when (one of this): * diff == 1 * diff == 0 and payload == 0 @@ -862,10 +955,10 @@ static int DemuxFile( demux_t *p_demux ) i_cc = p_buffer[i_pos+3]&0x0f; b_payload = p_buffer[i_pos+3]&0x10; 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] ]; - + /* Detect discontinuity indicator in adaptation field */ if( b_adaptation ) { @@ -874,7 +967,7 @@ static int DemuxFile( demux_t *p_demux ) if( p_buffer[i_pos+5]&0x40 ) msg_Warn( p_demux, "random access indicator (pid=%d) ", p_pid->i_pid ); } - + i_diff = ( i_cc - p_pid->i_cc )&0x0f; if( b_payload && i_diff == 1 ) { @@ -893,17 +986,17 @@ static int DemuxFile( demux_t *p_demux ) /* FIXME what to do when discontinuity_indicator is set ? */ msg_Warn( p_demux, "transport error detected 0x%x instead of 0x%x", i_cc, ( p_pid->i_cc + 1 )&0x0f ); - + p_pid->i_cc = i_cc; /* Mark transport error in the TS packet. */ p_buffer[i_pos+1] |= 0x80; } } - + /* Test if user wants to decrypt it first */ if( p_sys->csa ) csa_Decrypt( p_demux->p_sys->csa, &p_buffer[i_pos], p_demux->p_sys->i_csa_pkt_size ); - + i_pos += p_sys->i_packet_size; } @@ -1063,6 +1156,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) demux_sys_t *p_sys = p_demux->p_sys; double f, *pf; int64_t i64; + int64_t *pi64; int i_int; if( p_sys->b_file_out ) @@ -1114,6 +1208,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } *pi64 = 0; return VLC_EGENERIC; +#else + case DEMUX_GET_TIME: + case DEMUX_GET_LENGTH: + pi64 = (int64_t*)va_arg( args, int64_t * ); + *pi64 = 0; + return VLC_SUCCESS; #endif case DEMUX_SET_GROUP: { @@ -1663,8 +1763,10 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) pid->i_pid ); /* pid->es->p_pes->i_flags |= BLOCK_FLAG_DISCONTINUITY; */ } +#if 0 if( p[5]&0x40 ) msg_Dbg( p_demux, "random access indicator (pid=%d) ", pid->i_pid ); +#endif } } @@ -1690,7 +1792,6 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) } else if( i_diff != 0 && !b_discontinuity ) { - /* FIXME what to do when discontinuity_indicator is set ? */ msg_Warn( p_demux, "discontinuity received 0x%x instead of 0x%x (pid=%d)", i_cc, ( pid->i_cc + 1 )&0x0f, pid->i_pid ); @@ -1760,7 +1861,7 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) } } } - + return i_ret; } @@ -1813,9 +1914,7 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) case 0x92: /* DVD_SPU vls (sub) */ es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', 'b' ) ); break; - case 0x93: /* LPCM vls (audio) */ - es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'l', 'p', 'c', 'b' ) ); - break; + case 0x94: /* SDDS (audio) */ es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 'b' ) ); break; @@ -1933,13 +2032,13 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) byte1 = IODGetByte( &i_data, &p_data ); byte2 = IODGetByte( &i_data, &p_data ); byte3 = IODGetByte( &i_data, &p_data ); - if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor + if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor { p_iod->i_iod_label_scope = 0x11; p_iod->i_iod_label = byte1; i_iod_tag = byte2; } - else //correct implementation of the IOD_descriptor + else //correct implementation of the IOD_descriptor { p_iod->i_iod_label_scope = byte1; p_iod->i_iod_label = byte2; @@ -1952,14 +2051,14 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) #endif if( i_iod_tag != 0x02 ) { -#ifdef DEBUG +#ifdef DEBUG fprintf( stderr, "\n ERR: tag %02x != 0x02", i_iod_tag ); -#endif +#endif return p_iod; } i_iod_length = IODDescriptorLength( &i_data, &p_data ); -#ifdef DEBUG +#ifdef DEBUG fprintf( stderr, "\n* length:%d", i_iod_length ); #endif if( i_iod_length > i_data ) @@ -1979,10 +2078,10 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) if( b_url ) { p_iod->psz_url = IODGetURL( &i_data, &p_data ); -#ifdef DEBUG +#ifdef DEBUG fprintf( stderr, "\n* url string:%s", p_iod->psz_url ); fprintf( stderr, "\n*****************************\n" ); -#endif +#endif return p_iod; } else @@ -2078,7 +2177,7 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data ); #ifdef DEBUG fprintf( stderr, "\n* - DecoderConfigDesc length:%d", i_decoderConfigDescr_length ); -#endif +#endif #define dec_descr es_descr.dec_descr dec_descr.i_objectTypeIndication = IODGetByte( &i_data, &p_data ); i_flags = IODGetByte( &i_data, &p_data ); @@ -2087,14 +2186,14 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) 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 DEBUG +#ifdef 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 ); -#endif +#endif if( i_decoderConfigDescr_length > 13 && IODGetByte( &i_data, &p_data ) == 0x05 ) { int i; @@ -2124,7 +2223,7 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) if( IODGetByte( &i_data, &p_data ) != 0x06 ) { -#ifdef DEBUG +#ifdef DEBUG fprintf( stderr, "\n* ERR missing SLConfigDescr" ); #endif es_descr.b_ok = 0; @@ -2173,9 +2272,9 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) } break; default: -#ifdef DEBUG +#ifdef DEBUG fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" ); -#endif +#endif es_descr.b_ok = 0; break; } @@ -2184,9 +2283,9 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) #undef sl_descr #undef es_descr default: -#ifdef DEBUG +#ifdef DEBUG fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length ); -#endif +#endif break; } @@ -2196,7 +2295,7 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) } #ifdef DEBUG fprintf( stderr, "\n*****************************\n" ); -#endif +#endif return p_iod; } @@ -2248,7 +2347,8 @@ static vlc_bool_t DVBProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm ) demux_sys_t *p_sys = p_demux->p_sys; if ( !p_sys->b_dvb_control ) return VLC_FALSE; - if ( p_sys->i_dvb_program == -1 && p_sys->p_programs_list == NULL ) + if ( (p_sys->i_dvb_program == -1 && p_sys->p_programs_list == NULL) + || p_sys->i_dvb_program == 0 ) return VLC_TRUE; if ( p_sys->i_dvb_program == i_pgrm ) return VLC_TRUE; @@ -2387,7 +2487,7 @@ static void EITEventFixString( unsigned char *psz ) * caracters encoding, for now lets skip it */ if( psz[0] >= 0x20 ) return; - if( ( i_len = strlen( psz ) ) > 0 ) + if( ( i_len = strlen( (char *) psz ) ) > 0 ) memmove( &psz[0], &psz[1], i_len ); /* Copy the \0 too */ } static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) @@ -2456,8 +2556,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) memcpy( psz_text, pE->i_text, pE->i_text_length ); psz_text[pE->i_text_length] = '\0'; - EITEventFixString(psz_name); - EITEventFixString(psz_text); + EITEventFixString((unsigned char *)&psz_name); + EITEventFixString((unsigned char *)&psz_text); msg_Dbg( p_demux, " - short event lang=%3.3s '%s' : '%s'", pE->i_iso_639_code, psz_name, psz_text ); } @@ -2478,12 +2578,12 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) memcpy( str1, pE->i_item_description[i], pE->i_item_description_length[i] ); str1[pE->i_item_description_length[i]] = '\0'; - EITEventFixString(str1); + EITEventFixString((unsigned char *)&str1); memcpy( str2, pE->i_item[i], pE->i_item_length[i] ); str2[pE->i_item_length[i]] = '\0'; - EITEventFixString(str2); + EITEventFixString((unsigned char *)&str2); msg_Dbg( p_demux, " - desc='%s' item='%s'", str1, str2 ); psz_extra = realloc( psz_extra, @@ -2497,7 +2597,7 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) memcpy( str1, pE->i_text, pE->i_text_length ); str1[pE->i_text_length] = '\0'; - EITEventFixString(str1); + EITEventFixString((unsigned char *)&str1); msg_Dbg( p_demux, " - text='%s'", str1 ); psz_extra = realloc( psz_extra, @@ -2878,23 +2978,32 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) 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" ); + 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" ); + 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" ); + 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" ); + 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.psz_description = strdup( "Teletext" );