X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fts.c;h=f491ca59350529c84aaf6b8d2d74bae5d9f1a6cb;hb=b751665aa8f78719eb3e4fe30545fffd5c423948;hp=813e7679bc74f49739cd485691f8fc4086eed248;hpb=78651e749843530d62675233dc5a1dfb5da73b6b;p=vlc diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 813e7679bc..f491ca5935 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -26,7 +26,12 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include @@ -35,7 +40,7 @@ #include #include -#include "iso_lang.h" +#include #include #include @@ -72,7 +77,7 @@ # endif #endif #ifdef HAVE_TIME_H -# include +# include #endif #undef TS_DEBUG @@ -82,12 +87,26 @@ * - ... */ +/***************************************************************************** + * Callback prototypes + *****************************************************************************/ +static int ChangeKeyCallback ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); + /***************************************************************************** * Module descriptor *****************************************************************************/ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); +/* TODO + * - Rename "extra pmt" to "user pmt" + * - Update extra pmt description + * pmt_pid[:pmt_number][=pid_description[,pid_description]] + * where pid_description could take 3 forms: + * 1. pid:pcr (to force the pcr pid) + * 2. pid:stream_type + * 3. pid:type=fourcc where type=(video|audio|spu) + */ #define PMT_TEXT N_("Extra PMT") #define PMT_LONGTEXT N_( \ "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." ) @@ -108,6 +127,10 @@ static void Close ( vlc_object_t * ); #define CSA_TEXT N_("CSA ck") #define CSA_LONGTEXT N_("Control word for the CSA encryption algorithm") +#define CSA2_TEXT N_("Second CSA Key") +#define CSA2_LONGTEXT N_("The even CSA encryption key. This must be a " \ + "16 char string (8 hexadecimal bytes).") + #define SILENT_TEXT N_("Silent mode") #define SILENT_LONGTEXT N_("Do not complain on encrypted PES.") @@ -133,26 +156,28 @@ static void Close ( vlc_object_t * ); "Specify the size of the buffer here and not the number of packets." ) vlc_module_begin(); - set_description( _("MPEG Transport Stream demuxer") ); + set_description( N_("MPEG Transport Stream demuxer") ); set_shortname ( "MPEG-TS" ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_DEMUX ); - add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_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_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_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true ); add_integer( "ts-out-mtu", 1400, 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_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, VLC_TRUE ); - - add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, VLC_FALSE ); - add_bool( "ts-dump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, VLC_FALSE ); + 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_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, false ); + change_unsafe(); + add_bool( "ts-dump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, false ); add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT, - DUMPSIZE_LONGTEXT, VLC_TRUE ); + DUMPSIZE_LONGTEXT, true ); - set_capability( "demux2", 10 ); + set_capability( "demux", 10 ); set_callbacks( Open, Close ); add_shortcut( "ts" ); vlc_module_end(); @@ -165,7 +190,7 @@ typedef struct { uint8_t i_objectTypeIndication; uint8_t i_streamType; - vlc_bool_t b_upStream; + bool b_upStream; uint32_t i_bufferSizeDB; uint32_t i_maxBitrate; uint32_t i_avgBitrate; @@ -177,14 +202,14 @@ typedef struct typedef struct { - vlc_bool_t b_useAccessUnitStartFlag; - vlc_bool_t b_useAccessUnitEndFlag; - vlc_bool_t b_useRandomAccessPointFlag; - vlc_bool_t b_useRandomAccessUnitsOnlyFlag; - vlc_bool_t b_usePaddingFlag; - vlc_bool_t b_useTimeStampsFlags; - vlc_bool_t b_useIdleFlag; - vlc_bool_t b_durationFlag; + bool b_useAccessUnitStartFlag; + bool b_useAccessUnitEndFlag; + bool b_useRandomAccessPointFlag; + bool b_useRandomAccessUnitsOnlyFlag; + bool b_usePaddingFlag; + bool b_useTimeStampsFlags; + bool b_useIdleFlag; + bool b_durationFlag; uint32_t i_timeStampResolution; uint32_t i_OCRResolution; uint8_t i_timeStampLength; @@ -206,11 +231,11 @@ typedef struct typedef struct { - vlc_bool_t b_ok; + bool b_ok; uint16_t i_es_id; - vlc_bool_t b_streamDependenceFlag; - vlc_bool_t b_OCRStreamFlag; + bool b_streamDependenceFlag; + bool b_OCRStreamFlag; uint8_t i_streamPriority; char *psz_url; @@ -225,7 +250,7 @@ typedef struct typedef struct { - uint8_t i_iod_label, i_iod_label_scope; + uint8_t i_iod_label, i_iod_label_scope; /* IOD */ uint16_t i_od_id; @@ -285,8 +310,8 @@ typedef struct { int i_pid; - vlc_bool_t b_seen; - vlc_bool_t b_valid; + bool b_seen; + bool b_valid; int i_cc; /* countinuity counter */ /* PSI owner (ie PMT -> PAT, ES -> PMT */ @@ -305,6 +330,8 @@ typedef struct struct demux_sys_t { + vlc_mutex_t csa_lock; + /* TS packet size (188, 192, 204) */ int i_packet_size; @@ -315,20 +342,21 @@ struct demux_sys_t ts_pid_t pid[8192]; /* All PMT */ + bool b_user_pmt; int i_pmt; ts_pid_t **pmt; /* */ - vlc_bool_t b_es_id_pid; + bool b_es_id_pid; csa_t *csa; int i_csa_pkt_size; - vlc_bool_t b_silent; + bool b_silent; - vlc_bool_t b_udp_out; + bool b_udp_out; int fd; /* udp socket */ uint8_t *buffer; - vlc_bool_t b_dvb_control; + bool b_dvb_control; int i_dvb_program; int64_t i_dvb_start; int64_t i_dvb_length; @@ -338,17 +366,17 @@ struct demux_sys_t char *psz_file; /* file to dump data in */ FILE *p_file; /* filehandle */ uint64_t i_write; /* bytes written */ - vlc_bool_t b_file_out; /* dump mode enabled */ + bool b_file_out; /* dump mode enabled */ /* */ - vlc_bool_t b_meta; + bool b_meta; }; static int Demux ( demux_t *p_demux ); static int DemuxFile( demux_t *p_demux ); static int Control( demux_t *p_demux, int i_query, va_list args ); -static void PIDInit ( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner ); +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 int PIDFillFormat( ts_pid_t *pid, int i_stream_type ); @@ -364,13 +392,16 @@ static inline int PIDGet( block_t *p ) return ( (p->p_buffer[1]&0x1f)<<8 )|p->p_buffer[2]; } -static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ); +static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ); static void PCRHandle( demux_t *p_demux, ts_pid_t *, block_t * ); static iod_descriptor_t *IODNew( int , uint8_t * ); static void IODFree( iod_descriptor_t * ); +#define TS_USER_PMT_NUMBER (0) +static int UserPmt( demux_t *p_demux, const char * ); + #define TS_PACKET_SIZE_188 188 #define TS_PACKET_SIZE_192 192 #define TS_PACKET_SIZE_204 204 @@ -391,8 +422,8 @@ static int Open( vlc_object_t *p_this ) ts_pid_t *pat; const char *psz_mode; - vlc_bool_t b_append; - vlc_bool_t b_topfield = VLC_FALSE; + bool b_append; + bool b_topfield = false; vlc_value_t val; @@ -401,7 +432,7 @@ static int Open( vlc_object_t *p_this ) if( memcmp( p_peek, "TFrc", 4 ) == 0 ) { - b_topfield = VLC_TRUE; + b_topfield = true; msg_Dbg( p_demux, "this is a topfield file" ); } @@ -412,7 +443,8 @@ static int Open( vlc_object_t *p_this ) } if( i_sync >= TS_PACKET_SIZE_MAX && !b_topfield ) { - if( strcmp( p_demux->psz_demux, "ts" ) ) return VLC_EGENERIC; + if( !p_demux->b_force ) + return VLC_EGENERIC; msg_Warn( p_demux, "this does not look like a TS stream, continuing" ); } @@ -450,7 +482,7 @@ static int Open( vlc_object_t *p_this ) { i_packet_size = TS_PACKET_SIZE_204; } - else if( !strcmp( p_demux->psz_demux, "ts" ) ) + else if( p_demux->b_force ) { i_packet_size = TS_PACKET_SIZE_188; } @@ -458,7 +490,7 @@ static int Open( vlc_object_t *p_this ) { i_packet_size = TS_PACKET_SIZE_188; #if 0 - /* I used the TF5000PVR 2004 Firmware .doc header documentation, + /* 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; @@ -489,7 +521,7 @@ static int Open( vlc_object_t *p_this ) // 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 + // 4 bytes reserved // 2 bytes reserved // 2 bytes duration Uimsbf (70,71) //i_duration = (int) (p_peek[70] << 8) | p_peek[71]; @@ -528,17 +560,20 @@ static int Open( vlc_object_t *p_this ) } p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; memset( p_sys, 0, sizeof( demux_sys_t ) ); p_sys->i_packet_size = i_packet_size; + vlc_mutex_init( &p_sys->csa_lock ); /* Fill dump mode fields */ p_sys->i_write = 0; p_sys->p_file = NULL; - p_sys->b_file_out = VLC_FALSE; + p_sys->b_file_out = false; p_sys->psz_file = var_CreateGetString( p_demux, "ts-dump-file" ); if( *p_sys->psz_file != '\0' ) { - p_sys->b_file_out = VLC_TRUE; + p_sys->b_file_out = true; var_Create( p_demux, "ts-dump-append", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); var_Get( p_demux, "ts-dump-append", &val ); @@ -556,7 +591,7 @@ static int Open( vlc_object_t *p_this ) 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; + p_sys->b_file_out = false; } if( p_sys->b_file_out ) @@ -587,10 +622,10 @@ static int Open( vlc_object_t *p_this ) p_demux->pf_control = Control; /* Init p_sys field */ - p_sys->b_meta = VLC_TRUE; - p_sys->b_dvb_control = VLC_TRUE; + p_sys->b_meta = true; + p_sys->b_dvb_control = true; p_sys->i_dvb_program = 0; - p_sys->i_dvb_start = 0;; + p_sys->i_dvb_start = 0; p_sys->i_dvb_length = 0; for( i = 0; i < 8192; i++ ) @@ -598,19 +633,19 @@ static int Open( vlc_object_t *p_this ) ts_pid_t *pid = &p_sys->pid[i]; pid->i_pid = i; - pid->b_seen = VLC_FALSE; - pid->b_valid = VLC_FALSE; + pid->b_seen = false; + pid->b_valid = false; } /* PID 8191 is padding */ - p_sys->pid[8191].b_seen = VLC_TRUE; + p_sys->pid[8191].b_seen = true; p_sys->i_packet_size = i_packet_size; - p_sys->b_udp_out = VLC_FALSE; + p_sys->b_udp_out = false; p_sys->i_ts_read = 50; p_sys->csa = NULL; /* Init PAT handler */ pat = &p_sys->pid[0]; - PIDInit( pat, VLC_TRUE, NULL ); + PIDInit( pat, true, NULL ); pat->psi->handle = dvbpsi_AttachPAT( (dvbpsi_pat_callback)PATCallBack, p_demux ); #ifdef TS_USE_DVB_SI @@ -619,21 +654,21 @@ static int Open( vlc_object_t *p_this ) ts_pid_t *sdt = &p_sys->pid[0x11]; ts_pid_t *eit = &p_sys->pid[0x12]; - PIDInit( sdt, VLC_TRUE, NULL ); + PIDInit( sdt, true, NULL ); sdt->psi->handle = dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, p_demux ); - PIDInit( eit, VLC_TRUE, NULL ); + PIDInit( eit, true, NULL ); eit->psi->handle = dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, p_demux ); if( p_sys->b_dvb_control ) { if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x11, VLC_TRUE ) || + ACCESS_SET_PRIVATE_ID_STATE, 0x11, true ) || stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x12, VLC_TRUE ) ) - p_sys->b_dvb_control = VLC_FALSE; + ACCESS_SET_PRIVATE_ID_STATE, 0x12, true ) ) + p_sys->b_dvb_control = false; } } #endif @@ -655,7 +690,7 @@ static int Open( vlc_object_t *p_this ) char *psz = strchr( val.psz_string, ':' ); int i_port = 0; - p_sys->b_udp_out = VLC_TRUE; + p_sys->b_udp_out = true; if( psz ) { @@ -669,7 +704,7 @@ static int Open( vlc_object_t *p_this ) if( p_sys->fd < 0 ) { msg_Err( p_demux, "failed to open udp socket, send disabled" ); - p_sys->b_udp_out = VLC_FALSE; + p_sys->b_udp_out = false; } else { @@ -684,141 +719,66 @@ static int Open( vlc_object_t *p_this ) p_sys->buffer = malloc( p_sys->i_packet_size * p_sys->i_ts_read ); } } - if( val.psz_string ) - { - free( val.psz_string ); - } + free( val.psz_string ); /* We handle description of an extra PMT */ var_Create( p_demux, "ts-extra-pmt", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); var_Get( p_demux, "ts-extra-pmt", &val ); - if( val.psz_string && strchr( val.psz_string, '=' ) != NULL ) - { - char *psz = val.psz_string; - int i_pid = strtol( psz, &psz, 0 ); - - if( i_pid >= 2 && i_pid < 8192 ) - { - ts_pid_t *pmt = &p_sys->pid[i_pid]; - ts_prg_psi_t *prg; - - msg_Dbg( p_demux, "extra pmt specified (pid=%d)", i_pid ); - PIDInit( pmt, VLC_TRUE, NULL ); - - /* Dummy PMT */ - prg = malloc( sizeof( ts_prg_psi_t ) ); - memset( prg, 0, sizeof( ts_prg_psi_t ) ); - prg->i_pid_pcr = -1; - prg->i_pid_pmt = -1; - prg->i_number = 0; /* special */ - prg->handle = dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack, p_demux ); - TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg ); - - psz = strchr( psz, '=' ) + 1; /* can't failed */ - while( psz && *psz ) - { - char *psz_next = strchr( psz, ',' ); - int i_pid, i_stream_type; - - if( psz_next ) - { - *psz_next++ = '\0'; - } - - i_pid = strtol( psz, &psz, 0 ); - if( *psz == ':' ) - { - i_stream_type = strtol( psz + 1, &psz, 0 ); - if( i_pid >= 2 && i_pid < 8192 && - !p_sys->pid[i_pid].b_valid ) - { - ts_pid_t *pid = &p_sys->pid[i_pid]; - - PIDInit( pid, VLC_FALSE, pmt->psi); - if( pmt->psi->prg[0]->i_pid_pcr <= 0 ) - { - pmt->psi->prg[0]->i_pid_pcr = i_pid; - } - PIDFillFormat( pid, i_stream_type); - if( pid->es->fmt.i_cat != UNKNOWN_ES ) - { - if( p_sys->b_es_id_pid ) - { - pid->es->fmt.i_id = i_pid; - } - msg_Dbg( p_demux, " * es pid=%d type=%d " - "fcc=%4.4s", i_pid, i_stream_type, - (char*)&pid->es->fmt.i_codec ); - pid->es->id = es_out_Add( p_demux->out, - &pid->es->fmt ); - } - } - } - psz = psz_next; - } - } - } - if( val.psz_string ) - { - free( val.psz_string ); - } + p_sys->b_user_pmt = false; + if( val.psz_string && *val.psz_string ) + UserPmt( p_demux, val.psz_string ); + free( val.psz_string ); - var_Create( p_demux, "ts-csa-ck", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Create( p_demux, "ts-csa-ck", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND ); var_Get( p_demux, "ts-csa-ck", &val ); if( val.psz_string && *val.psz_string ) { - char *psz = val.psz_string; - if( psz[0] == '0' && ( psz[1] == 'x' || psz[1] == 'X' ) ) + int i_res; + vlc_value_t csa2; + + p_sys->csa = csa_New(); + + var_Create( p_demux, "ts-csa2-ck", VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND); + var_Get( p_demux, "ts-csa2-ck", &csa2 ); + i_res = csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, val.psz_string, true ); + if( i_res == VLC_SUCCESS && csa2.psz_string && *csa2.psz_string ) { - psz += 2; + if( csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, csa2.psz_string, false ) != VLC_SUCCESS ) + { + csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, val.psz_string, false ); + } } - if( strlen( psz ) != 16 ) + else if ( i_res == VLC_SUCCESS ) { - msg_Warn( p_demux, "invalid csa ck (it must be 16 chars long)" ); + csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, val.psz_string, false ); } else { -#ifndef UNDER_CE - uint64_t i_ck = strtoull( psz, NULL, 16 ); -#else - uint64_t i_ck = strtoll( psz, NULL, 16 ); -#endif - uint8_t ck[8]; - int i; - for( i = 0; i < 8; i++ ) - { - ck[i] = ( i_ck >> ( 56 - 8*i) )&0xff; - } -#ifndef TS_NO_CSA_CK_MSG - msg_Dbg( p_demux, "using CSA scrambling with " - "ck=%x:%x:%x:%x:%x:%x:%x:%x", - ck[0], ck[1], ck[2], ck[3], ck[4], ck[5], ck[6], ck[7] ); -#endif - p_sys->csa = csa_New(); + csa_Delete( p_sys->csa ); + p_sys->csa = NULL; + } - if( p_sys->csa ) - { - vlc_value_t pkt_val; + if( p_sys->csa ) + { + vlc_value_t pkt_val; - csa_SetCW( p_sys->csa, ck, ck ); + var_AddCallback( p_demux, "ts-csa-ck", ChangeKeyCallback, (void *)1 ); + var_AddCallback( p_demux, "ts-csa2-ck", ChangeKeyCallback, NULL ); - 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 ) - { - msg_Err( p_demux, "wrong packet size %d specified.", pkt_val.i_int ); - msg_Warn( p_demux, "using default packet size of 188 bytes" ); - p_sys->i_csa_pkt_size = 188; - } - else p_sys->i_csa_pkt_size = pkt_val.i_int; - msg_Dbg( p_demux, "decrypting %d bytes of packet", p_sys->i_csa_pkt_size ); + 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 ) + { + msg_Err( p_demux, "wrong packet size %d specified.", pkt_val.i_int ); + msg_Warn( p_demux, "using default packet size of 188 bytes" ); + p_sys->i_csa_pkt_size = 188; } + else p_sys->i_csa_pkt_size = pkt_val.i_int; + msg_Dbg( p_demux, "decrypting %d bytes of packet", p_sys->i_csa_pkt_size ); } + free( csa2.psz_string ); } - if( val.psz_string ) - { - free( val.psz_string ); - } + free( val.psz_string ); var_Create( p_demux, "ts-silent", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Get( p_demux, "ts-silent", &val ); @@ -878,7 +838,7 @@ static void Close( vlc_object_t *p_this ) /* too much */ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid, - VLC_FALSE ); + false ); } } @@ -888,10 +848,15 @@ static void Close( vlc_object_t *p_this ) net_Close( p_sys->fd ); free( p_sys->buffer ); } + vlc_mutex_lock( &p_sys->csa_lock ); if( p_sys->csa ) { + var_DelCallback( p_demux, "ts-csa-ck", ChangeKeyCallback, NULL ); + var_DelCallback( p_demux, "ts-csa2-ck", ChangeKeyCallback, NULL ); csa_Delete( p_sys->csa ); + p_sys->csa = NULL; } + vlc_mutex_unlock( &p_sys->csa_lock ); if( p_sys->i_pmt ) free( p_sys->pmt ); @@ -905,7 +870,7 @@ static void Close( vlc_object_t *p_this ) /* If in dump mode, then close the file */ if( p_sys->b_file_out ) { - msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", + msg_Info( p_demux ,"closing %s (%"PRId64" Kbytes dumped)", p_sys->psz_file, p_sys->i_write / 1024 ); if( p_sys->p_file != stdout ) @@ -920,9 +885,32 @@ static void Close( vlc_object_t *p_this ) free( p_sys->psz_file ); p_sys->psz_file = NULL; + vlc_mutex_destroy( &p_sys->csa_lock ); free( p_sys ); } +/***************************************************************************** + * ChangeKeyCallback: called when changing the odd encryption key on the fly. + *****************************************************************************/ +static int ChangeKeyCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, + void *p_data ) +{ + VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys = p_demux->p_sys; + int i_tmp = (intptr_t)p_data; + + vlc_mutex_lock( &p_sys->csa_lock ); + if ( i_tmp ) + i_tmp = csa_SetCW( p_this, p_sys->csa, newval.psz_string, true ); + else + i_tmp = csa_SetCW( p_this, p_sys->csa, newval.psz_string, false ); + + vlc_mutex_unlock( &p_sys->csa_lock ); + return i_tmp; +} + /***************************************************************************** * DemuxFile: *****************************************************************************/ @@ -945,21 +933,21 @@ static int DemuxFile( demux_t *p_demux ) /* Test continuity counter */ while( i_pos < i_data ) { - ts_pid_t *p_pid; /* point to a PID structure */ - vlc_bool_t b_payload; /* indicates a packet with payload */ - vlc_bool_t b_adaptation; /* adaptation field */ - int i_cc = 0; /* continuity counter */ + 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" ); - while( !p_demux->b_die && (i_pos < i_data) ) + while( vlc_object_alive (p_demux) && (i_pos < i_data) ) { i_pos++; if( p_sys->buffer[i_pos] == 0x47 ) break; } - if( !p_demux->b_die ) + if( vlc_object_alive (p_demux) ) msg_Warn( p_demux, "sync found" ); } @@ -1012,7 +1000,11 @@ static int DemuxFile( demux_t *p_demux ) /* Test if user wants to decrypt it first */ if( p_sys->csa ) + { + vlc_mutex_lock( &p_sys->csa_lock ); csa_Decrypt( p_demux->p_sys->csa, &p_buffer[i_pos], p_demux->p_sys->i_csa_pkt_size ); + vlc_mutex_unlock( &p_sys->csa_lock ); + } i_pos += p_sys->i_packet_size; } @@ -1043,7 +1035,7 @@ static int Demux( demux_t *p_demux ) /* 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++ ) { - vlc_bool_t b_frame = VLC_FALSE; + bool b_frame = false; block_t *p_pkt; ts_pid_t *p_pid; @@ -1060,7 +1052,7 @@ static int Demux( demux_t *p_demux ) msg_Warn( p_demux, "lost synchro" ); block_Release( p_pkt ); - while( !p_demux->b_die ) + while( vlc_object_alive (p_demux) ) { const uint8_t *p_peek; int i_peek, i_skip = 0; @@ -1147,7 +1139,7 @@ static int Demux( demux_t *p_demux ) PCRHandle( p_demux, p_pid, p_pkt ); block_Release( p_pkt ); } - p_pid->b_seen = VLC_TRUE; + p_pid->b_seen = true; if( b_frame ) { @@ -1184,9 +1176,9 @@ static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_ 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 * I64C(1000000); + *pi_length = p_sys->i_dvb_length * INT64_C(1000000); if( pi_time ) - *pi_time = (t - p_sys->i_dvb_start) * I64C(1000000); + *pi_time = (t - p_sys->i_dvb_start) * INT64_C(1000000); return VLC_SUCCESS; } } @@ -1203,7 +1195,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) int i_int; if( p_sys->b_file_out ) - return demux2_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args ); + return demux_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args ); switch( i_query ) { @@ -1249,7 +1241,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) pi64 = (int64_t*)va_arg( args, int64_t * ); if( p_sys->i_mux_rate > 0 ) { - *pi64 = I64C(1000000) * ( stream_Size( p_demux->s ) / 50 ) / + *pi64 = INT64_C(1000000) * ( stream_Size( p_demux->s ) / 50 ) / p_sys->i_mux_rate; return VLC_SUCCESS; } @@ -1304,7 +1296,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid, - VLC_FALSE ); + false ); /* All ES */ for( i = 2; i < 8192; i++ ) { @@ -1321,7 +1313,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, - i, VLC_FALSE ); + i, false ); break; } } @@ -1351,10 +1343,10 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid, - VLC_TRUE ); + true ); stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr, - VLC_TRUE ); + true ); for( i = 2; i < 8192; i++ ) { @@ -1379,7 +1371,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, - i, VLC_TRUE ); + i, true ); break; } } @@ -1401,11 +1393,136 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } } -static void PIDInit( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner ) +/***************************************************************************** + * + *****************************************************************************/ +static int UserPmt( demux_t *p_demux, const char *psz_fmt ) { - vlc_bool_t b_old_valid = pid->b_valid; + demux_sys_t *p_sys = p_demux->p_sys; + char *psz_dup = strdup( psz_fmt ); + char *psz = psz_dup; + int i_pid; + int i_number; + + if( !psz_dup ) + return VLC_ENOMEM; + + /* Parse PID */ + i_pid = strtol( psz, &psz, 0 ); + if( i_pid < 2 || i_pid >= 8192 ) + goto error; + + /* Parse optional program number */ + i_number = 0; + if( *psz == ':' ) + i_number = strtol( &psz[1], &psz, 0 ); + + /* */ + ts_pid_t *pmt = &p_sys->pid[i_pid]; + ts_prg_psi_t *prg; + + msg_Dbg( p_demux, "user pmt specified (pid=%d,number=%d)", i_pid, i_number ); + PIDInit( pmt, true, NULL ); + + /* Dummy PMT */ + prg = malloc( sizeof( ts_prg_psi_t ) ); + if( !prg ) + goto error; + + memset( prg, 0, sizeof( ts_prg_psi_t ) ); + prg->i_pid_pcr = -1; + prg->i_pid_pmt = -1; + prg->i_version = -1; + prg->i_number = i_number != 0 ? i_number : TS_USER_PMT_NUMBER; + prg->handle = dvbpsi_AttachPMT( i_number != TS_USER_PMT_NUMBER ? i_number : 1, (dvbpsi_pmt_callback)PMTCallBack, p_demux ); + TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg ); + + psz = strchr( psz, '=' ); + if( psz ) + psz++; + while( psz && *psz ) + { + char *psz_next = strchr( psz, ',' ); + int i_pid; + + if( psz_next ) + *psz_next++ = '\0'; + + i_pid = strtol( psz, &psz, 0 ); + if( *psz != ':' || i_pid < 2 || i_pid >= 8192 ) + goto next; + + char *psz_opt = &psz[1]; + if( !strcmp( psz_opt, "pcr" ) ) + { + prg->i_pid_pcr = i_pid; + } + else if( !p_sys->pid[i_pid].b_valid ) + { + ts_pid_t *pid = &p_sys->pid[i_pid]; + + char *psz_arg = strchr( psz_opt, '=' ); + if( psz_arg ) + *psz_arg++ = '\0'; - pid->b_valid = VLC_TRUE; + PIDInit( pid, false, pmt->psi); + if( prg->i_pid_pcr <= 0 ) + prg->i_pid_pcr = i_pid; + + if( psz_arg && strlen( psz_arg ) == 4 ) + { + const vlc_fourcc_t i_codec = VLC_FOURCC( psz_arg[0], psz_arg[1], + psz_arg[2], psz_arg[3] ); + int i_cat = UNKNOWN_ES; + es_format_t *fmt = &pid->es->fmt; + + if( !strcmp( psz_opt, "video" ) ) + i_cat = VIDEO_ES; + else if( !strcmp( psz_opt, "audio" ) ) + i_cat = AUDIO_ES; + else if( !strcmp( psz_opt, "spu" ) ) + i_cat = SPU_ES; + + es_format_Init( fmt, i_cat, i_codec ); + fmt->b_packetized = false; + } + else + { + const int i_stream_type = strtol( psz_opt, NULL, 0 ); + PIDFillFormat( pid, i_stream_type ); + } + pid->es->fmt.i_group = i_number; + if( p_sys->b_es_id_pid ) + pid->es->fmt.i_id = i_pid; + + if( pid->es->fmt.i_cat != UNKNOWN_ES ) + { + msg_Dbg( p_demux, " * es pid=%d fcc=%4.4s", i_pid, + (char*)&pid->es->fmt.i_codec ); + pid->es->id = es_out_Add( p_demux->out, + &pid->es->fmt ); + } + } + + next: + psz = psz_next; + } + + p_sys->b_user_pmt = true; + TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt ); + free( psz_dup ); + return VLC_SUCCESS; + +error: + free( psz_dup ); + return VLC_EGENERIC; +} + +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->p_owner = p_owner; pid->i_owner_number = 0; @@ -1418,40 +1535,49 @@ static void PIDInit( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner ) if( !b_old_valid ) { + free( pid->psi ); pid->psi = malloc( sizeof( ts_psi_t ) ); - pid->psi->handle= NULL; - pid->psi->i_prg = 0; - pid->psi->prg = NULL; + if( pid->psi ) + { + pid->psi->handle= NULL; + pid->psi->i_prg = 0; + pid->psi->prg = NULL; + } } pid->psi->i_pat_version = -1; pid->psi->i_sdt_version = -1; if( p_owner ) { ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) ); - /* PMT */ - prg->i_version = -1; - prg->i_number = -1; - prg->i_pid_pcr = -1; - prg->i_pid_pmt = -1; - prg->iod = NULL; - prg->handle = NULL; - - TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg ); + if( prg ) + { + /* PMT */ + prg->i_version = -1; + prg->i_number = -1; + prg->i_pid_pcr = -1; + prg->i_pid_pmt = -1; + prg->iod = NULL; + prg->handle = NULL; + + TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg ); + } } } else { pid->psi = NULL; pid->es = malloc( sizeof( ts_es_t ) ); - - es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 ); - pid->es->id = NULL; - pid->es->p_pes = NULL; - pid->es->i_pes_size= 0; - pid->es->i_pes_gathered= 0; - pid->es->pp_last = &pid->es->p_pes; - pid->es->p_mpeg4desc = NULL; - pid->es->b_gather = VLC_FALSE; + if( pid->es ) + { + es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 ); + pid->es->id = NULL; + pid->es->p_pes = NULL; + pid->es->i_pes_size= 0; + pid->es->i_pes_gathered= 0; + pid->es->pp_last = &pid->es->p_pes; + pid->es->p_mpeg4desc = NULL; + pid->es->b_gather = false; + } } } @@ -1470,7 +1596,7 @@ static void PIDClean( es_out_t *out, ts_pid_t *pid ) dvbpsi_DetachPMT( pid->psi->prg[i]->handle ); free( pid->psi->prg[i] ); } - if( pid->psi->prg ) free( pid->psi->prg ); + free( pid->psi->prg ); free( pid->psi ); } else @@ -1502,7 +1628,7 @@ static void PIDClean( es_out_t *out, ts_pid_t *pid ) if( pid->i_extra_es ) free( pid->extra_es ); } - pid->b_valid = VLC_FALSE; + pid->b_valid = false; } /**************************************************************************** @@ -1761,18 +1887,18 @@ static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) } } -static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) +static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) { - const uint8_t *p = p_bk->p_buffer; - const vlc_bool_t b_unit_start = p[1]&0x40; - const vlc_bool_t b_adaptation = p[3]&0x20; - const vlc_bool_t b_payload = p[3]&0x10; - const int i_cc = p[3]&0x0f; /* continuity counter */ - vlc_bool_t b_discontinuity = VLC_FALSE;/* discontinuity */ + const uint8_t *p = p_bk->p_buffer; + const bool b_unit_start = p[1]&0x40; + 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 */ /* transport_scrambling_control is ignored */ int i_skip = 0; - vlc_bool_t i_ret = VLC_FALSE; + bool i_ret = false; int i_diff; #if 0 @@ -1795,7 +1921,9 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) if( p_demux->p_sys->csa ) { + vlc_mutex_lock( &p_demux->p_sys->csa_lock ); csa_Decrypt( p_demux->p_sys->csa, p_bk->p_buffer, p_demux->p_sys->i_csa_pkt_size ); + vlc_mutex_unlock( &p_demux->p_sys->csa_lock ); } if( !b_adaptation ) @@ -1811,7 +1939,7 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) if( p[4] > 0 ) { /* discontinuity indicator found in stream */ - b_discontinuity = (p[5]&0x80) ? VLC_TRUE : VLC_FALSE; + b_discontinuity = (p[5]&0x80) ? true : false; if( b_discontinuity && pid->es->p_pes ) { msg_Warn( p_demux, "discontinuity indicator (pid=%d) ", @@ -1877,7 +2005,7 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) if( pid->es->p_pes ) { ParsePES( p_demux, pid ); - i_ret = VLC_TRUE; + i_ret = true; } block_ChainLastAppend( &pid->es->pp_last, p_bk ); @@ -1894,7 +2022,7 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) pid->es->i_pes_gathered >= pid->es->i_pes_size ) { ParsePES( p_demux, pid ); - i_ret = VLC_TRUE; + i_ret = true; } } else @@ -1912,7 +2040,7 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) pid->es->i_pes_gathered >= pid->es->i_pes_size ) { ParsePES( p_demux, pid ); - i_ret = VLC_TRUE; + i_ret = true; } } } @@ -1941,7 +2069,7 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) break; case 0x10: /* MPEG4 (video) */ es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) ); - pid->es->b_gather = VLC_TRUE; + 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' ) ); @@ -1976,7 +2104,7 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) case 0xa0: /* MSCODEC vlc (video) (fixed later) */ es_format_Init( fmt, UNKNOWN_ES, 0 ); - pid->es->b_gather = VLC_TRUE; + pid->es->b_gather = true; break; case 0x06: /* PES_PRIVATE (fixed later) */ @@ -1988,7 +2116,7 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) } /* PES packets usually contain truncated frames */ - fmt->b_packetized = VLC_FALSE; + fmt->b_packetized = false; return fmt->i_cat == UNKNOWN_ES ? VLC_EGENERIC : VLC_SUCCESS ; } @@ -2054,6 +2182,7 @@ static char* IODGetURL( int *pi_data, uint8_t **pp_data ) i_url_len = IODGetByte( pi_data, pp_data ); url = malloc( i_url_len + 1 ); + if( !url ) return NULL; for( i = 0; i < i_url_len; i++ ) { url[i] = IODGetByte( pi_data, pp_data ); @@ -2067,11 +2196,12 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) iod_descriptor_t *p_iod; int i; int i_es_index; - uint8_t i_flags, i_iod_tag, byte1, byte2, byte3; - vlc_bool_t b_url; - int i_iod_length; + uint8_t i_flags, i_iod_tag, byte1, byte2, byte3; + bool b_url; + int i_iod_length; p_iod = malloc( sizeof( iod_descriptor_t ) ); + if( !p_iod ) return NULL; memset( p_iod, 0, sizeof( iod_descriptor_t ) ); #ifdef TS_DEBUG @@ -2382,12 +2512,9 @@ static void IODFree( iod_descriptor_t *p_iod ) } else { - if( es_descr.dec_descr.p_decoder_specific_info != NULL ) - { - free( es_descr.dec_descr.p_decoder_specific_info ); - es_descr.dec_descr.p_decoder_specific_info = NULL; - es_descr.dec_descr.i_decoder_specific_info_len = 0; - } + free( es_descr.dec_descr.p_decoder_specific_info ); + es_descr.dec_descr.p_decoder_specific_info = NULL; + es_descr.dec_descr.i_decoder_specific_info_len = 0; } } es_descr.b_ok = 0; @@ -2401,15 +2528,15 @@ static void IODFree( iod_descriptor_t *p_iod ) ** libdvbpsi callbacks **************************************************************************** ****************************************************************************/ -static vlc_bool_t DVBProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm ) +static bool 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->b_dvb_control ) return false; 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; + return true; + if ( p_sys->i_dvb_program == i_pgrm ) return true; if ( p_sys->p_programs_list != NULL ) { @@ -2417,10 +2544,10 @@ static vlc_bool_t DVBProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm ) for ( i = 0; i < p_sys->p_programs_list->i_count; i++ ) { if ( i_pgrm == p_sys->p_programs_list->p_values[i].i_int ) - return VLC_TRUE; + return true; } } - return VLC_FALSE; + return false; } #ifdef TS_USE_DVB_SI @@ -2563,7 +2690,7 @@ static void EITDecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d ) const int c = ( mp == 14 || mp == 15 ) ? 1 : 0; *p_y = 1900 + yp + c*1; - *p_m = mp - 1 + c*12; + *p_m = mp - 1 - c*12; *p_d = i_mjd - 14956 - (int)(yp*365.25) - (int)(mp*30.6001); } #define CVT_FROM_BCD(v) ((((v) >> 4)&0xf)*10 + ((v)&0xf)) @@ -2586,15 +2713,15 @@ static int64_t EITConvertStartTime( uint64_t i_date ) } static int EITConvertDuration( uint32_t i_duration ) { - return CVT_FROM_BCD(i_duration >> 16) * 3600 + + return CVT_FROM_BCD(i_duration >> 16) * 3600 + CVT_FROM_BCD(i_duration >> 8 ) * 60 + CVT_FROM_BCD(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 ) +static char *EITConvertToUTF8( const unsigned char *psz_instring, + size_t i_length ) { const char *psz_encoding; char *psz_outstring; @@ -2686,18 +2813,22 @@ EITConvertToUTF8( const unsigned char *psz_instring, size_t i_length ) 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, i_in ); + 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; + const char *psz_in = (const char *)&psz_instring[offset]; char *psz_out = psz_outstring; while( vlc_iconv( iconv_handle, &psz_in, &i_in, @@ -2805,10 +2936,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) strcat( psz_extra, psz_itm ); strcat( psz_extra, ")" ); } - if( psz_dsc ) - free( psz_dsc ); - if( psz_itm ) - free( psz_itm ); + free( psz_dsc ); + free( psz_itm ); } } } @@ -2826,10 +2955,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) if( p_evt->i_running_status == 0x04 && i_start > 0 ) vlc_epg_SetCurrent( p_epg, i_start ); - if( psz_name ) - free( psz_name ); - if( psz_text ) - free( psz_text ); + free( psz_name ); + free( psz_text ); free( psz_extra ); } @@ -2901,8 +3028,8 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) int i_prg; for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ ) { - if( p_sys->pmt[i]->psi->prg[i_prg]->i_number == - p_pmt->i_program_number ) + const int i_pmt_number = p_sys->pmt[i]->psi->prg[i_prg]->i_number; + if( i_pmt_number != TS_USER_PMT_NUMBER && i_pmt_number == p_pmt->i_program_number ) { pmt = p_sys->pmt[i]; prg = p_sys->pmt[i]->psi->prg[i_prg]; @@ -2953,7 +3080,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) /* Set demux filter */ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, prg->i_pid_pcr, - VLC_TRUE ); + true ); } else if ( p_sys->b_dvb_control ) { @@ -3018,14 +3145,14 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) } } - PIDInit( pid, VLC_FALSE, pmt->psi ); + PIDInit( pid, false, pmt->psi ); PIDFillFormat( pid, p_es->i_type ); pid->i_owner_number = prg->i_number; pid->i_pid = p_es->i_pid; pid->b_seen = p_sys->pid[p_es->i_pid].b_seen; if( p_es->i_type == 0x10 || p_es->i_type == 0x11 || - p_es->i_type == 0x12 ) + 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;; @@ -3128,9 +3255,10 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) if( pid->es->fmt.i_extra > 0 ) { pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra ); - memcpy( pid->es->fmt.p_extra, - dcd->p_decoder_specific_info, - 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 ); } } } @@ -3221,9 +3349,11 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) 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 = malloc( p_dr->i_length ); - memcpy( pid->es->fmt.p_extra, p_dr->p_data, - 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) @@ -3244,8 +3374,8 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) for( n = 0; n < sub->i_pages_number; n++ ) { dvbpsi_teletextpage_t *p_page = &sub->p_pages[n]; - if( p_page->i_teletext_type == 0x2 - || p_page->i_teletext_type == 0x5 ) + if( (p_page->i_teletext_type == 0x2) + || (p_page->i_teletext_type == 0x5) ) { ts_es_t *p_es; @@ -3256,11 +3386,13 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) 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; - + 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; @@ -3273,10 +3405,12 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) } p_es->fmt.psz_language = malloc( 4 ); - memcpy( p_es->fmt.psz_language, - p_page->i_iso6392_language_code, 3 ); - p_es->fmt.psz_language[3] = 0; - + 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; + } switch( p_page->i_teletext_type ) { case 0x2: @@ -3329,8 +3463,9 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) 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 ); - memcpy( pid->es->fmt.p_extra, p_dr->p_data, - 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; @@ -3357,7 +3492,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) 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; @@ -3374,9 +3509,12 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) } p_es->fmt.psz_language = malloc( 4 ); - memcpy( p_es->fmt.psz_language, - p_sub->i_iso6392_language_code, 3 ); - p_es->fmt.psz_language[3] = 0; + 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 ) { @@ -3477,6 +3615,35 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) } } } + 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 ); + } + } + } + } else if( p_es->i_type == 0xa0 ) { /* MSCODEC sent by vlc */ @@ -3494,14 +3661,15 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ( 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 = + 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 ); - memcpy( pid->es->fmt.p_extra, &p_dr->p_data[10], - 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 @@ -3512,7 +3680,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) /* 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 = VLC_TRUE; + pid->es->fmt.b_packetized = true; } if( pid->es->fmt.i_cat == AUDIO_ES || @@ -3532,10 +3700,13 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) { #if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2) pid->es->fmt.psz_language = malloc( 4 ); - 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); + 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; @@ -3563,43 +3734,53 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) pid->es->fmt.p_extra_languages = malloc( sizeof(*pid->es->fmt.p_extra_languages) * pid->es->fmt.i_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); - 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; - } + 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 ); - memcpy( pid->es->fmt.psz_language, - p_decoded->i_iso_639_code, 3 ); - pid->es->fmt.psz_language[3] = 0; + 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 } } @@ -3683,7 +3864,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) /* Set demux filter */ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, p_es->i_pid, - VLC_TRUE ); + true ); } } @@ -3704,7 +3885,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) { stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, pp_clean[i]->i_pid, - VLC_FALSE ); + false ); } PIDClean( p_demux->out, pp_clean[i] ); @@ -3721,9 +3902,10 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) msg_Dbg( p_demux, "PATCallBack called" ); - if( pat->psi->i_pat_version != -1 && - ( !p_pat->b_current_next || - p_pat->i_version == pat->psi->i_pat_version ) ) + if( ( pat->psi->i_pat_version != -1 && + ( !p_pat->b_current_next || + p_pat->i_version == pat->psi->i_pat_version ) ) || + p_sys->b_user_pmt ) { dvbpsi_DeletePAT( p_pat ); return; @@ -3742,7 +3924,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) for( i = 0; i < p_sys->i_pmt; i++ ) { ts_pid_t *pmt = p_sys->pmt[i]; - vlc_bool_t b_keep = VLC_FALSE; + bool b_keep = false; for( p_program = p_pat->p_first_program; p_program != NULL; p_program = p_program->p_next ) @@ -3755,7 +3937,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) if( p_program->i_number == pmt->psi->prg[i_prg]->i_number ) { - b_keep = VLC_TRUE; + b_keep = true; break; } } @@ -3789,8 +3971,8 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) { if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, i, - VLC_FALSE ) ) - p_sys->b_dvb_control = VLC_FALSE; + false ) ) + p_sys->b_dvb_control = false; } PIDClean( p_demux->out, pid ); @@ -3809,22 +3991,21 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) { if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, - pmt_rm[i]->i_pid, VLC_FALSE ) ) - p_sys->b_dvb_control = VLC_FALSE; + pmt_rm[i]->i_pid, false ) ) + p_sys->b_dvb_control = false; } for( 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; - if( i_number != 0 ) - es_out_Control( p_demux->out, ES_OUT_DEL_GROUP, 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] ); TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] ); } - if( pmt_rm ) free( pmt_rm ); + free( pmt_rm ); } /* now create programs */ @@ -3836,7 +4017,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) if( p_program->i_number != 0 ) { ts_pid_t *pmt = &p_sys->pid[p_program->i_pid]; - vlc_bool_t b_add = VLC_TRUE; + bool b_add = true; if( pmt->b_valid ) { @@ -3845,7 +4026,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) { if( pmt->psi->prg[i_prg]->i_number == p_program->i_number ) { - b_add = VLC_FALSE; + b_add = false; break; } } @@ -3857,7 +4038,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) if( b_add ) { - PIDInit( pmt, VLC_TRUE, pat->psi ); + PIDInit( pmt, true, pat->psi ); pmt->psi->prg[pmt->psi->i_prg-1]->handle = dvbpsi_AttachPMT( p_program->i_number, (dvbpsi_pmt_callback)PMTCallBack, @@ -3877,8 +4058,8 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, - p_program->i_pid, VLC_TRUE ) ) - p_sys->b_dvb_control = VLC_FALSE; + p_program->i_pid, true ) ) + p_sys->b_dvb_control = false; } } }