X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fts.c;h=f491ca59350529c84aaf6b8d2d74bae5d9f1a6cb;hb=588723d7c65ccdb0fa5cc39b3cae132176637300;hp=2e8d34650269c9a2c0fa374e8551d822748e01bd;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 2e8d346502..f491ca5935 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -30,7 +30,8 @@ # include "config.h" #endif -#include +#include +#include #include @@ -39,7 +40,7 @@ #include #include -#include "iso_lang.h" +#include #include #include @@ -86,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[,...])." ) @@ -112,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.") @@ -137,7 +156,7 @@ 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 ); @@ -148,6 +167,7 @@ vlc_module_begin(); add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT, MTUOUT_LONGTEXT, true ); add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ); + add_string( "ts-csa2-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ); add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true ); add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, true ); @@ -157,7 +177,7 @@ vlc_module_begin(); add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT, DUMPSIZE_LONGTEXT, true ); - set_capability( "demux2", 10 ); + set_capability( "demux", 10 ); set_callbacks( Open, Close ); add_shortcut( "ts" ); vlc_module_end(); @@ -170,7 +190,7 @@ typedef struct { uint8_t i_objectTypeIndication; uint8_t i_streamType; - bool b_upStream; + bool b_upStream; uint32_t i_bufferSizeDB; uint32_t i_maxBitrate; uint32_t i_avgBitrate; @@ -182,14 +202,14 @@ typedef struct typedef struct { - bool b_useAccessUnitStartFlag; - bool b_useAccessUnitEndFlag; - bool b_useRandomAccessPointFlag; - bool b_useRandomAccessUnitsOnlyFlag; - bool b_usePaddingFlag; - bool b_useTimeStampsFlags; - bool b_useIdleFlag; - bool 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; @@ -211,11 +231,11 @@ typedef struct typedef struct { - bool b_ok; + bool b_ok; uint16_t i_es_id; - bool b_streamDependenceFlag; - bool b_OCRStreamFlag; + bool b_streamDependenceFlag; + bool b_OCRStreamFlag; uint8_t i_streamPriority; char *psz_url; @@ -230,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; @@ -290,8 +310,8 @@ typedef struct { int i_pid; - bool b_seen; - bool b_valid; + bool b_seen; + bool b_valid; int i_cc; /* countinuity counter */ /* PSI owner (ie PMT -> PAT, ES -> PMT */ @@ -310,6 +330,8 @@ typedef struct struct demux_sys_t { + vlc_mutex_t csa_lock; + /* TS packet size (188, 192, 204) */ int i_packet_size; @@ -320,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; /* */ - bool b_es_id_pid; + bool b_es_id_pid; csa_t *csa; int i_csa_pkt_size; - bool b_silent; + bool b_silent; - bool b_udp_out; + bool b_udp_out; int fd; /* udp socket */ uint8_t *buffer; - bool b_dvb_control; + bool b_dvb_control; int i_dvb_program; int64_t i_dvb_start; int64_t i_dvb_length; @@ -343,10 +366,10 @@ struct demux_sys_t char *psz_file; /* file to dump data in */ FILE *p_file; /* filehandle */ uint64_t i_write; /* bytes written */ - bool b_file_out; /* dump mode enabled */ + bool b_file_out; /* dump mode enabled */ /* */ - bool b_meta; + bool b_meta; }; static int Demux ( demux_t *p_demux ); @@ -376,6 +399,9 @@ 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 @@ -396,8 +422,8 @@ static int Open( vlc_object_t *p_this ) ts_pid_t *pat; const char *psz_mode; - bool b_append; - bool b_topfield = false; + bool b_append; + bool b_topfield = false; vlc_value_t val; @@ -538,6 +564,7 @@ static int Open( vlc_object_t *p_this ) 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; @@ -697,132 +724,59 @@ static int Open( vlc_object_t *p_this ) /* 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, true, NULL ); - - /* Dummy PMT */ - prg = malloc( sizeof( ts_prg_psi_t ) ); - if( !prg ) - { - msg_Err( p_demux, "out of memory" ); - Close( VLC_OBJECT(p_demux) ); - return VLC_ENOMEM; - } - - 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, 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; - } - } - } + 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 ); } free( val.psz_string ); @@ -894,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 ); @@ -911,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 ) @@ -926,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: *****************************************************************************/ @@ -951,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 */ - bool b_payload; /* indicates a packet with payload */ - bool 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" ); } @@ -1018,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; } @@ -1049,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++ ) { - bool b_frame = false; + bool b_frame = false; block_t *p_pkt; ts_pid_t *p_pid; @@ -1066,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; @@ -1190,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; } } @@ -1209,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 ) { @@ -1255,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; } @@ -1407,6 +1393,131 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } } +/***************************************************************************** + * + *****************************************************************************/ +static int UserPmt( demux_t *p_demux, const char *psz_fmt ) +{ + 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'; + + 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; @@ -1778,11 +1889,11 @@ static void PCRHandle( 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 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 */ + const int i_cc = p[3]&0x0f; /* continuity counter */ bool b_discontinuity = false;/* discontinuity */ /* transport_scrambling_control is ignored */ @@ -1810,7 +1921,9 @@ static bool 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 ) @@ -2083,9 +2196,9 @@ 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; + uint8_t i_flags, i_iod_tag, byte1, byte2, byte3; bool b_url; - int i_iod_length; + int i_iod_length; p_iod = malloc( sizeof( iod_descriptor_t ) ); if( !p_iod ) return NULL; @@ -2915,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]; @@ -3236,7 +3349,8 @@ 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 ); + 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 ); @@ -3501,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 */ @@ -3759,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; @@ -3854,8 +3998,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) 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] );