# include <dvbpsi/tot.h>
#undef TS_DEBUG
-static void ts_debug(const char *format, ...)
+VLC_FORMAT(1, 2) static void ts_debug(const char *format, ...)
{
#ifdef TS_DEBUG
va_list ap;
static void PIDInit ( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner );
static void PIDClean( demux_t *, ts_pid_t *pid );
-static int PIDFillFormat( ts_pid_t *pid, int i_stream_type );
+static void PIDFillFormat( ts_es_t *es, int i_stream_type );
-static void PATCallBack( demux_t *, dvbpsi_pat_t * );
-static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt );
+static void PATCallBack( void*, dvbpsi_pat_t * );
+static void PMTCallBack( void *data, dvbpsi_pmt_t *p_pmt );
static void PSINewTableCallBack( demux_t *, dvbpsi_handle,
uint8_t i_table_id, uint16_t i_extension );
static int ChangeKeyCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * );
/* Init PAT handler */
pat = &p_sys->pid[0];
PIDInit( pat, true, NULL );
- pat->psi->handle = dvbpsi_AttachPAT( (dvbpsi_pat_callback)PATCallBack,
- p_demux );
+ pat->psi->handle = dvbpsi_AttachPAT( PATCallBack, p_demux );
if( p_sys->b_dvb_meta )
{
ts_pid_t *sdt = &p_sys->pid[0x11];
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 );
+ prg->handle = dvbpsi_AttachPMT(
+ i_number != TS_USER_PMT_NUMBER ? i_number : 1,
+ PMTCallBack, p_demux );
TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg );
psz = strchr( psz, '=' );
else
{
const int i_stream_type = strtol( psz_opt, NULL, 0 );
- PIDFillFormat( pid, i_stream_type );
+ PIDFillFormat( pid->es, i_stream_type );
}
pid->es->fmt.i_group = i_number;
if( p_sys->b_es_id_pid )
if( p_owner )
{
ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) );
- if( prg )
- {
- /* PMT */
- prg->i_version = -1;
- prg->i_number = -1;
- prg->i_pid_pcr = -1;
- prg->i_pid_pmt = -1;
- prg->i_pcr_value= -1;
- prg->iod = NULL;
- prg->handle = NULL;
-
- TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg );
- }
+ if( !prg )
+ return;
+ /* PMT */
+ prg->i_version = -1;
+ prg->i_number = -1;
+ prg->i_pid_pcr = -1;
+ prg->i_pid_pmt = -1;
+ prg->i_pcr_value= -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 ) );
- 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;
- }
+ pid->es = calloc( 1, sizeof( ts_es_t ) );
+ if( !pid->es )
+ return;
+
+ es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 );
+ pid->es->pp_last = &pid->es->p_pes;
}
}
return;
mtime_t i_pcr = GetPCR( p_bk );
- if( i_pcr >= 0 )
- {
- if( p_sys->i_pid_ref_pcr == pid->i_pid )
- {
- p_sys->i_current_pcr = AdjustPCRWrapAround( p_demux, i_pcr );
- }
+ if( i_pcr < 0 )
+ return;
- /* Search program and set the PCR */
- for( int i = 0; i < p_sys->i_pmt; i++ )
- {
- for( int i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
+ if( p_sys->i_pid_ref_pcr == pid->i_pid )
+ p_sys->i_current_pcr = AdjustPCRWrapAround( p_demux, i_pcr );
+
+ /* Search program and set the PCR */
+ for( int i = 0; i < p_sys->i_pmt; i++ )
+ for( int i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
+ if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr )
{
- if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr )
- {
- p_sys->pmt[i]->psi->prg[i_prg]->i_pcr_value = i_pcr;
- es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
- (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number,
- (int64_t)(VLC_TS_0 + i_pcr * 100 / 9) );
- }
+ p_sys->pmt[i]->psi->prg[i_prg]->i_pcr_value = i_pcr;
+ es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
+ (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number,
+ (int64_t)(VLC_TS_0 + i_pcr * 100 / 9) );
}
- }
- }
}
static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
return i_ret;
}
-static int PIDFillFormat( ts_pid_t *pid, int i_stream_type )
+static void PIDFillFormat( ts_es_t *es, int i_stream_type )
{
- es_format_t *fmt = &pid->es->fmt;
+ es_format_t *fmt = &es->fmt;
switch( i_stream_type )
{
break;
case 0x10: /* MPEG4 (video) */
es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MP4V );
- pid->es->b_gather = true;
+ es->b_gather = true;
break;
case 0x1B: /* H264 <- check transport syntax/needed descriptor */
es_format_Init( fmt, VIDEO_ES, VLC_CODEC_H264 );
case 0xa0: /* MSCODEC vlc (video) (fixed later) */
es_format_Init( fmt, UNKNOWN_ES, 0 );
- pid->es->b_gather = true;
+ es->b_gather = true;
break;
case 0x06: /* PES_PRIVATE (fixed later) */
/* PES packets usually contain truncated frames */
fmt->b_packetized = false;
-
- return fmt->i_cat == UNKNOWN_ES ? VLC_EGENERIC : VLC_SUCCESS ;
}
/*****************************************************************************
(*pi_data)--;
i_len = ( i_len << 7 ) + ( i_b&0x7f );
- } while( i_b&0x80 );
+ } while( i_b&0x80 && *pi_data > 0 );
+
+ if (i_len > *pi_data)
+ i_len = *pi_data;
- return( i_len );
+ return i_len;
}
-static int IODGetByte( int *pi_data, uint8_t **pp_data )
+static int IODGetBytes( int *pi_data, uint8_t **pp_data, size_t bytes )
{
- if( *pi_data > 0 )
+ uint32_t res = 0;
+ while( *pi_data > 0 && bytes-- )
{
- const int i_b = **pp_data;
+ res <<= 8;
+ res |= **pp_data;
(*pp_data)++;
(*pi_data)--;
- return( i_b );
}
- return( 0 );
-}
-
-static int IODGetWord( int *pi_data, uint8_t **pp_data )
-{
- const int i1 = IODGetByte( pi_data, pp_data );
- const int i2 = IODGetByte( pi_data, pp_data );
- return( ( i1 << 8 ) | i2 );
-}
-
-static int IODGet3Bytes( int *pi_data, uint8_t **pp_data )
-{
- const int i1 = IODGetByte( pi_data, pp_data );
- const int i2 = IODGetByte( pi_data, pp_data );
- const int i3 = IODGetByte( pi_data, pp_data );
- return( ( i1 << 16 ) | ( i2 << 8) | i3 );
-}
-
-static uint32_t IODGetDWord( int *pi_data, uint8_t **pp_data )
-{
- const uint32_t i1 = IODGetWord( pi_data, pp_data );
- const uint32_t i2 = IODGetWord( pi_data, pp_data );
- return( ( i1 << 16 ) | i2 );
+ return res;
}
static char* IODGetURL( int *pi_data, uint8_t **pp_data )
{
- int i_url_len = IODGetByte( pi_data, pp_data );
- char *url = malloc( i_url_len + 1 );
- if( !url ) return NULL;
- for( int i = 0; i < i_url_len; i++ )
- {
- url[i] = IODGetByte( pi_data, pp_data );
- }
- url[i_url_len] = '\0';
- return( url );
+ int len = IODGetBytes( pi_data, pp_data, 1 );
+ if (len > *pi_data)
+ len = *pi_data;
+ char *url = strndup( (char*)*pp_data, len );
+ *pp_data += len;
+ *pi_data -= len;
+ return url;
}
static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
if( !p_iod )
return NULL;
- ts_debug( "\n************ IOD ************" );
-
if( i_data < 3 )
{
return p_iod;
}
- byte1 = IODGetByte( &i_data, &p_data );
- byte2 = IODGetByte( &i_data, &p_data );
- byte3 = IODGetByte( &i_data, &p_data );
+ byte1 = IODGetBytes( &i_data, &p_data, 1 );
+ byte2 = IODGetBytes( &i_data, &p_data, 1 );
+ byte3 = IODGetBytes( &i_data, &p_data, 1 );
if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor
{
i_iod_label = byte1;
return p_iod;
}
- int i_iod_length = IODDescriptorLength( &i_data, &p_data );
- ts_debug( "\n* length:%d", i_iod_length );
- if( i_iod_length > i_data )
- {
- i_iod_length = i_data;
- }
+ IODDescriptorLength( &i_data, &p_data );
- uint16_t i_od_id = ( IODGetByte( &i_data, &p_data ) << 2 );
- uint8_t i_flags = IODGetByte( &i_data, &p_data );
+ uint16_t i_od_id = ( IODGetBytes( &i_data, &p_data, 1 ) << 2 );
+ uint8_t i_flags = IODGetBytes( &i_data, &p_data, 1 );
i_od_id |= i_flags >> 6;
ts_debug( "\n* od_id:%d", i_od_id );
ts_debug( "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 );
p_iod->psz_url = NULL;
}
- uint8_t i_ODProfileLevelIndication = IODGetByte( &i_data, &p_data );
- uint8_t i_sceneProfileLevelIndication = IODGetByte( &i_data, &p_data );
- uint8_t i_audioProfileLevelIndication = IODGetByte( &i_data, &p_data );
- uint8_t i_visualProfileLevelIndication = IODGetByte( &i_data, &p_data );
- uint8_t i_graphicsProfileLevelIndication = IODGetByte( &i_data, &p_data );
- ts_debug( "\n* ODProfileLevelIndication:%d", i_ODProfileLevelIndication );
- ts_debug( "\n* sceneProfileLevelIndication:%d", i_sceneProfileLevelIndication );
- ts_debug( "\n* audioProfileLevelIndication:%d", i_audioProfileLevelIndication );
- ts_debug( "\n* visualProfileLevelIndication:%d", i_visualProfileLevelIndication );
- ts_debug( "\n* graphicsProfileLevelIndication:%d", i_graphicsProfileLevelIndication );
-
- for (int i_es_index = 0; i_data > 0 && i_es_index < 255; i_es_index++)
+ /* Profile Level Indication */
+ IODGetBytes( &i_data, &p_data, 1 ); /* OD */
+ IODGetBytes( &i_data, &p_data, 1 ); /* scene */
+ IODGetBytes( &i_data, &p_data, 1 ); /* audio */
+ IODGetBytes( &i_data, &p_data, 1 ); /* visual */
+ IODGetBytes( &i_data, &p_data, 1 ); /* graphics */
+
+ int i_length = 0;
+ int i_data_sav = i_data;
+ uint8_t *p_data_sav = p_data;
+ for (int i = 0; i_data > 0 && i < 255; i++)
{
- int i_tag = IODGetByte( &i_data, &p_data );
- int i_length = IODDescriptorLength( &i_data, &p_data );
+ es_mpeg4_descriptor_t *es_descr = &p_iod->es_descr[i];
+
+ p_data = p_data_sav + i_length;
+ i_data = i_data_sav - i_length;
- int i_data_sav = i_data;
- uint8_t *p_data_sav = p_data;
+ int i_tag = IODGetBytes( &i_data, &p_data, 1 );
+ i_length = IODDescriptorLength( &i_data, &p_data );
+
+ i_data_sav = i_data;
+ p_data_sav = p_data;
i_data = i_length;
- switch( i_tag )
+ if ( i_tag != 0x03 )
{
- case 0x03:
- {
-#define es_descr p_iod->es_descr[i_es_index]
- int i_decoderConfigDescr_length;
- ts_debug( "\n* - ES_Descriptor length:%d", i_length );
- es_descr.b_ok = 1;
-
- es_descr.i_es_id = IODGetWord( &i_data, &p_data );
- i_flags = IODGetByte( &i_data, &p_data );
- bool b_streamDependenceFlag = ( i_flags >> 7 )&0x01;
- bool b_OCRStreamFlag = ( i_flags >> 5 )&0x01;
- uint8_t i_streamPriority = i_flags & 0x1f;
- ts_debug( "\n* * streamDependenceFlag:%d", b_streamDependenceFlag );
- ts_debug( "\n* * OCRStreamFlag:%d", b_OCRStreamFlag );
- ts_debug( "\n* * streamPriority:%d", i_streamPriority );
- if( b_streamDependenceFlag )
- {
- uint16_t i_dependOn_es_id = IODGetWord( &i_data, &p_data );
- ts_debug( "\n* * dependOn_es_id:%d", i_dependOn_es_id );
- }
+ ts_debug( "\n* - OD tag:0x%x Unsupported", i_tag );
+ continue;
+ }
- if( (i_flags >> 6) & 0x01 )
- {
- es_descr.psz_url = IODGetURL( &i_data, &p_data );
- ts_debug( "\n* url string:%s", es_descr.psz_url );
- }
- else
- {
- es_descr.psz_url = NULL;
- }
+ es_descr->i_es_id = IODGetBytes( &i_data, &p_data, 2 );
+ int i_flags = IODGetBytes( &i_data, &p_data, 1 );
+ bool b_streamDependenceFlag = ( i_flags >> 7 )&0x01;
+ if( b_streamDependenceFlag )
+ IODGetBytes( &i_data, &p_data, 2 ); /* dependOn_es_id */
- if( b_OCRStreamFlag )
- {
- uint16_t i_OCR_es_id = IODGetWord( &i_data, &p_data );
- ts_debug( "\n* * OCR_es_id:%d", i_OCR_es_id );
- }
+ if( (i_flags >> 6) & 0x01 )
+ es_descr->psz_url = IODGetURL( &i_data, &p_data );
- if( IODGetByte( &i_data, &p_data ) != 0x04 )
- {
- ts_debug( "\n* ERR missing DecoderConfigDescr" );
- es_descr.b_ok = 0;
- break;
- }
- i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
- ts_debug( "\n* - DecoderConfigDesc length:%d", i_decoderConfigDescr_length );
-#define dec_descr es_descr.dec_descr
- dec_descr.i_objectTypeIndication = IODGetByte( &i_data, &p_data );
- i_flags = IODGetByte( &i_data, &p_data );
- dec_descr.i_streamType = i_flags >> 2;
-
- bool b_upStream = ( i_flags >> 1 )&0x01;
- uint32_t i_bufferSizeDB = IODGet3Bytes( &i_data, &p_data );
- uint32_t i_maxBitrate = IODGetDWord( &i_data, &p_data );
- uint32_t i_avgBitrate = IODGetDWord( &i_data, &p_data );
- ts_debug( "\n* * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication );
- ts_debug( "\n* * streamType:0x%x", dec_descr.i_streamType );
- ts_debug( "\n* * upStream:%d", b_upStream );
- ts_debug( "\n* * bufferSizeDB:%d", i_bufferSizeDB );
- ts_debug( "\n* * maxBitrate:%d", i_maxBitrate );
- ts_debug( "\n* * avgBitrate:%d", i_avgBitrate );
- if( i_decoderConfigDescr_length > 13 && IODGetByte( &i_data, &p_data ) == 0x05 )
- {
- dec_descr.i_extra = IODDescriptorLength( &i_data, &p_data );
- if( dec_descr.i_extra > 0 )
- {
- dec_descr.p_extra = xmalloc( dec_descr.i_extra );
- }
- for( int i = 0; i < dec_descr.i_extra; i++ )
- {
- dec_descr.p_extra[i] = IODGetByte( &i_data, &p_data );
- }
- }
- else
- {
- dec_descr.i_extra = 0;
- dec_descr.p_extra = NULL;
- }
- }
-#undef dec_descr
- {
- int i_SLConfigDescr_length;
- int i_predefined;
+ bool b_OCRStreamFlag = ( i_flags >> 5 )&0x01;
+ if( b_OCRStreamFlag )
+ IODGetBytes( &i_data, &p_data, 2 ); /* OCR_es_id */
- if( IODGetByte( &i_data, &p_data ) != 0x06 )
- {
- ts_debug( "\n* ERR missing SLConfigDescr" );
- es_descr.b_ok = 0;
- break;
- }
- i_SLConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
- ts_debug( "\n* - SLConfigDescr length:%d", i_SLConfigDescr_length );
- i_predefined = IODGetByte( &i_data, &p_data );
- ts_debug( "\n* * i_predefined:0x%x", i_predefined );
- switch( i_predefined )
- {
- case 0x01:
- // FIXME
- break;
- default:
- ts_debug( "\n* ERR unsupported SLConfigDescr predefined" );
- es_descr.b_ok = 0;
- break;
- }
+ if( IODGetBytes( &i_data, &p_data, 1 ) != 0x04 )
+ {
+ ts_debug( "\n* ERR missing DecoderConfigDescr" );
+ continue;
+ }
+ decoder_config_descriptor_t *dec_descr = &es_descr->dec_descr;
+ dec_descr->i_objectTypeIndication = IODGetBytes( &i_data, &p_data, 1 );
+ i_flags = IODGetBytes( &i_data, &p_data, 1 );
+ dec_descr->i_streamType = i_flags >> 2;
+
+ IODGetBytes( &i_data, &p_data, 3); /* bufferSizeDB */
+ IODGetBytes( &i_data, &p_data, 4); /* maxBitrate */
+ IODGetBytes( &i_data, &p_data, 4 ); /* avgBitrate */
+
+ int i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
+ if( i_decoderConfigDescr_length > 13 && IODGetBytes( &i_data, &p_data, 1 ) == 0x05 )
+ {
+ dec_descr->i_extra = IODDescriptorLength( &i_data, &p_data );
+ if( dec_descr->i_extra > 0 )
+ {
+ dec_descr->p_extra = xmalloc( dec_descr->i_extra );
+ memcpy(dec_descr->p_extra, p_data, dec_descr->i_extra);
+ p_data += dec_descr->i_extra;
+ i_data -= dec_descr->i_extra;
}
- break;
-#undef es_descr
+ }
+ else
+ {
+ dec_descr->i_extra = 0;
+ dec_descr->p_extra = NULL;
+ }
+
+ if( IODGetBytes( &i_data, &p_data, 1 ) != 0x06 )
+ {
+ ts_debug( "\n* ERR missing SLConfigDescr" );
+ continue;
+ }
+ IODDescriptorLength( &i_data, &p_data ); /* SLConfigDescr_length */
+ switch( IODGetBytes( &i_data, &p_data, 1 ) /* predefined */ )
+ {
default:
- ts_debug( "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length );
+ ts_debug( "\n* ERR unsupported SLConfigDescr predefined" );
+ case 0x01:
+ // FIXME
break;
}
-
- p_data = p_data_sav + i_length;
- i_data = i_data_sav - i_length;
+ es_descr->b_ok = true;
}
- ts_debug( "\n*****************************\n" );
+
return p_iod;
}
size_t i_length,
bool b_broken )
{
+ /* Deal with no longer broken providers (no switch byte
+ but sending ISO_8859-1 instead of ISO_6937) without
+ removing them from the broken providers table
+ (keep the entry for correctly handling recorded TS).
+ */
+ b_broken = b_broken && i_length && *psz_instring > 0x20;
+
if( b_broken )
return FromCharset( "ISO_8859-1", psz_instring, i_length );
return vlc_from_EIT( psz_instring, i_length );
}
#endif
-#ifdef _DVBPSI_DR_59_H_
dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
if( p_dr )
{
memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 );
}
}
-#endif
/* */
es_format_Init( p_fmt, SPU_ES, VLC_CODEC_TELETEXT );
dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
int i_page = 0;
-#ifdef _DVBPSI_DR_59_H_
dvbpsi_subtitling_dr_t *p_sub = dvbpsi_DecodeSubtitlingDr( p_dr );
for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ )
{
( i_type >= 0x20 && i_type <= 0x24 ) )
i_page++;
}
-#endif
if( !p_demux->p_sys->b_split_es || i_page <= 0 )
{
}
else
{
-#ifdef _DVBPSI_DR_59_H_
for( int i = 0; i < p_sub->i_subtitles_number; i++ )
{
ts_es_t *p_es;
p_es->fmt.subs.dvb.i_id = ( p->i_composition_page_id << 0 ) |
( p->i_ancillary_page_id << 16 );
}
-#endif
}
}
static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid,
/* Subtitle/Teletext/VBI fallbacks */
dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
-#ifdef _DVBPSI_DR_59_H_
dvbpsi_subtitling_dr_t *p_sub;
if( p_dr && ( p_sub = dvbpsi_DecodeSubtitlingDr( p_dr ) ) )
{
}
}
}
-#else
- if( p_fmt->i_cat == UNKNOWN_ES && p_dr )
- PMTSetupEsDvbSubtitle( p_demux, pid, p_es );
-#endif
+
if( p_fmt->i_cat == UNKNOWN_ES &&
( PMTEsFindDescriptor( p_es, 0x45 ) || /* VBI Data descriptor */
PMTEsFindDescriptor( p_es, 0x46 ) || /* VBI Teletext descriptor */
}
}
-#ifdef _DVBPSI_DR_52_H_
/* FIXME is it useful ? */
if( PMTEsFindDescriptor( p_es, 0x52 ) )
{
msg_Dbg( p_demux, " * Stream Component Identifier: %d", p_si->i_component_tag );
}
-#endif
}
static void PMTSetupEs0xEA( demux_t *p_demux, ts_pid_t *pid,
p_fmt->b_packetized = true;
}
-static void PMTSetupEsHDMV( demux_t *p_demux, ts_pid_t *pid,
- const dvbpsi_pmt_es_t *p_es )
+static void PMTSetupEsHDMV( ts_pid_t *pid, const dvbpsi_pmt_es_t *p_es )
{
- VLC_UNUSED(p_demux);
es_format_t *p_fmt = &pid->es->fmt;
/* Blu-Ray mapping */
{
p_fmt->i_cat = p_regs[i].i_cat;
p_fmt->i_codec = p_regs[i].i_codec;
- break;
+ return;
}
}
}
+static char *GetAudioTypeDesc(demux_t *p_demux, int type)
+{
+ static const char *audio_type[] = {
+ NULL,
+ N_("clean effects"),
+ N_("hearing impaired"),
+ N_("visual impaired commentary"),
+ };
+
+ if (type < 0 || type > 3)
+ msg_Dbg( p_demux, "unknown audio type: %d", type);
+ else if (type > 0)
+ return strdup(audio_type[type]);
+
+ return NULL;
+}
static void PMTParseEsIso639( demux_t *p_demux, ts_pid_t *pid,
const dvbpsi_pmt_es_t *p_es )
{
pid->es->fmt.psz_language = malloc( 4 );
if( pid->es->fmt.psz_language )
{
- memcpy( pid->es->fmt.psz_language,
- p_decoded->code[0].iso_639_code, 3 );
+ 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:
+ int type = p_decoded->code[0].i_audio_type;
+ pid->es->fmt.psz_description = GetAudioTypeDesc(p_demux, type);
+ if (type == 0)
pid->es->fmt.i_priority = 1; // prioritize normal audio tracks
- pid->es->fmt.psz_description = NULL;
- break;
- case 1:
- pid->es->fmt.psz_description =
- strdup(_("clean effects"));
- break;
- case 2:
- pid->es->fmt.psz_description =
- strdup(_("hearing impaired"));
- break;
- case 3:
- pid->es->fmt.psz_description =
- strdup(_("visual impaired commentary"));
- break;
- default:
- msg_Dbg( p_demux, "unknown audio type: %d",
- p_decoded->code[0].i_audio_type);
- pid->es->fmt.psz_description = NULL;
- break;
- }
+
pid->es->fmt.i_extra_languages = p_decoded->i_code_count-1;
if( pid->es->fmt.i_extra_languages > 0 )
pid->es->fmt.p_extra_languages =
{
for( int i = 0; i < pid->es->fmt.i_extra_languages; i++ )
{
- msg_Dbg( p_demux, "bang" );
- pid->es->fmt.p_extra_languages[i].psz_language =
- malloc(4);
+ 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;
- }
-
+ int type = p_decoded->code[i].i_audio_type;
+ pid->es->fmt.psz_description = GetAudioTypeDesc(p_demux, type);
}
}
#else
#endif
}
-static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
+static void PMTCallBack( void *data, dvbpsi_pmt_t *p_pmt )
{
- demux_sys_t *p_sys = p_demux->p_sys;
- dvbpsi_descriptor_t *p_dr;
- dvbpsi_pmt_es_t *p_es;
-
- ts_pid_t *pmt = NULL;
- ts_prg_psi_t *prg = NULL;
+ demux_t *p_demux = data;
+ demux_sys_t *p_sys = p_demux->p_sys;
- ts_pid_t **pp_clean = NULL;
- int i_clean = 0;
- bool b_hdmv = false;
+ ts_pid_t *pmt = NULL;
+ ts_prg_psi_t *prg;
msg_Dbg( p_demux, "PMTCallBack called" );
/* First find this PMT declared in PAT */
- for( int i = 0; i < p_sys->i_pmt; i++ )
- {
- for( int i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
+ for( int i = 0; !pmt && i < p_sys->i_pmt; i++ )
+ for( int i_prg = 0; !pmt && i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
{
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 )
+ 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];
- break;
}
}
- if( pmt )
- break;
- }
if( pmt == NULL )
{
return;
}
+
if( prg->i_version != -1 &&
( !p_pmt->b_current_next || prg->i_version == p_pmt->i_version ) )
{
return;
}
+ ts_pid_t **pp_clean = NULL;
+ int i_clean = 0;
/* Clean this program (remove all es) */
for( int i = 0; i < 8192; i++ )
{
ValidateDVBMeta( p_demux, prg->i_pid_pcr );
if( ProgramIsSelected( p_demux, prg->i_number ) )
- {
- /* Set demux filter */
- SetPIDFilter( p_demux, prg->i_pid_pcr, true );
- }
+ SetPIDFilter( p_demux, prg->i_pid_pcr, true ); /* Set demux filter */
/* Parse descriptor */
+ bool b_hdmv = false;
+ dvbpsi_descriptor_t *p_dr;
for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next )
- {
- if( p_dr->i_tag == 0x1d )
+ switch(p_dr->i_tag)
{
- /* We have found an IOD descriptor */
+ case 0x1d: /* We have found an IOD descriptor */
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 )
- {
- 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 if( p_dr->i_tag == 0x05 )
- {
- /* Registration Descriptor */
+ break;
+
+ case 0x9:
+ msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x",
+ (p_dr->p_data[0] << 8) | p_dr->p_data[1] );
+ break;
+
+ case 0x5: /* Registration Descriptor */
if( p_dr->i_length != 4 )
{
msg_Warn( p_demux, "invalid Registration Descriptor" );
{
msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data );
if( !memcmp( p_dr->p_data, "HDMV", 4 ) )
- {
- /* Blu-Ray */
- b_hdmv = true;
- }
+ b_hdmv = true; /* Blu-Ray */
}
- }
- else
- {
+ break;
+
+ default:
msg_Dbg( p_demux, " * descriptor : unknown (0x%x)", p_dr->i_tag );
}
- }
+ dvbpsi_pmt_es_t *p_es;
for( p_es = p_pmt->p_first_es; p_es != NULL; p_es = p_es->p_next )
{
ts_pid_t tmp_pid, *old_pid = 0, *pid = &tmp_pid;
}
PIDInit( pid, false, pmt->psi );
- PIDFillFormat( pid, p_es->i_type );
+ PIDFillFormat( pid->es, 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;
}
else if( b_hdmv )
{
- PMTSetupEsHDMV( p_demux, pid, p_es );
+ PMTSetupEsHDMV( pid, p_es );
}
else if( p_es->i_type >= 0x80 )
{
p_dr = PMTEsFindDescriptor( p_es, 0x09 );
if( p_dr && p_dr->i_length >= 2 )
{
- uint16_t i_sysid = (p_dr->p_data[0] << 8) | p_dr->p_data[1];
msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x",
- i_sysid );
+ (p_dr->p_data[0] << 8) | p_dr->p_data[1] );
}
if( ProgramIsSelected( p_demux, prg->i_number ) &&
( pid->es->id != NULL || p_sys->b_udp_out ) )
- {
- /* Set demux filter */
- SetPIDFilter( p_demux, p_es->i_pid, true );
- }
+ SetPIDFilter( p_demux, p_es->i_pid, true ); /* Set demux filter */
}
/* Set CAM descrambling */
for( int i = 0; i < i_clean; i++ )
{
if( ProgramIsSelected( p_demux, prg->i_number ) )
- {
SetPIDFilter( p_demux, pp_clean[i]->i_pid, false );
- }
PIDClean( p_demux, pp_clean[i] );
}
free( pp_clean );
}
-static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
+static void PATCallBack( void *data, dvbpsi_pat_t *p_pat )
{
+ demux_t *p_demux = data;
demux_sys_t *p_sys = p_demux->p_sys;
dvbpsi_pat_program_t *p_program;
ts_pid_t *pat = &p_sys->pid[0];
ts_pid_t *pmt = p_sys->pmt[i];
bool b_keep = false;
- for( p_program = p_pat->p_first_program; p_program != NULL;
+ for( p_program = p_pat->p_first_program; !b_keep && p_program;
p_program = p_program->p_next )
{
- if( p_program->i_pid == pmt->i_pid )
- {
- for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
- {
- if( p_program->i_number ==
- pmt->psi->prg[i_prg]->i_number )
- {
- b_keep = true;
- break;
- }
- }
- if( b_keep )
- break;
- }
- }
+ if( p_program->i_pid != pmt->i_pid )
+ continue;
- if( !b_keep )
- {
- TAB_APPEND( i_pmt_rm, pmt_rm, pmt );
+ for( int i_prg = 0; !b_keep && i_prg < pmt->psi->i_prg; i_prg++ )
+ if( p_program->i_number == pmt->psi->prg[i_prg]->i_number )
+ b_keep = true;
}
+
+ if( b_keep )
+ continue;
+
+ TAB_APPEND( i_pmt_rm, pmt_rm, pmt );
}
/* Delete all ES attached to thoses PMT */
{
msg_Dbg( p_demux, " * number=%d pid=%d", p_program->i_number,
p_program->i_pid );
- if( p_program->i_number != 0 )
+ if( p_program->i_number == 0 )
+ continue;
+
+ ts_pid_t *pmt = &p_sys->pid[p_program->i_pid];
+
+ ValidateDVBMeta( p_demux, p_program->i_pid );
+
+ if( pmt->b_valid )
{
- ts_pid_t *pmt = &p_sys->pid[p_program->i_pid];
bool b_add = true;
+ for( int i_prg = 0; b_add && i_prg < pmt->psi->i_prg; i_prg++ )
+ if( pmt->psi->prg[i_prg]->i_number == p_program->i_number )
+ b_add = false;
- ValidateDVBMeta( p_demux, p_program->i_pid );
+ if( !b_add )
+ continue;
+ }
+ else
+ {
+ TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt );
+ }
- if( pmt->b_valid )
- {
- for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
- {
- if( pmt->psi->prg[i_prg]->i_number == p_program->i_number )
- {
- b_add = false;
- break;
- }
- }
- }
- else
- {
- TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt );
- }
+ PIDInit( pmt, true, pat->psi );
+ ts_prg_psi_t *prg = pmt->psi->prg[pmt->psi->i_prg-1];
+ prg->handle = dvbpsi_AttachPMT(p_program->i_number, PMTCallBack, p_demux);
+ prg->i_number = p_program->i_number;
+ prg->i_pid_pmt = p_program->i_pid;
- if( b_add )
- {
- PIDInit( pmt, true, pat->psi );
- pmt->psi->prg[pmt->psi->i_prg-1]->handle =
- dvbpsi_AttachPMT( p_program->i_number,
- (dvbpsi_pmt_callback)PMTCallBack,
- p_demux );
- pmt->psi->prg[pmt->psi->i_prg-1]->i_number =
- p_program->i_number;
- pmt->psi->prg[pmt->psi->i_prg-1]->i_pid_pmt =
- p_program->i_pid;
-
- /* Now select PID at access level */
- if( ProgramIsSelected( p_demux, p_program->i_number ) )
- {
- if( p_sys->i_current_program == 0 )
- p_sys->i_current_program = p_program->i_number;
+ /* Now select PID at access level */
+ if( ProgramIsSelected( p_demux, p_program->i_number ) )
+ {
+ if( p_sys->i_current_program == 0 )
+ p_sys->i_current_program = p_program->i_number;
- if( SetPIDFilter( p_demux, p_program->i_pid, true ) )
- p_sys->b_access_control = false;
- }
- }
+ if( SetPIDFilter( p_demux, p_program->i_pid, true ) )
+ p_sys->b_access_control = false;
}
}
pat->psi->i_pat_version = p_pat->i_version;
projects / vlc / blobdiff