#define SILENT_TEXT N_("Silent mode")
#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")
+
vlc_module_begin();
set_description( _("ISO 13818-1 MPEG Transport Stream input - new" ) );
+ 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", 0, NULL, PID_TEXT, PID_LONGTEXT, VLC_TRUE );
MTUOUT_LONGTEXT, VLC_TRUE );
add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, VLC_TRUE );
add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, VLC_TRUE );
+ add_integer( "ts-capmt-sysid", 0, NULL, CAPMT_SYSID_TEXT,
+ CAPMT_SYSID_LONGTEXT, VLC_TRUE );
set_capability( "demux2", 10 );
set_callbacks( Open, Close );
} iod_descriptor_t;
-#define MAX_CAD 10
-
typedef struct
{
dvbpsi_handle handle;
/* IOD stuff (mpeg4) */
iod_descriptor_t *iod;
- /* Conditional Access descriptor */
- int i_nb_cad;
- uint8_t *cad[MAX_CAD];
- uint8_t i_cad_length[MAX_CAD];
-
} ts_prg_psi_t;
typedef struct
vlc_bool_t b_es_id_pid;
csa_t *csa;
vlc_bool_t b_silent;
+ uint16_t i_capmt_sysid;
vlc_bool_t b_udp_out;
int fd; /* udp socket */
vlc_bool_t b_dvb_control;
int i_dvb_program;
+ vlc_list_t *p_programs_list;
};
static int Demux ( demux_t *p_demux );
vlc_value_t val;
if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) <
- TS_PACKET_SIZE_MAX )
- {
- msg_Err( p_demux, "cannot peek" );
- return VLC_EGENERIC;
- }
+ TS_PACKET_SIZE_MAX ) return VLC_EGENERIC;
/* Search first sync byte */
for( i_sync = 0; i_sync < TS_PACKET_SIZE_MAX; i_sync++ )
}
if( i_sync >= TS_PACKET_SIZE_MAX )
{
- if( strcmp( p_demux->psz_demux, "ts" ) )
- {
- msg_Warn( p_demux, "TS module discarded" );
- return VLC_EGENERIC;
- }
+ if( strcmp( p_demux->psz_demux, "ts" ) ) return VLC_EGENERIC;
msg_Warn( p_demux, "this does not look like a TS stream, continuing" );
}
{
ts_pid_t *pmt = &p_sys->pid[i_pid];
- msg_Dbg( p_demux, "extra pmt specified (pid=0x%x)", i_pid );
+ msg_Dbg( p_demux, "extra pmt specified (pid=%d)", i_pid );
PIDInit( pmt, VLC_TRUE, NULL );
+ pmt->psi->i_prg = 1;
+ pmt->psi->prg = malloc( sizeof(ts_prg_psi_t) );
/* FIXME we should also ask for a number */
pmt->psi->prg[0]->handle =
dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack,
{
pid->es->fmt.i_id = i_pid;
}
- msg_Dbg( p_demux, " * es pid=0x%x type=0x%x "
+ 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,
}
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++ )
var_Get( p_demux, "ts-silent", &val );
p_sys->b_silent = val.b_bool;
+ var_Create( p_demux, "ts-capmt-sysid", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_demux, "ts-capmt-sysid", &val );
+ p_sys->i_capmt_sysid = val.i_int;
+
return VLC_SUCCESS;
}
if( pid->b_seen )
{
- msg_Dbg( p_demux, " - pid[0x%x] seen", pid->i_pid );
+ msg_Dbg( p_demux, " - pid[%d] seen", pid->i_pid );
}
if( p_sys->b_dvb_control && pid->i_pid > 0 )
}
if( p_sys->i_pmt ) free( p_sys->pmt );
+
+ if ( p_sys->p_programs_list )
+ {
+ vlc_value_t val;
+ val.p_list = p_sys->p_programs_list;
+ var_Change( p_demux, "programs", VLC_VAR_FREELIST, &val, NULL );
+ }
+
free( p_sys );
}
{
if( !p_pid->b_seen )
{
- msg_Dbg( p_demux, "pid[0x%x] unknown", p_pid->i_pid );
+ msg_Dbg( p_demux, "pid[%d] unknown", p_pid->i_pid );
}
/* We have to handle PCR if present */
PCRHandle( p_demux, p_pid, p_pkt );
if( p_sys->b_udp_out )
{
/* Send the complete block */
- net_Write( p_demux, p_sys->fd, p_sys->buffer,
+ net_Write( p_demux, p_sys->fd, NULL, p_sys->buffer,
p_sys->i_ts_read * p_sys->i_packet_size );
}
{
uint16_t i_vpid = 0, i_apid1 = 0, i_apid2 = 0, i_apid3 = 0;
ts_prg_psi_t *p_prg = NULL;
+ vlc_list_t *p_list;
i_int = (int)va_arg( args, int );
- msg_Dbg( p_demux, "DEMUX_SET_GROUP %d", i_int );
+ p_list = (vlc_list_t *)va_arg( args, vlc_list_t * );
+ msg_Dbg( p_demux, "DEMUX_SET_GROUP %d %p", i_int, p_list );
if( p_sys->b_dvb_control && i_int > 0 && i_int != p_sys->i_dvb_program )
{
stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
VLC_TRUE );
+ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr,
+ VLC_TRUE );
+
for( i = 2; i < 8192; i++ )
{
ts_pid_t *pid = &p_sys->pid[i];
}
}
}
-
- /* Set CAM descrambling */
- for ( i = 0; i < p_prg->i_nb_cad; i++ )
- {
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_CA, p_prg->i_number,
- i_vpid, i_apid1, i_apid2, i_apid3,
- p_prg->i_cad_length[i],
- p_prg->cad[i] );
- }
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_CA, p_prg->i_number,
- 0, 0, 0, 0, 0, NULL );
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_CA, 0,
- 0, 0, 0, 0, 0, NULL );
}
}
+ else
+ {
+ p_sys->i_dvb_program = -1;
+ p_sys->p_programs_list = p_list;
+ }
return VLC_SUCCESS;
}
prg->i_pid_pcr = -1;
prg->i_pid_pmt = -1;
prg->iod = NULL;
- prg->i_nb_cad = 0;
prg->handle = NULL;
TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg );
if( pid->psi->handle ) dvbpsi_DetachPMT( pid->psi->handle );
for( i = 0; i < pid->psi->i_prg; i++ )
{
- int j;
if( pid->psi->prg[i]->iod )
IODFree( pid->psi->prg[i]->iod );
- for ( j = 0; j < pid->psi->prg[i]->i_nb_cad; j++ )
- free( pid->psi->prg[i]->cad[j] );
if( pid->psi->prg[i]->handle )
dvbpsi_DetachPMT( pid->psi->prg[i]->handle );
free( pid->psi->prg[i] );
if( header[0] != 0 || header[1] != 0 || header[2] != 1 )
{
if( !p_demux->p_sys->b_silent )
- msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x] (pid: 0x%x)",
+ msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x] (pid: %d)",
header[0], header[1],header[2],header[3], pid->i_pid );
block_ChainRelease( p_pes );
return;
}
}
+ /* ISO/IEC 13818-1 2.7.5: if no pts and no dts, then dts == pts */
+ if( i_pts >= 0 && i_dts < 0 )
+ i_dts = i_pts;
+
if( p_pes )
{
block_t *p_block;
int i_diff;
#if 0
- msg_Dbg( p_demux, "pid=0x%x unit_start=%d adaptation=%d payload=%d "
+ msg_Dbg( p_demux, "pid=%d unit_start=%d adaptation=%d payload=%d "
"cc=0x%x", pid->i_pid, b_unit_start, b_adaptation,
b_payload, i_cc );
#endif
if( p[1]&0x80 )
{
- msg_Dbg( p_demux, "transport_error_indicator set (pid=0x%x)",
+ msg_Dbg( p_demux, "transport_error_indicator set (pid=%d)",
pid->i_pid );
}
{
if( p[5]&0x80 )
{
- msg_Warn( p_demux, "discontinuity_indicator (pid=0x%x) "
+ msg_Warn( p_demux, "discontinuity_indicator (pid=%d) "
"ignored", pid->i_pid );
}
}
{
if( pid->i_cc == 0xff )
{
- msg_Warn( p_demux, "first packet for pid=0x%x cc=0x%x",
+ msg_Warn( p_demux, "first packet for pid=%d cc=0x%x",
pid->i_pid, i_cc );
pid->i_cc = i_cc;
}
{
/* Small video artifacts are usually better then
* dropping full frames */
- pid->es->p_pes->i_flags |= BLOCK_FLAG_DISCONTINUITY;
+ pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
}
}
}
** libdvbpsi callbacks
****************************************************************************
****************************************************************************/
+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 )
+ return VLC_TRUE;
+ if ( p_sys->i_dvb_program == i_pgrm ) return VLC_TRUE;
+
+ if ( p_sys->p_programs_list != NULL )
+ {
+ int i;
+ 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 VLC_FALSE;
+}
+
static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
{
demux_sys_t *p_sys = p_demux->p_sys;
ts_pid_t *pmt = NULL;
ts_prg_psi_t *prg = NULL;
- int i;
- /* CA descriptor */
- uint16_t i_vpid = 0, i_apid1 = 0, i_apid2 = 0, i_apid3 = 0;
+ ts_pid_t **pp_clean = NULL;
+ int i_clean = 0, i;
msg_Dbg( p_demux, "PMTCallBack called" );
break;
}
}
- if( pmt )
- break;
+ if( pmt ) break;
}
if( pmt == NULL )
if( pid->b_valid && pid->p_owner == pmt->psi &&
pid->i_owner_number == prg->i_number && pid->psi == NULL )
{
- if( p_sys->b_dvb_control &&
- ( p_sys->i_dvb_program < 0 || p_sys->i_dvb_program == prg->i_number ) )
- {
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, i, VLC_FALSE );
- }
-
- PIDClean( p_demux->out, pid );
+ TAB_APPEND( i_clean, pp_clean, pid );
}
}
if( prg->iod )
IODFree( prg->iod );
prg->iod = NULL;
}
- for ( i = 0; i < prg->i_nb_cad; i++ )
- free( prg->cad[i] );
- prg->i_nb_cad = 0;
- msg_Dbg( p_demux, "new PMT program number=%d version=%d pid_pcr=0x%x",
+ msg_Dbg( p_demux, "new PMT program number=%d version=%d pid_pcr=%d",
p_pmt->i_program_number, p_pmt->i_version, p_pmt->i_pcr_pid );
prg->i_pid_pcr = p_pmt->i_pcr_pid;
prg->i_version = p_pmt->i_version;
+ if( DVBProgramIsSelected( p_demux, prg->i_number ) )
+ {
+ /* Set demux filter */
+ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_STATE, prg->i_pid_pcr,
+ VLC_TRUE );
+ }
+ else if ( p_sys->b_dvb_control )
+ {
+ msg_Warn( p_demux, "skipping program (not selected)" );
+ dvbpsi_DeletePMT(p_pmt);
+ return;
+ }
+
/* Parse descriptor */
for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next )
{
if( p_dr->i_tag == 0x1d )
{
/* We have found an IOD descriptor */
- msg_Warn( p_demux, " * descriptor : IOD (0x1d)" );
+ msg_Dbg( p_demux, " * descriptor : IOD (0x1d)" );
prg->iod = IODNew( p_dr->i_length, p_dr->p_data );
}
else if( p_dr->i_tag == 0x9 )
{
- msg_Dbg( p_demux, " * descriptor : CA (0x9)" );
-
- prg->cad[prg->i_nb_cad] = malloc( p_dr->i_length + 2 );
- prg->cad[prg->i_nb_cad][0] = 0x9;
- prg->cad[prg->i_nb_cad][1] = p_dr->i_length;
- memcpy( prg->cad[prg->i_nb_cad] + 2, p_dr->p_data, p_dr->i_length );
- prg->i_cad_length[prg->i_nb_cad] = p_dr->i_length + 2;
- prg->i_nb_cad++;
+ uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8)
+ | p_dr->p_data[1];
+ msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", i_sysid );
}
else
{
for( p_es = p_pmt->p_first_es; p_es != NULL; p_es = p_es->p_next )
{
- ts_pid_t *pid = &p_sys->pid[p_es->i_pid];
+ ts_pid_t tmp_pid, *old_pid = 0, *pid = &tmp_pid;
+
+ /* Find out if the PID was already declared */
+ for( i = 0; i < i_clean; i++ )
+ {
+ if( pp_clean[i] == &p_sys->pid[p_es->i_pid] )
+ {
+ old_pid = pp_clean[i];
+ break;
+ }
+ }
- if( pid->b_valid )
+ if( !old_pid && p_sys->pid[p_es->i_pid].b_valid )
{
- msg_Warn( p_demux, "pmt error: pid=0x%x already defined",
+ msg_Warn( p_demux, "pmt error: pid=%d already defined",
p_es->i_pid );
continue;
}
PIDInit( pid, VLC_FALSE, pmt->psi );
PIDFillFormat( pid, p_es->i_type );
pid->i_owner_number = prg->i_number;
-
- if ( pid->es->fmt.i_cat == VIDEO_ES && !i_vpid )
- i_vpid = p_es->i_pid;
- if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid1 )
- i_apid1 = p_es->i_pid;
- else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid2 )
- i_apid2 = p_es->i_pid;
- else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid3 )
- i_apid3 = p_es->i_pid;
+ 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 )
if( p_dr && p_dr->i_length == 2 )
{
- int i;
int i_es_id = ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1];
msg_Warn( p_demux, "found SL_descriptor es_id=%d", i_es_id );
for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
p_dr = p_dr->p_next )
{
- msg_Dbg( p_demux, " * es pid=0x%x type=0x%x dr->i_tag=0x%x",
+ 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 == 0x6a )
+ if( p_dr->i_tag == 0x05 )
{
- pid->es->fmt.i_cat = AUDIO_ES;
- pid->es->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
+ /* Registration Descriptor */
+ if( p_dr->i_length != 4 )
+ {
+ msg_Warn( p_demux, "invalid Registration Descriptor" );
+ }
+ else
+ {
+ if( !memcmp( p_dr->p_data, "AC-3", 4 ) )
+ {
+ /* ATSC with stream_type 0x81 (but this descriptor
+ * is then not mandatory */
+ pid->es->fmt.i_cat = AUDIO_ES;
+ pid->es->fmt.i_codec = VLC_FOURCC('a','5','2',' ');
+ }
+ else if( !memcmp( p_dr->p_data, "DTS1", 4 ) ||
+ !memcmp( p_dr->p_data, "DTS2", 4 ) ||
+ !memcmp( p_dr->p_data, "DTS3", 4 ) )
+ {
+ /*registration descriptor(ETSI TS 101 154 Annex F)*/
+ pid->es->fmt.i_cat = AUDIO_ES;
+ pid->es->fmt.i_codec = VLC_FOURCC('d','t','s',' ');
+ }
+ else if( !memcmp( p_dr->p_data, "BSSD", 4 ) )
+ {
+ pid->es->fmt.i_cat = AUDIO_ES;
+ pid->es->fmt.i_codec = VLC_FOURCC('l','p','c','m');
+ }
+ else
+ {
+ msg_Warn( p_demux,
+ "unknown Registration Descriptor (%4.4s)",
+ p_dr->p_data );
+ }
+ }
+
}
- else if( p_dr->i_tag == 0x05 )
+ else if( p_dr->i_tag == 0x6a )
{
-
- /* DTS registration descriptor (ETSI TS 101 154 Annex F) */
+ /* DVB with stream_type 0x06 */
pid->es->fmt.i_cat = AUDIO_ES;
- pid->es->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
+ pid->es->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
}
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" );
+ pid->es->fmt.i_cat = SPU_ES;
+ pid->es->fmt.i_codec = VLC_FOURCC( 'v', 'b', 'i', 'd' );
+ pid->es->fmt.psz_description = strdup( "VBI Data" );
+ 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 );
+ }
+ else if( p_dr->i_tag == 0x46 )
+ {
+ msg_Dbg( p_demux, " * VBI Teletext descriptor" );
+ pid->es->fmt.i_cat = SPU_ES;
+ pid->es->fmt.i_codec = VLC_FOURCC( 'v', 'b', 'i', 't' );
+ pid->es->fmt.psz_description = strdup( "VBI Teletext" );
+ 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 );
+ }
else if( p_dr->i_tag == 0x56 )
{
- msg_Dbg( p_demux, " * 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" );
+ 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 );
}
#ifdef _DVBPSI_DR_59_H_
else if( p_dr->i_tag == 0x59 )
p_es->fmt.subs.dvb.i_id =
sub->p_subtitle[n].i_composition_page_id;
/* Hack, FIXME */
- pid->es->fmt.subs.dvb.i_id |=
+ p_es->fmt.subs.dvb.i_id |=
((int)sub->p_subtitle[n].i_ancillary_page_id << 16);
TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es );
pid->es->fmt.i_group = p_pmt->i_program_number;
if( pid->es->fmt.i_cat == UNKNOWN_ES )
{
- msg_Dbg( p_demux, " * es pid=0x%x type=0x%x *unknown*",
+ msg_Dbg( p_demux, " * es pid=%d type=%d *unknown*",
p_es->i_pid, p_es->i_type );
}
else if( !p_sys->b_udp_out )
{
- int i;
-
- msg_Dbg( p_demux, " * es pid=0x%x type=0x%x fcc=%4.4s",
+ msg_Dbg( p_demux, " * es pid=%d type=%d fcc=%4.4s",
p_es->i_pid, p_es->i_type, (char*)&pid->es->fmt.i_codec );
- if( p_sys->b_es_id_pid )
+ if( p_sys->b_es_id_pid ) pid->es->fmt.i_id = p_es->i_pid;
+
+ /* Check if we can avoid restarting the ES */
+ if( old_pid &&
+ pid->es->fmt.i_codec == old_pid->es->fmt.i_codec &&
+ pid->es->fmt.i_extra == old_pid->es->fmt.i_extra &&
+ pid->es->fmt.i_extra == 0 &&
+ pid->i_extra_es == old_pid->i_extra_es &&
+ ( ( !pid->es->fmt.psz_language &&
+ !old_pid->es->fmt.psz_language ) ||
+ ( pid->es->fmt.psz_language &&
+ old_pid->es->fmt.psz_language &&
+ !strcmp( pid->es->fmt.psz_language,
+ old_pid->es->fmt.psz_language ) ) ) )
{
- pid->es->fmt.i_id = p_es->i_pid;
+ pid->es->id = old_pid->es->id;
+ old_pid->es->id = NULL;
+ for( i = 0; i < pid->i_extra_es; i++ )
+ {
+ pid->extra_es[i]->id = old_pid->extra_es[i]->id;
+ old_pid->extra_es[i]->id = NULL;
+ }
}
-
- pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt );
-
- for( i = 0; i < pid->i_extra_es; i++ )
+ else
{
- pid->extra_es[i]->id =
- es_out_Add( p_demux->out, &pid->extra_es[i]->fmt);
+ if( old_pid )
+ {
+ PIDClean( p_demux->out, old_pid );
+ TAB_REMOVE( i_clean, pp_clean, old_pid );
+ old_pid = 0;
+ }
+
+ pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt );
+ for( i = 0; i < pid->i_extra_es; i++ )
+ {
+ pid->extra_es[i]->id =
+ es_out_Add( p_demux->out, &pid->extra_es[i]->fmt );
+ }
}
}
+ /* Add ES to the list */
+ if( old_pid )
+ {
+ PIDClean( p_demux->out, old_pid );
+ TAB_REMOVE( i_clean, pp_clean, old_pid );
+ }
+ p_sys->pid[p_es->i_pid] = *pid;
+
for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
p_dr = p_dr->p_next )
{
if( p_dr->i_tag == 0x9 )
{
- msg_Dbg( p_demux, " * descriptor : CA (0x9)" );
-
- prg->cad[prg->i_nb_cad] = malloc( p_dr->i_length + 2 );
- prg->cad[prg->i_nb_cad][0] = 0x9;
- prg->cad[prg->i_nb_cad][1] = p_dr->i_length;
- memcpy( prg->cad[prg->i_nb_cad] + 2, p_dr->p_data, p_dr->i_length );
- prg->i_cad_length[prg->i_nb_cad] = p_dr->i_length + 2;
- prg->i_nb_cad++;
- }
- else
- {
- msg_Dbg( p_demux, " * descriptor : unknown (0x%x)",
- p_dr->i_tag );
+ uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8)
+ | p_dr->p_data[1];
+ msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x",
+ i_sysid );
}
}
- if( p_sys->b_dvb_control &&
- ( p_sys->i_dvb_program < 0 || p_sys->i_dvb_program == prg->i_number ) )
+ if( DVBProgramIsSelected( p_demux, prg->i_number ) )
{
/* Set demux filter */
stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
VLC_TRUE );
}
}
- dvbpsi_DeletePMT(p_pmt);
- if( p_sys->b_dvb_control &&
- ( p_sys->i_dvb_program < 0 || p_sys->i_dvb_program == prg->i_number ) )
+ if( DVBProgramIsSelected( p_demux, prg->i_number ) )
{
/* Set CAM descrambling */
- for ( i = 0; i < prg->i_nb_cad; i++ )
+ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_CA, p_pmt );
+ }
+ else
+ {
+ dvbpsi_DeletePMT( p_pmt );
+ }
+
+ for ( i = 0; i < i_clean; i++ )
+ {
+ if( DVBProgramIsSelected( p_demux, prg->i_number ) )
{
stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_CA, prg->i_number,
- i_vpid, i_apid1, i_apid2, i_apid3,
- prg->i_cad_length[i], prg->cad[i] );
+ ACCESS_SET_PRIVATE_ID_STATE, pp_clean[i]->i_pid,
+ VLC_FALSE );
}
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_CA, prg->i_number,
- 0, 0, 0, 0, 0, NULL );
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_CA, 0,
- 0, 0, 0, 0, 0, NULL );
+
+ PIDClean( p_demux->out, pp_clean[i] );
}
+ if( i_clean ) free( pp_clean );
}
static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
return;
}
- msg_Dbg( p_demux, "new PAT ts_id=0x%x version=%d current_next=%d",
+ msg_Dbg( p_demux, "new PAT ts_id=%d version=%d current_next=%d",
p_pat->i_ts_id, p_pat->i_version, p_pat->b_current_next );
/* Clean old */
break;
}
}
- if( b_keep )
- break;
+ if( b_keep ) break;
}
}
+
if( !b_keep )
{
TAB_APPEND( i_pmt_rm, pmt_rm, pmt );
int i_prg;
for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
{
- if( pid->p_owner->prg[i_prg]->i_pid_pmt ==
- pmt_rm[j]->i_pid && pid->es->id )
- {
- /* We only remove es that aren't defined by extra pmt */
- if( p_sys->b_dvb_control )
- {
- if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, i, VLC_FALSE ) )
- p_sys->b_dvb_control = VLC_FALSE;
- }
+ /* We only remove es that aren't defined by extra pmt */
+ if( pid->p_owner->prg[i_prg]->i_pid_pmt !=
+ pmt_rm[j]->i_pid ) continue;
- PIDClean( p_demux->out, pid );
- break;
+ if( p_sys->b_dvb_control && pid->es->id )
+ {
+ if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_STATE, i,
+ VLC_FALSE ) )
+ p_sys->b_dvb_control = VLC_FALSE;
}
- }
- if( !pid->b_valid )
+
+ PIDClean( p_demux->out, pid );
break;
+ }
+
+ if( !pid->b_valid ) break;
}
}
{
if( p_sys->b_dvb_control )
{
- if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, pmt_rm[i]->i_pid, VLC_FALSE ) )
+ 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;
}
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 );
- }
+
+ if( pmt_rm ) free( pmt_rm );
}
/* now create programs */
for( p_program = p_pat->p_first_program; p_program != NULL;
p_program = p_program->p_next )
{
- msg_Dbg( p_demux, " * number=%d pid=0x%x", p_program->i_number,
+ msg_Dbg( p_demux, " * number=%d pid=%d", p_program->i_number,
p_program->i_pid );
if( p_program->i_number != 0 )
{
/* Now select PID at access level */
if( p_sys->b_dvb_control )
{
- if( p_sys->i_dvb_program <= 0 || p_sys->i_dvb_program == p_program->i_number )
+ if( DVBProgramIsSelected( p_demux, p_program->i_number ) )
{
if( p_sys->i_dvb_program == 0 )
p_sys->i_dvb_program = p_program->i_number;
dvbpsi_DeletePAT( p_pat );
}
+
projects / vlc / blobdiff