#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <ctype.h>
#include <assert.h>
#include <vlc_access.h> /* DVB-specific things */
#include <vlc_iso_lang.h>
#include <vlc_network.h>
#include <vlc_charset.h>
+#include <vlc_fs.h>
#include "../mux/mpeg/csa.h"
# include "tables/eit.h"
# endif
#endif
-#ifdef HAVE_TIME_H
+
+/* TDT support */
+#ifdef _DVBPSI_DR_58_H_
+# define TS_USE_TDT 1
+# ifdef HAVE_DVBPSI_DR_H
+# include <dvbpsi/tot.h>
+# else
+# include "tables/tot.h"
+# endif
+#else
# include <time.h>
#endif
+
#undef TS_DEBUG
/*****************************************************************************
"Tweak the buffer size for reading and writing an integer number of packets." \
"Specify the size of the buffer here and not the number of packets." )
+#define SPLIT_ES_TEXT N_("Separate sub-streams")
+#define SPLIT_ES_LONGTEXT N_( \
+ "Separate teletex/dvbs pages into independent ES. " \
+ "It can be useful to turn off this option when using stream output." )
+
vlc_module_begin ()
set_description( N_("MPEG Transport Stream demuxer") )
set_shortname ( "MPEG-TS" )
set_subcategory( SUBCAT_INPUT_DEMUX )
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_bool( "ts-es-id-pid", true, 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, 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_bool( "ts-silent", false, NULL, SILENT_TEXT, SILENT_LONGTEXT, true )
add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, false )
- add_bool( "ts-dump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, false )
+ add_bool( "ts-dump-append", false, NULL, APPEND_TEXT, APPEND_LONGTEXT, false )
add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT,
DUMPSIZE_LONGTEXT, true )
+ add_bool( "ts-split-es", true, NULL, SPLIT_ES_TEXT, SPLIT_ES_LONGTEXT, false )
set_capability( "demux", 10 )
set_callbacks( Open, Close )
bool b_user_pmt;
int i_pmt;
ts_pid_t **pmt;
+ int i_pmt_es;
/* */
bool b_es_id_pid;
csa_t *csa;
int i_csa_pkt_size;
bool b_silent;
+ bool b_split_es;
bool b_udp_out;
int fd; /* udp socket */
/* */
bool b_dvb_meta;
+ int64_t i_tdt_delta;
int64_t i_dvb_start;
int64_t i_dvb_length;
+ bool b_broken_charset; /* True if broken encoding is used in EPG/SDT */
/* */
int i_current_program;
- vlc_list_t *p_programs_list;
+ vlc_list_t programs_list;
/* TS dump */
char *psz_file; /* file to dump data in */
static int Control( demux_t *p_demux, int i_query, va_list args );
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 void PIDClean( demux_t *, ts_pid_t *pid );
static int PIDFillFormat( ts_pid_t *pid, int i_stream_type );
static void PATCallBack( demux_t *, dvbpsi_pat_t * );
#define TS_USER_PMT_NUMBER (0)
static int UserPmt( demux_t *p_demux, const char * );
+static int SetPIDFilter( demux_t *, int i_pid, bool b_selected );
+static void SetPrgFilter( demux_t *, int i_prg, bool b_selected );
+
#define TS_PACKET_SIZE_188 188
#define TS_PACKET_SIZE_192 192
#define TS_PACKET_SIZE_204 204
msg_Info( p_demux, "dumping raw stream to standard output" );
p_sys->p_file = stdout;
}
- else if( ( p_sys->p_file = utf8_fopen( p_sys->psz_file, psz_mode ) ) == NULL )
+ else if( ( p_sys->p_file = vlc_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 = false;
{
p_sys->i_ts_read = 1500 / p_sys->i_packet_size;
}
- p_sys->buffer = malloc( p_sys->i_packet_size * p_sys->i_ts_read );
+ p_sys->buffer = xmalloc( p_sys->i_packet_size * p_sys->i_ts_read );
msg_Info( p_demux, "%s raw stream to file `%s' reading packets %d",
b_append ? "appending" : "dumping", p_sys->psz_file,
p_sys->i_ts_read );
p_sys->b_dvb_meta = true;
p_sys->b_access_control = true;
p_sys->i_current_program = 0;
+ p_sys->programs_list.i_count = 0;
+ p_sys->programs_list.p_values = NULL;
+ p_sys->i_tdt_delta = 0;
p_sys->i_dvb_start = 0;
p_sys->i_dvb_length = 0;
+ p_sys->b_broken_charset = false;
+
for( i = 0; i < 8192; i++ )
{
ts_pid_t *pid = &p_sys->pid[i];
eit->psi->handle =
dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack,
p_demux );
+#ifdef TS_USE_TDT
+ ts_pid_t *tdt = &p_sys->pid[0x14];
+ PIDInit( tdt, true, NULL );
+ tdt->psi->handle =
+ dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack,
+ p_demux );
+#endif
if( p_sys->b_access_control )
{
- if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, 0x11, true ) ||
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, 0x12, true ) )
+ if( SetPIDFilter( p_demux, 0x11, true ) ||
+#ifdef TS_USE_TDT
+ SetPIDFilter( p_demux, 0x14, true ) ||
+#endif
+ SetPIDFilter( p_demux, 0x12, true ) )
p_sys->b_access_control = false;
}
}
/* Init PMT array */
TAB_INIT( p_sys->i_pmt, p_sys->pmt );
+ p_sys->i_pmt_es = 0;
/* Read config */
p_sys->b_es_id_pid = var_CreateGetBool( p_demux, "ts-es-id-pid" );
free( psz_string );
p_sys->b_silent = var_CreateGetBool( p_demux, "ts-silent" );
+ p_sys->b_split_es = var_InheritBool( p_demux, "ts-split-es" );
+
+ while( !p_sys->b_file_out && p_sys->i_pmt_es <= 0 &&
+ vlc_object_alive( p_demux ) )
+ {
+ if( p_demux->pf_demux( p_demux ) != 1 )
+ break;
+ }
+
return VLC_SUCCESS;
}
free( pid->psi );
break;
default:
- if( p_sys->b_dvb_meta && ( pid->i_pid == 0x11 || pid->i_pid == 0x12 ) )
+ if( p_sys->b_dvb_meta && ( pid->i_pid == 0x11 || pid->i_pid == 0x12 || pid->i_pid == 0x14 ) )
{
- /* SDT or EIT */
+ /* SDT or EIT or TDT */
dvbpsi_DetachDemux( pid->psi->handle );
free( pid->psi );
}
else
{
- PIDClean( p_demux->out, pid );
+ PIDClean( p_demux, pid );
}
break;
}
}
else if( pid->b_valid && pid->es )
{
- PIDClean( p_demux->out, pid );
+ PIDClean( p_demux, pid );
}
if( pid->b_seen )
msg_Dbg( p_demux, " - pid[%d] seen", pid->i_pid );
}
- if( p_sys->b_access_control && pid->i_pid > 0 )
- {
- /* too much */
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid,
- false );
- }
+ /* too much */
+ if( pid->i_pid > 0 )
+ SetPIDFilter( p_demux, pid->i_pid, false );
}
vlc_mutex_lock( &p_sys->csa_lock );
TAB_CLEAN( p_sys->i_pmt, 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->programs_list.p_values );
/* If in dump mode, then close the file */
if( p_sys->b_file_out )
{
- msg_Info( p_demux ,"closing %s (%"PRId64" Kbytes dumped)",
+ msg_Info( p_demux ,"closing %s (%"PRId64" KiB dumped)",
p_sys->psz_file, p_sys->i_write / 1024 );
if( p_sys->p_file != stdout )
static int Demux( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
+ bool b_wait_es = p_sys->i_pmt_es <= 0;
/* We read at most 100 TS packet or until a frame is completed */
for( int i_pkt = 0; i_pkt < p_sys->i_ts_read; i_pkt++ )
{
if( p_pid->psi )
{
- if( p_pid->i_pid == 0 || ( p_sys->b_dvb_meta && ( p_pid->i_pid == 0x11 || p_pid->i_pid == 0x12 ) ) )
+ if( p_pid->i_pid == 0 || ( p_sys->b_dvb_meta && ( p_pid->i_pid == 0x11 || p_pid->i_pid == 0x12 || p_pid->i_pid == 0x14 ) ) )
{
dvbpsi_PushPacket( p_pid->psi->handle, p_pkt->p_buffer );
}
}
p_pid->b_seen = true;
- if( b_frame )
+ if( b_frame || ( b_wait_es && p_sys->i_pmt_es > 0 ) )
break;
}
if( pi_time )
*pi_time = 0;
-#ifdef HAVE_TIME_H
- if( p_sys->b_access_control && p_sys->i_dvb_length > 0 )
+ if( p_sys->i_dvb_length > 0 )
{
- /* FIXME we should not use time() but read the date from the tdt */
- const time_t t = time( NULL );
+#ifdef TS_USE_TDT
+ const int64_t t = mdate() + p_sys->i_tdt_delta;
+#else
+ const int64_t t = CLOCK_FREQ * time ( NULL );
+#endif
+
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 * INT64_C(1000000);
+ *pi_length = p_sys->i_dvb_length;
if( pi_time )
- *pi_time = (t - p_sys->i_dvb_start) * INT64_C(1000000);
+ *pi_time = t - p_sys->i_dvb_start;
return VLC_SUCCESS;
}
}
-#endif
return VLC_EGENERIC;
}
i64 = stream_Size( p_demux->s );
if( i64 > 0 )
{
- *pf = (double)stream_Tell( p_demux->s ) / (double)i64;
+ double f_current = stream_Tell( p_demux->s );
+ *pf = f_current / (double)i64;
}
else
{
#endif
case DEMUX_SET_GROUP:
{
- 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 );
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_access_control && i_int > 0 && i_int != p_sys->i_current_program )
- {
- int i_pmt_pid = -1;
-
- /* Search pmt to be unselected */
- for( int i = 0; i < p_sys->i_pmt; i++ )
- {
- ts_pid_t *pmt = p_sys->pmt[i];
-
- for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
- {
- if( pmt->psi->prg[i_prg]->i_number == p_sys->i_current_program )
- {
- i_pmt_pid = p_sys->pmt[i]->i_pid;
- break;
- }
- }
- if( i_pmt_pid > 0 ) break;
- }
-
- if( i_pmt_pid > 0 )
- {
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
- false );
- /* All ES */
- for( int i = 2; i < 8192; i++ )
- {
- ts_pid_t *pid = &p_sys->pid[i];
-
- if( !pid->b_valid || pid->psi )
- continue;
+ if( i_int == 0 && p_sys->i_current_program > 0 )
+ i_int = p_sys->i_current_program;
- for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
- {
- if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
- {
- /* We only remove es that aren't defined by extra pmt */
- stream_Control( p_demux->s,
- STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE,
- i, false );
- break;
- }
- }
- }
- }
+ if( p_sys->i_current_program > 0 )
+ {
+ if( p_sys->i_current_program != i_int )
+ SetPrgFilter( p_demux, p_sys->i_current_program, false );
+ }
+ else if( p_sys->i_current_program < 0 )
+ {
+ for( int i = 0; i < p_sys->programs_list.i_count; i++ )
+ SetPrgFilter( p_demux, p_sys->programs_list.p_values[i].i_int, false );
+ }
- /* select new program */
+ if( i_int > 0 )
+ {
p_sys->i_current_program = i_int;
- i_pmt_pid = -1;
- for( int i = 0; i < p_sys->i_pmt; i++ )
+ SetPrgFilter( p_demux, p_sys->i_current_program, true );
+ }
+ else if( i_int < 0 )
+ {
+ p_sys->i_current_program = -1;
+ p_sys->programs_list.i_count = 0;
+ if( p_list )
{
- ts_pid_t *pmt = p_sys->pmt[i];
+ vlc_list_t *p_dst = &p_sys->programs_list;
+ free( p_dst->p_values );
- for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
- {
- if( pmt->psi->prg[i_prg]->i_number == i_int )
- {
- i_pmt_pid = p_sys->pmt[i]->i_pid;
- p_prg = p_sys->pmt[i]->psi->prg[i_prg];
- break;
- }
- }
- if( i_pmt_pid > 0 )
- break;
- }
- if( i_pmt_pid > 0 )
- {
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
- true );
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr,
- true );
-
- for( int i = 2; i < 8192; i++ )
+ p_dst->p_values = calloc( p_list->i_count,
+ sizeof(*p_dst->p_values) );
+ if( p_dst->p_values )
{
- ts_pid_t *pid = &p_sys->pid[i];
-
- if( !pid->b_valid || pid->psi )
- continue;
-
- for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
+ p_dst->i_count = p_list->i_count;
+ for( int i = 0; i < p_list->i_count; i++ )
{
- if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
- {
- if ( pid->es->fmt.i_cat == VIDEO_ES && !i_vpid )
- i_vpid = i;
- if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid1 )
- i_apid1 = i;
- else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid2 )
- i_apid2 = i;
- else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid3 )
- i_apid3 = i;
-
- stream_Control( p_demux->s,
- STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE,
- i, true );
- break;
- }
+ p_dst->p_values[i] = p_list->p_values[i];
+ SetPrgFilter( p_demux, p_dst->p_values[i].i_int, true );
}
}
}
}
- else
- {
- p_sys->i_current_program = -1;
- p_sys->p_programs_list = p_list;
- }
return VLC_SUCCESS;
}
(char*)&pid->es->fmt.i_codec );
pid->es->id = es_out_Add( p_demux->out,
&pid->es->fmt );
+ p_sys->i_pmt_es++;
}
}
return VLC_EGENERIC;
}
+static int SetPIDFilter( demux_t *p_demux, int i_pid, bool b_selected )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ if( !p_sys->b_access_control )
+ return VLC_EGENERIC;
+
+ return stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_STATE, i_pid, b_selected );
+}
+
+static void SetPrgFilter( demux_t *p_demux, int i_prg_id, bool b_selected )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ ts_prg_psi_t *p_prg = NULL;
+ int i_pmt_pid = -1;
+
+ /* Search pmt to be unselected */
+ for( int i = 0; i < p_sys->i_pmt; i++ )
+ {
+ ts_pid_t *pmt = p_sys->pmt[i];
+
+ for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
+ {
+ if( pmt->psi->prg[i_prg]->i_number == i_prg_id )
+ {
+ i_pmt_pid = p_sys->pmt[i]->i_pid;
+ p_prg = p_sys->pmt[i]->psi->prg[i_prg];
+ break;
+ }
+ }
+ if( i_pmt_pid > 0 )
+ break;
+ }
+ if( i_pmt_pid <= 0 )
+ return;
+ assert( p_prg );
+
+ SetPIDFilter( p_demux, i_pmt_pid, b_selected );
+ if( p_prg->i_pid_pcr > 0 )
+ SetPIDFilter( p_demux, p_prg->i_pid_pcr, b_selected );
+
+ /* All ES */
+ for( int i = 2; i < 8192; i++ )
+ {
+ ts_pid_t *pid = &p_sys->pid[i];
+
+ if( !pid->b_valid || pid->psi )
+ continue;
+
+ for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
+ {
+ if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
+ {
+ /* We only remove/select es that aren't defined by extra pmt */
+ SetPIDFilter( p_demux, i, b_selected );
+ break;
+ }
+ }
+ }
+}
+
static void PIDInit( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner )
{
bool b_old_valid = pid->b_valid;
if( !b_old_valid )
{
- pid->psi = malloc( sizeof( ts_psi_t ) );
+ pid->psi = xmalloc( sizeof( ts_psi_t ) );
if( pid->psi )
{
pid->psi->handle = NULL;
}
}
-static void PIDClean( es_out_t *out, ts_pid_t *pid )
+static void PIDClean( demux_t *p_demux, ts_pid_t *pid )
{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ es_out_t *out = p_demux->out;
+
if( pid->psi )
{
if( pid->psi->handle )
else
{
if( pid->es->id )
+ {
es_out_Del( out, pid->es->id );
+ p_sys->i_pmt_es--;
+ }
if( pid->es->p_pes )
block_ChainRelease( pid->es->p_pes );
for( int i = 0; i < pid->i_extra_es; i++ )
{
if( pid->extra_es[i]->id )
+ {
es_out_Del( out, pid->extra_es[i]->id );
+ p_sys->i_pmt_es--;
+ }
if( pid->extra_es[i]->p_pes )
block_ChainRelease( pid->extra_es[i]->p_pes );
{
block_t *p_pes = pid->es->p_pes;
uint8_t header[34];
- int i_pes_size = 0;
- int i_skip = 0;
+ unsigned i_pes_size = 0;
+ unsigned i_skip = 0;
mtime_t i_dts = -1;
mtime_t i_pts = -1;
mtime_t i_length = 0;
pid->es->pp_last = &pid->es->p_pes;
/* FIXME find real max size */
- const int i_max = block_ChainExtract( p_pes, header, 34 );
-
+ /* const int i_max = */ block_ChainExtract( p_pes, header, 34 );
+
if( header[0] != 0 || header[1] != 0 || header[2] != 1 )
{
if( !p_demux->p_sys->b_silent )
{
i_skip += 1;
}
- else if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) &&
+ else if( pid->es->fmt.i_codec == VLC_CODEC_SUBT &&
pid->es->p_mpeg4desc )
{
decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr;
{
/* display length */
if( p_pes->i_buffer + 2 <= i_skip )
- {
i_length = GetWBE( &p_pes->p_buffer[i_skip] );
- }
i_skip += 2;
}
if( p_pes->i_buffer + 2 <= i_skip )
- {
i_pes_size = GetWBE( &p_pes->p_buffer[i_skip] );
- }
/* */
i_skip += 2;
}
#ifdef ZVBI_COMPILED
- else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
+ else if( pid->es->fmt.i_codec == VLC_CODEC_TELETEXT )
i_skip = 0; /*hack for zvbi support */
#endif
/* skip header */
int i;
if( i_dts >= 0 )
- {
- p_pes->i_dts = i_dts * 100 / 9;
- }
+ p_pes->i_dts = VLC_TS_0 + i_dts * 100 / 9;
+
if( i_pts >= 0 )
- {
- p_pes->i_pts = i_pts * 100 / 9;
- }
+ p_pes->i_pts = VLC_TS_0 + i_pts * 100 / 9;
+
p_pes->i_length = i_length * 100 / 9;
p_block = block_ChainGather( p_pes );
- if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) )
+ if( pid->es->fmt.i_codec == VLC_CODEC_SUBT )
{
if( i_pes_size > 0 && p_block->i_buffer > i_pes_size )
{
demux_sys_t *p_sys = p_demux->p_sys;
const uint8_t *p = p_bk->p_buffer;
+ if( p_sys->i_pmt_es <= 0 )
+ return;
+
if( ( p[3]&0x20 ) && /* adaptation */
( p[5]&0x10 ) &&
( p[4] >= 7 ) )
{
es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
(int)p_sys->pmt[i]->psi->prg[i_prg]->i_number,
- (int64_t)(i_pcr * 100 / 9) );
+ (int64_t)(VLC_TS_0 + i_pcr * 100 / 9) );
}
}
}
pid->i_cc = i_cc;
if( pid->es->p_pes && pid->es->fmt.i_cat != VIDEO_ES )
{
- /* Small video artifacts are usually better then
+ /* Small video artifacts are usually better than
* dropping full frames */
pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
}
case 0x01: /* MPEG-1 video */
case 0x02: /* MPEG-2 video */
case 0x80: /* MPEG-2 MOTO video */
- es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', 'g', 'v' ) );
+ es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MPGV );
break;
case 0x03: /* MPEG-1 audio */
case 0x04: /* MPEG-2 audio */
- es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', 'g', 'a' ) );
+ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MPGA );
break;
- case 0x11: /* MPEG4 (audio) */
+ case 0x11: /* MPEG4 (audio) LATM */
case 0x0f: /* ISO/IEC 13818-7 Audio with ADTS transport syntax */
- es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', '4', 'a' ) );
+ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MP4A );
break;
case 0x10: /* MPEG4 (video) */
- es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) );
+ es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MP4V );
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' ) );
+ es_format_Init( fmt, VIDEO_ES, VLC_CODEC_H264 );
break;
case 0x81: /* A52 (audio) */
- es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', ' ' ) );
+ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_A52 );
break;
case 0x82: /* DVD_SPU (sub) */
- es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', ' ' ) );
+ es_format_Init( fmt, SPU_ES, VLC_CODEC_SPU );
break;
case 0x83: /* LPCM (audio) */
- es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'l', 'p', 'c', 'm' ) );
+ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_DVD_LPCM );
break;
case 0x84: /* SDDS (audio) */
- es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 's' ) );
+ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_SDDS );
break;
case 0x85: /* DTS (audio) */
- es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'd', 't', 's', ' ' ) );
+ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_DTS );
+ break;
+ case 0x87: /* E-AC3 */
+ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_EAC3 );
break;
case 0x91: /* A52 vls (audio) */
{
demux_sys_t *p_sys = p_demux->p_sys;
- if( !p_sys->b_access_control )
- return false;
- if( ( p_sys->i_current_program == -1 && p_sys->p_programs_list == NULL ) ||
+ if( ( p_sys->i_current_program == -1 && p_sys->programs_list.i_count == 0 ) ||
p_sys->i_current_program == 0 )
return true;
if( p_sys->i_current_program == i_pgrm )
return true;
- if( p_sys->p_programs_list != NULL )
+ if( p_sys->programs_list.i_count != 0 )
{
- for( int i = 0; i < p_sys->p_programs_list->i_count; i++ )
+ for( int i = 0; i < p_sys->programs_list.i_count; i++ )
{
- if( i_pgrm == p_sys->p_programs_list->p_values[i].i_int )
+ if( i_pgrm == p_sys->programs_list.p_values[i].i_int )
return true;
}
}
{
demux_sys_t *p_sys = p_demux->p_sys;
- if( !p_sys->b_dvb_meta || ( i_pid != 0x11 && i_pid != 0x12 ) )
+ if( !p_sys->b_dvb_meta || ( i_pid != 0x11 && i_pid != 0x12 && i_pid != 0x14 ) )
return;
msg_Warn( p_demux, "Switching to non DVB mode" );
/* This doesn't look like a DVB stream so don't try
- * parsing the SDT/EDT */
+ * parsing the SDT/EDT/TDT */
- for( int i = 0x11; i <= 0x12; i++ )
+ for( int i = 0x11; i <= 0x14; i++ )
{
+ if( i == 0x13 ) continue;
ts_pid_t *p_pid = &p_sys->pid[i];
if( p_pid->psi )
{
p_pid->psi = NULL;
p_pid->b_valid = false;
}
- if( p_sys->b_access_control )
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, i, false );
-
+ SetPIDFilter( p_demux, i, false );
}
p_sys->b_dvb_meta = false;
}
#ifdef TS_USE_DVB_SI
-static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
+/* FIXME same than dvbsi_to_utf8 from dvb access */
+static char *EITConvertToUTF8( const unsigned char *psz_instring,
+ size_t i_length,
+ bool b_broken )
{
- demux_sys_t *p_sys = p_demux->p_sys;
- ts_pid_t *sdt = &p_sys->pid[0x11];
- dvbpsi_sdt_service_t *p_srv;
+ const char *psz_encoding;
+ char *psz_outstring;
+ char psz_encbuf[sizeof( "ISO_8859-123" )];
+ size_t i_in, i_out, offset = 1;
+ vlc_iconv_t iconv_handle;
- msg_Dbg( p_demux, "SDTCallBack called" );
+ if( i_length < 1 ) return NULL;
+ if( psz_instring[0] >= 0x20 )
+ {
+ /* According to ETSI EN 300 468 Annex A, this should be ISO6937,
+ * but some broadcasters use different charset... */
+ if( b_broken )
+ psz_encoding = "ISO_8859-1";
+ else
+ psz_encoding = "ISO_6937";
- if( sdt->psi->i_sdt_version != -1 &&
- ( !p_sdt->b_current_next ||
- p_sdt->i_version == sdt->psi->i_sdt_version ) )
+ offset = 0;
+ }
+ else switch( psz_instring[0] )
{
- dvbpsi_DeleteSDT( p_sdt );
- return;
+ case 0x01:
+ psz_encoding = "ISO_8859-5";
+ break;
+ case 0x02:
+ psz_encoding = "ISO_8859-6";
+ break;
+ case 0x03:
+ psz_encoding = "ISO_8859-7";
+ break;
+ case 0x04:
+ psz_encoding = "ISO_8859-8";
+ break;
+ case 0x05:
+ psz_encoding = "ISO_8859-9";
+ break;
+ case 0x06:
+ psz_encoding = "ISO_8859-10";
+ break;
+ case 0x07:
+ psz_encoding = "ISO_8859-11";
+ break;
+ case 0x08:
+ psz_encoding = "ISO_8859-12";
+ break;
+ case 0x09:
+ psz_encoding = "ISO_8859-13";
+ break;
+ case 0x0a:
+ psz_encoding = "ISO_8859-14";
+ break;
+ case 0x0b:
+ psz_encoding = "ISO_8859-15";
+ break;
+ case 0x10:
+#warning Is Latin-10 (psz_instring[2] == 16) really illegal?
+ if( i_length < 3 || psz_instring[1] != 0x00 || psz_instring[2] > 15
+ || psz_instring[2] == 0 )
+ {
+ psz_encoding = "UTF-8";
+ offset = 0;
+ }
+ else
+ {
+ sprintf( psz_encbuf, "ISO_8859-%u", psz_instring[2] );
+ psz_encoding = psz_encbuf;
+ offset = 3;
+ }
+ break;
+ case 0x11:
+#warning Is there a BOM or do we use a fixed endianess?
+ psz_encoding = "UTF-16";
+ break;
+ case 0x12:
+ psz_encoding = "KSC5601-1987";
+ break;
+ case 0x13:
+ psz_encoding = "GB2312"; /* GB-2312-1980 */
+ break;
+ case 0x14:
+ psz_encoding = "BIG-5";
+ break;
+ case 0x15:
+ psz_encoding = "UTF-8";
+ break;
+ default:
+ /* invalid */
+ psz_encoding = "UTF-8";
+ offset = 0;
}
- msg_Dbg( p_demux, "new SDT ts_id=%d version=%d current_next=%d "
- "network_id=%d",
- p_sdt->i_ts_id, p_sdt->i_version, p_sdt->b_current_next,
- p_sdt->i_network_id );
+ i_in = i_length - offset;
+ i_out = i_in * 6 + 1;
- for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next )
+ psz_outstring = malloc( i_out );
+ if( !psz_outstring )
{
- vlc_meta_t *p_meta;
- dvbpsi_descriptor_t *p_dr;
+ return NULL;
+ }
- const char *psz_type = NULL;
- const char *psz_status = 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[offset], i_in );
+ psz_outstring[i_in] = '\0';
+ EnsureUTF8( psz_outstring );
+ }
+ else
+ {
+ const char *psz_in = (const char *)&psz_instring[offset];
+ char *psz_out = psz_outstring;
+
+ while( vlc_iconv( iconv_handle, &psz_in, &i_in,
+ &psz_out, &i_out ) == (size_t)(-1) )
+ {
+ /* skip naughty byte. This may fail terribly for multibyte stuff,
+ * but what can we do anyway? */
+ psz_in++;
+ i_in--;
+ vlc_iconv( iconv_handle, NULL, NULL, NULL, NULL ); /* reset */
+ }
+ vlc_iconv_close( iconv_handle );
+
+ *psz_out = '\0';
+
+ /* Convert EIT-coded CR/LFs */
+ unsigned char *pbuf = (unsigned char *)psz_outstring;
+ for( ; pbuf < (unsigned char *)psz_out ; pbuf++)
+ {
+ if( pbuf[0] == 0xc2 && pbuf[1] == 0x8a )
+ {
+ pbuf[0] = ' ';
+ pbuf[1] = '\n';
+ }
+ }
+
+
+ }
+ return psz_outstring;
+}
+
+static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ ts_pid_t *sdt = &p_sys->pid[0x11];
+ dvbpsi_sdt_service_t *p_srv;
+
+ msg_Dbg( p_demux, "SDTCallBack called" );
+
+ if( sdt->psi->i_sdt_version != -1 &&
+ ( !p_sdt->b_current_next ||
+ p_sdt->i_version == sdt->psi->i_sdt_version ) )
+ {
+ dvbpsi_DeleteSDT( p_sdt );
+ return;
+ }
+
+ msg_Dbg( p_demux, "new SDT ts_id=%d version=%d current_next=%d "
+ "network_id=%d",
+ p_sdt->i_ts_id, p_sdt->i_version, p_sdt->b_current_next,
+ p_sdt->i_network_id );
+
+ p_sys->b_broken_charset = false;
+
+ for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next )
+ {
+ vlc_meta_t *p_meta;
+ dvbpsi_descriptor_t *p_dr;
+
+ const char *psz_type = NULL;
+ const char *psz_status = NULL;
msg_Dbg( p_demux, " * service id=%d eit schedule=%d present=%d "
"running=%d free_ca=%d",
p_srv->b_eit_present, p_srv->i_running_status,
p_srv->b_free_ca );
- if( p_sys->i_current_program != -1 && p_sys->i_current_program != p_srv->i_service_id )
- continue;
-
p_meta = vlc_meta_New();
for( p_dr = p_srv->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
{
"DVB MHP service"
};
dvbpsi_service_dr_t *pD = dvbpsi_DecodeServiceDr( p_dr );
- char str1[257];
- char str2[257];
+ char *str1 = NULL;
+ char *str2 = NULL;
+
+ /* Workarounds for broadcasters with broken EPG */
+
+ if( p_sdt->i_network_id == 133 )
+ p_sys->b_broken_charset = true; /* SKY DE & BetaDigital use ISO8859-1 */
+
+ /* List of providers using ISO8859-1 */
+ static const char ppsz_broken_providers[][8] = {
+ "CSAT", /* CanalSat FR */
+ "GR1", /* France televisions */
+ "MULTI4", /* NT1 */
+ "MR5", /* France 2/M6 HD */
+ ""
+ };
+ for( int i = 0; *ppsz_broken_providers[i]; i++ )
+ {
+ const size_t i_length = strlen(ppsz_broken_providers[i]);
+ if( pD->i_service_provider_name_length == i_length &&
+ !strncmp( pD->i_service_provider_name, ppsz_broken_providers[i], i_length ) )
+ p_sys->b_broken_charset = true;
+ }
- memcpy( str1, pD->i_service_provider_name,
- pD->i_service_provider_name_length );
- str1[pD->i_service_provider_name_length] = '\0';
- memcpy( str2, pD->i_service_name, pD->i_service_name_length );
- str2[pD->i_service_name_length] = '\0';
+ /* FIXME: Digital+ ES also uses ISO8859-1 */
+
+ str1 = EITConvertToUTF8(pD->i_service_provider_name,
+ pD->i_service_provider_name_length,
+ p_sys->b_broken_charset );
+ str2 = EITConvertToUTF8(pD->i_service_name,
+ pD->i_service_name_length,
+ p_sys->b_broken_charset );
msg_Dbg( p_demux, " - type=%d provider=%s name=%s",
pD->i_service_type, str1, str2 );
vlc_meta_SetPublisher( p_meta, str1 );
if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 )
psz_type = ppsz_type[pD->i_service_type];
+ free( str1 );
+ free( str2 );
}
}
}
#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 )
+#ifdef TS_USE_TDT
+static void TDTCallBack( demux_t *p_demux, dvbpsi_tot_t *p_tdt )
{
- const char *psz_encoding;
- char *psz_outstring;
- char psz_encbuf[sizeof( "ISO_8859-123" )];
- size_t i_in, i_out, offset = 1;
- vlc_iconv_t iconv_handle;
-
- if( i_length < 1 ) return NULL;
- if( psz_instring[0] >= 0x20 )
- {
- psz_encoding = "ISO_8859-1";
- /* According to the specification, this should be ISO6937,
- * but it seems Latin-1 is used instead. */
- offset = 0;
- }
- else switch( psz_instring[0] )
- {
- case 0x01:
- psz_encoding = "ISO_8859-5";
- break;
- case 0x02:
- psz_encoding = "ISO_8859-6";
- break;
- case 0x03:
- psz_encoding = "ISO_8859-7";
- break;
- case 0x04:
- psz_encoding = "ISO_8859-8";
- break;
- case 0x05:
- psz_encoding = "ISO_8859-9";
- break;
- case 0x06:
- psz_encoding = "ISO_8859-10";
- break;
- case 0x07:
- psz_encoding = "ISO_8859-11";
- break;
- case 0x08:
- psz_encoding = "ISO_8859-12";
- break;
- case 0x09:
- psz_encoding = "ISO_8859-13";
- break;
- case 0x0a:
- psz_encoding = "ISO_8859-14";
- break;
- case 0x0b:
- psz_encoding = "ISO_8859-15";
- break;
- case 0x10:
-#warning Is Latin-10 (psz_instring[2] == 16) really illegal?
- if( i_length < 3 || psz_instring[1] != 0x00 || psz_instring[2] > 15
- || psz_instring[2] == 0 )
- {
- psz_encoding = "UTF-8";
- offset = 0;
- }
- else
- {
- sprintf( psz_encbuf, "ISO_8859-%u", psz_instring[2] );
- psz_encoding = psz_encbuf;
- offset = 3;
- }
- break;
- case 0x11:
-#warning Is there a BOM or do we use a fixed endianess?
- psz_encoding = "UTF-16";
- break;
- case 0x12:
- psz_encoding = "KSC5601-1987";
- break;
- case 0x13:
- psz_encoding = "GB2312"; /* GB-2312-1980 */
- break;
- case 0x14:
- psz_encoding = "BIG-5";
- break;
- case 0x15:
- psz_encoding = "UTF-8";
- break;
- default:
- /* invalid */
- psz_encoding = "UTF-8";
- offset = 0;
- }
-
- i_in = i_length - offset;
- 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[offset], i_in );
- psz_outstring[i_in] = '\0';
- EnsureUTF8( psz_outstring );
- }
- else
- {
- const char *psz_in = (const char *)&psz_instring[offset];
- char *psz_out = psz_outstring;
-
- while( vlc_iconv( iconv_handle, &psz_in, &i_in,
- &psz_out, &i_out ) == (size_t)(-1) )
- {
- /* skip naughty byte. This may fail terribly for multibyte stuff,
- * but what can we do anyway? */
- psz_in++;
- i_in--;
- vlc_iconv( iconv_handle, NULL, NULL, NULL, NULL ); /* reset */
- }
- vlc_iconv_close( iconv_handle );
+ demux_sys_t *p_sys = p_demux->p_sys;
- *psz_out = '\0';
- }
- return psz_outstring;
+ p_sys->i_tdt_delta = CLOCK_FREQ * EITConvertStartTime( p_tdt->i_utc_time )
+ - mdate();
+ dvbpsi_DeleteTOT(p_tdt);
}
+#endif
+
-static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
+static void EITCallBack( demux_t *p_demux,
+ dvbpsi_eit_t *p_eit, bool b_current_following )
{
demux_sys_t *p_sys = p_demux->p_sys;
dvbpsi_eit_event_t *p_evt;
vlc_epg_t *p_epg;
msg_Dbg( p_demux, "EITCallBack called" );
- if( !p_eit->b_current_next || ( p_sys->i_current_program != -1 && p_sys->i_current_program != p_eit->i_service_id ) )
+ if( !p_eit->b_current_next )
{
dvbpsi_DeleteEIT( p_eit );
return;
{
dvbpsi_short_event_dr_t *pE = dvbpsi_DecodeShortEventDr( p_dr );
- if( pE )
+ /* Only take first description, as we don't handle language-info
+ for epg atm*/
+ if( pE && psz_name == NULL)
{
- psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length);
- psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length );
+ psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length,
+ p_sys->b_broken_charset );
+ psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length,
+ p_sys->b_broken_charset );
msg_Dbg( p_demux, " - short event lang=%3.3s '%s' : '%s'",
pE->i_iso_639_code, psz_name, psz_text );
}
if( pE->i_text_length > 0 )
{
- char *psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length );
+ char *psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length,
+ p_sys->b_broken_charset );
if( psz_text )
{
msg_Dbg( p_demux, " - text='%s'", psz_text );
- psz_extra = realloc( psz_extra, strlen(psz_extra) + strlen(psz_text) + 1 );
+ psz_extra = xrealloc( psz_extra,
+ strlen(psz_extra) + strlen(psz_text) + 1 );
strcat( psz_extra, psz_text );
free( psz_text );
}
for( int i = 0; i < pE->i_entry_count; i++ )
{
char *psz_dsc = EITConvertToUTF8( pE->i_item_description[i],
- pE->i_item_description_length[i] );
- char *psz_itm = EITConvertToUTF8( pE->i_item[i], pE->i_item_length[i] );
+ pE->i_item_description_length[i],
+ p_sys->b_broken_charset );
+ char *psz_itm = EITConvertToUTF8( pE->i_item[i], pE->i_item_length[i],
+ p_sys->b_broken_charset );
if( psz_dsc && psz_itm )
{
msg_Dbg( p_demux, " - desc='%s' item='%s'", psz_dsc, psz_itm );
-
- psz_extra = realloc( psz_extra, strlen(psz_extra) + strlen(psz_dsc) + strlen(psz_itm) + 3 + 1 );
+#if 0
+ psz_extra = xrealloc( psz_extra,
+ strlen(psz_extra) + strlen(psz_dsc) +
+ strlen(psz_itm) + 3 + 1 );
strcat( psz_extra, "(" );
strcat( psz_extra, psz_dsc );
strcat( psz_extra, " " );
strcat( psz_extra, psz_itm );
strcat( psz_extra, ")" );
+#endif
}
free( psz_dsc );
free( psz_itm );
/* */
if( i_start > 0 )
- vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text, psz_extra );
+ vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text,
+ *psz_extra ? psz_extra : NULL );
/* Update "now playing" field */
if( p_evt->i_running_status == 0x04 && i_start > 0 )
}
if( p_epg->i_event > 0 )
{
- if( p_eit->i_service_id == p_sys->i_current_program )
+ if( b_current_following &&
+ ( p_sys->i_current_program == -1 ||
+ p_sys->i_current_program == p_eit->i_service_id ) )
{
p_sys->i_dvb_length = 0;
p_sys->i_dvb_start = 0;
if( p_epg->p_current )
{
- p_sys->i_dvb_start = p_epg->p_current->i_start;
- p_sys->i_dvb_length = p_epg->p_current->i_duration;
+ p_sys->i_dvb_start = CLOCK_FREQ * p_epg->p_current->i_start;
+ p_sys->i_dvb_length = CLOCK_FREQ * p_epg->p_current->i_duration;
}
}
es_out_Control( p_demux->out, ES_OUT_SET_GROUP_EPG, p_eit->i_service_id, p_epg );
dvbpsi_DeleteEIT( p_eit );
}
+static void EITCallBackCurrentFollowing( demux_t *p_demux, dvbpsi_eit_t *p_eit )
+{
+ EITCallBack( p_demux, p_eit, true );
+}
+static void EITCallBackSchedule( demux_t *p_demux, dvbpsi_eit_t *p_eit )
+{
+ EITCallBack( p_demux, p_eit, false );
+}
static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h,
uint8_t i_table_id, uint16_t i_extension )
msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
i_table_id, i_table_id, i_extension, i_extension );
- dvbpsi_AttachEIT( h, i_table_id, i_extension,
- (dvbpsi_eit_callback)EITCallBack, p_demux );
+ dvbpsi_eit_callback cb = i_table_id == 0x4e ?
+ (dvbpsi_eit_callback)EITCallBackCurrentFollowing :
+ (dvbpsi_eit_callback)EITCallBackSchedule;
+ dvbpsi_AttachEIT( h, i_table_id, i_extension, cb, p_demux );
}
+#ifdef TS_USE_TDT
+ else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 &&
+ i_table_id == 0x70 ) /* TDT */
+ {
+ msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
+ i_table_id, i_table_id, i_extension, i_extension );
+ dvbpsi_AttachTOT( h, i_table_id, i_extension,
+ (dvbpsi_tot_callback)TDTCallBack, p_demux);
+ }
+#endif
+
}
#endif
p_dr = p_dr->p_next;
return p_dr;
}
+static bool PMTEsHasRegistration( demux_t *p_demux,
+ const dvbpsi_pmt_es_t *p_es,
+ const char *psz_tag )
+{
+ dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x05 );
+ if( !p_dr )
+ return false;
+
+ if( p_dr->i_length < 4 )
+ {
+ msg_Warn( p_demux, "invalid Registration Descriptor" );
+ return false;
+ }
+
+ assert( strlen(psz_tag) == 4 );
+ return !memcmp( p_dr->p_data, psz_tag, 4 );
+}
static void PMTSetupEsISO14496( demux_t *p_demux, ts_pid_t *pid,
const ts_prg_psi_t *prg, const dvbpsi_pmt_es_t *p_es )
{
{
case 0x0B: /* mpeg4 sub */
p_fmt->i_cat = SPU_ES;
- p_fmt->i_codec = VLC_FOURCC('s','u','b','t');
+ p_fmt->i_codec = VLC_CODEC_SUBT;
break;
case 0x20: /* mpeg4 */
- p_fmt->i_codec = VLC_FOURCC('m','p','4','v');
+ p_fmt->i_codec = VLC_CODEC_MP4V;
break;
case 0x21: /* h264 */
- p_fmt->i_codec = VLC_FOURCC('h','2','6','4');
+ p_fmt->i_codec = VLC_CODEC_H264;
break;
case 0x60:
case 0x61:
case 0x63:
case 0x64:
case 0x65: /* mpeg2 */
- p_fmt->i_codec = VLC_FOURCC( 'm','p','g','v' );
+ p_fmt->i_codec = VLC_CODEC_MPGV;
break;
case 0x6a: /* mpeg1 */
- p_fmt->i_codec = VLC_FOURCC( 'm','p','g','v' );
+ p_fmt->i_codec = VLC_CODEC_MPGV;
break;
case 0x6c: /* mpeg1 */
- p_fmt->i_codec = VLC_FOURCC( 'j','p','e','g' );
+ p_fmt->i_codec = VLC_CODEC_JPEG;
break;
default:
p_fmt->i_cat = UNKNOWN_ES;
switch( dcd->i_objectTypeIndication )
{
case 0x40: /* mpeg4 */
- p_fmt->i_codec = VLC_FOURCC('m','p','4','a');
+ p_fmt->i_codec = VLC_CODEC_MP4A;
break;
case 0x66:
case 0x67:
case 0x68: /* mpeg2 aac */
- p_fmt->i_codec = VLC_FOURCC('m','p','4','a');
+ p_fmt->i_codec = VLC_CODEC_MP4A;
break;
case 0x69: /* mpeg2 */
- p_fmt->i_codec = VLC_FOURCC('m','p','g','a');
+ p_fmt->i_codec = VLC_CODEC_MPGA;
break;
case 0x6b: /* mpeg1 */
- p_fmt->i_codec = VLC_FOURCC('m','p','g','a');
+ p_fmt->i_codec = VLC_CODEC_MPGA;
break;
default:
p_fmt->i_cat = UNKNOWN_ES;
}
}
-static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid,
- const dvbpsi_pmt_es_t *p_es )
+typedef struct
+{
+ int i_type;
+ int i_magazine;
+ int i_page;
+ char p_iso639[3];
+} ts_teletext_page_t;
+
+static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid,
+ const dvbpsi_pmt_es_t *p_es )
{
es_format_t *p_fmt = &pid->es->fmt;
- dvbpsi_descriptor_t *p_dr;
+ ts_teletext_page_t p_page[2 * 64 + 20];
+ unsigned i_page = 0;
- for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
- p_dr = p_dr->p_next )
+ /* Gather pages information */
+#if defined _DVBPSI_DR_56_H_ && \
+ defined DVBPSI_VERSION && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5)
+ for( unsigned i_tag_idx = 0; i_tag_idx < 2; i_tag_idx++ )
{
- if( p_dr->i_tag == 0x05 )
- {
- /* 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 */
- p_fmt->i_cat = AUDIO_ES;
- p_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)*/
- p_fmt->i_cat = AUDIO_ES;
- p_fmt->i_codec = VLC_FOURCC('d','t','s',' ');
- }
- else if( !memcmp( p_dr->p_data, "BSSD", 4 ) )
- {
- p_fmt->i_cat = AUDIO_ES;
- p_fmt->b_packetized = true;
- p_fmt->i_codec = VLC_FOURCC('a','e','s','3');
- }
- else
- {
- msg_Warn( p_demux,
- "unknown Registration Descriptor (%4.4s)",
- p_dr->p_data );
- }
- }
+ dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, i_tag_idx == 0 ? 0x46 : 0x56 );
+ if( !p_dr )
+ continue;
- }
- else if( p_dr->i_tag == 0x6a )
- {
- /* DVB with stream_type 0x06 */
- p_fmt->i_cat = AUDIO_ES;
- p_fmt->i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
- }
- else if( p_dr->i_tag == 0x81 )
- {
- /* ATSC with stream_type 0x06 */
- p_fmt->i_cat = AUDIO_ES;
- p_fmt->i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
- }
- else if( p_dr->i_tag == 0x7a )
- {
- /* DVB with stream_type 0x06 (ETS EN 300 468) */
- p_fmt->i_cat = AUDIO_ES;
- p_fmt->i_codec = VLC_FOURCC( 'e', 'a', 'c', '3' );
- }
- 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" );
- p_fmt->i_cat = AUDIO_ES;
- p_fmt->i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
- }
- else if( p_dr->i_tag == 0x45 )
- {
- msg_Dbg( p_demux, " * VBI Data descriptor" );
- /* FIXME : store the information somewhere */
- }
- else if( p_dr->i_tag == 0x46 )
- {
- msg_Dbg( p_demux, " * VBI Teletext descriptor" );
- /* FIXME : store the information somewhere */
- }
-#ifdef _DVBPSI_DR_52_H_
- else if( p_dr->i_tag == 0x52 )
+ dvbpsi_teletext_dr_t *p_sub = dvbpsi_DecodeTeletextDr( p_dr );
+ if( !p_sub )
+ continue;
+
+ for( int i = 0; i < p_sub->i_pages_number; i++ )
{
- dvbpsi_stream_identifier_dr_t *si;
- si = dvbpsi_DecodeStreamIdentifierDr( p_dr );
+ const dvbpsi_teletextpage_t *p_src = &p_sub->p_pages[i];
- msg_Dbg( p_demux, " * Stream Component Identifier: %d", si->i_component_tag );
+ if( p_src->i_teletext_type >= 0x06 )
+ continue;
+
+ assert( i_page < sizeof(p_page)/sizeof(*p_page) );
+
+ ts_teletext_page_t *p_dst = &p_page[i_page++];
+
+ p_dst->i_type = p_src->i_teletext_type;
+ p_dst->i_magazine = p_src->i_teletext_magazine_number
+ ? p_src->i_teletext_magazine_number : 8;
+ p_dst->i_page = p_src->i_teletext_page_number;
+ memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 );
}
+ }
#endif
- else if( p_dr->i_tag == 0x56 )
+
+#ifdef _DVBPSI_DR_59_H_
+ dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
+ if( p_dr )
+ {
+ dvbpsi_subtitling_dr_t *p_sub = dvbpsi_DecodeSubtitlingDr( p_dr );
+ for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ )
{
- msg_Dbg( p_demux, " * EBU Teletext descriptor" );
- p_fmt->i_cat = SPU_ES;
- p_fmt->i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' );
- p_fmt->i_extra = p_dr->i_length;
- p_fmt->p_extra = p_dr->i_length ?
- malloc( p_dr->i_length ) : NULL;
- if( p_fmt->p_extra )
- memcpy( p_fmt->p_extra, p_dr->p_data,
- p_dr->i_length );
- else
- p_fmt->i_extra = 0;
+ dvbpsi_subtitle_t *p_src = &p_sub->p_subtitle[i];
+
+ if( p_src->i_subtitling_type < 0x01 || p_src->i_subtitling_type > 0x03 )
+ continue;
+
+ assert( i_page < sizeof(p_page)/sizeof(*p_page) );
-#if defined _DVBPSI_DR_56_H_ && defined DVBPSI_VERSION \
- && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5)
+ ts_teletext_page_t *p_dst = &p_page[i_page++];
- /* In stream output mode, only enable descriptor
- * pass-through. */
- if( !p_demux->out->b_sout )
+ switch( p_src->i_subtitling_type )
{
- uint16_t n, i = 0;
- dvbpsi_teletext_dr_t *sub;
+ case 0x01:
+ p_dst->i_type = 0x02;
+ break;
+ default:
+ p_dst->i_type = 0x03;
+ break;
+ }
+ /* FIXME check if it is the right split */
+ p_dst->i_magazine = (p_src->i_composition_page_id >> 8)
+ ? (p_src->i_composition_page_id >> 8) : 8;
+ p_dst->i_page = p_src->i_composition_page_id & 0xff;
+ memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 );
+ }
+ }
+#endif
- sub = dvbpsi_DecodeTeletextDr( p_dr );
- if( !sub ) continue;
+ /* */
+ es_format_Init( p_fmt, SPU_ES, VLC_CODEC_TELETEXT );
- /* Each subtitle ES contains n languages,
- * We are going to create n ES for the n tracks */
- for( n = 0; n < sub->i_pages_number; n++ )
- {
- dvbpsi_teletextpage_t *p_page = &sub->p_pages[n];
- if( p_page->i_teletext_type > 0x0 &&
- p_page->i_teletext_type < 0x6 )
- {
- ts_es_t *p_es;
+ if( !p_demux->p_sys->b_split_es || i_page <= 0 )
+ {
+ p_fmt->subs.teletext.i_magazine = -1;
+ p_fmt->subs.teletext.i_page = 0;
+ p_fmt->psz_description = strdup( vlc_gettext(ppsz_teletext_type[1]) );
- if( i == 0 )
- {
- p_es = pid->es;
- }
- 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 );
- 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;
- p_es->i_pes_gathered = 0;
- p_es->pp_last = &p_es->p_pes;
- p_es->p_mpeg4desc = NULL;
-
- TAB_APPEND( pid->i_extra_es, pid->extra_es,
- p_es );
- }
+ dvbpsi_descriptor_t *p_dr;
+ p_dr = PMTEsFindDescriptor( p_es, 0x46 );
+ if( !p_dr )
+ p_dr = PMTEsFindDescriptor( p_es, 0x56 );
- p_es->fmt.psz_language = malloc( 4 );
- 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;
- }
- p_es->fmt.psz_description = strdup(_(ppsz_teletext_type[p_page->i_teletext_type]));
-
- msg_Dbg( p_demux,
- " * ttxt type=%s lan=%s page=%d%02x",
- p_es->fmt.psz_description,
- p_es->fmt.psz_language,
- p_page->i_teletext_magazine_number,
- p_page->i_teletext_page_number );
-
- /* This stores the initial page for this track,
- so that it can be used by the telx and zvbi decoders. */
- p_es->fmt.subs.teletext.i_magazine =
- p_page->i_teletext_magazine_number ? : 8;
- p_es->fmt.subs.teletext.i_page =
- p_page->i_teletext_page_number;
-
- i++;
- }
- }
- if( !i )
- p_fmt->i_cat = UNKNOWN_ES;
- }
- else
-#endif /* defined _DVBPSI_DR_56_H_ && DVBPSI_VERSION(0,1,6) */
+ if( !p_demux->p_sys->b_split_es && p_dr && p_dr->i_length > 0 )
+ {
+ /* Descriptor pass-through */
+ p_fmt->p_extra = malloc( p_dr->i_length );
+ if( p_fmt->p_extra )
{
- p_fmt->subs.teletext.i_magazine = -1;
- p_fmt->subs.teletext.i_page = 0;
- p_fmt->psz_description = strdup( _(ppsz_teletext_type[1]) );
+ p_fmt->i_extra = p_dr->i_length;
+ memcpy( p_fmt->p_extra, p_dr->p_data, p_dr->i_length );
}
}
- else if( p_dr->i_tag == 0x59 )
+ }
+ else
+ {
+ for( unsigned i = 0; i < i_page; i++ )
{
- /* DVB subtitles */
- p_fmt->i_cat = SPU_ES;
- p_fmt->i_codec = VLC_FOURCC( 'd', 'v', 'b', 's' );
- p_fmt->i_extra = p_dr->i_length;
- p_fmt->p_extra = malloc( p_dr->i_length );
- if( p_fmt->p_extra )
- memcpy( p_fmt->p_extra, p_dr->p_data,
- p_dr->i_length );
- else
- p_fmt->i_extra = 0;
+ ts_es_t *p_es;
-#ifdef _DVBPSI_DR_59_H_
-
- /* In stream output mode, only enable descriptor
- * pass-through. */
- if( !p_demux->out->b_sout )
+ /* */
+ if( i == 0 )
{
- uint16_t n, i = 0;
- dvbpsi_subtitling_dr_t *sub;
-
- sub = dvbpsi_DecodeSubtitlingDr( p_dr );
- if( !sub ) continue;
+ p_es = pid->es;
+ }
+ else
+ {
+ p_es = malloc( sizeof(*p_es) );
+ if( !p_es )
+ break;
- for( n = 0; n < sub->i_subtitles_number; n++ )
- {
- dvbpsi_subtitle_t *p_sub = &sub->p_subtitle[n];
- ts_es_t *p_es;
+ es_format_Copy( &p_es->fmt, &pid->es->fmt );
+ 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;
+ p_es->i_pes_gathered = 0;
+ p_es->pp_last = &p_es->p_pes;
+ p_es->p_mpeg4desc = NULL;
+ p_es->b_gather = false;
+
+ TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es );
+ }
- if( i == 0 )
- {
- p_es = pid->es;
- }
- 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;
-
- p_es->id = NULL;
- p_es->p_pes = NULL;
- p_es->i_pes_size = 0;
- p_es->i_pes_gathered = 0;
- p_es->pp_last = &p_es->p_pes;
- p_es->p_mpeg4desc = NULL;
-
- TAB_APPEND( pid->i_extra_es, pid->extra_es,
- p_es );
- }
+ /* */
+ const ts_teletext_page_t *p = &p_page[i];
+ p_es->fmt.i_priority = (p->i_type == 0x02 || p->i_type == 0x05) ? 0 : -1;
+ p_es->fmt.psz_language = strndup( p->p_iso639, 3 );
+ p_es->fmt.psz_description = strdup(vlc_gettext(ppsz_teletext_type[p->i_type]));
+ p_es->fmt.subs.teletext.i_magazine = p->i_magazine;
+ p_es->fmt.subs.teletext.i_page = p->i_page;
+
+ msg_Dbg( p_demux,
+ " * ttxt type=%s lan=%s page=%d%02x",
+ p_es->fmt.psz_description,
+ p_es->fmt.psz_language,
+ p->i_magazine, p->i_page );
+ }
+ }
+}
+static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid,
+ const dvbpsi_pmt_es_t *p_es )
+{
+ es_format_t *p_fmt = &pid->es->fmt;
- p_es->fmt.psz_language = malloc( 4 );
- 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;
- }
+ es_format_Init( p_fmt, SPU_ES, VLC_CODEC_DVBS );
- switch( p_sub->i_subtitling_type )
- {
- case 0x10: /* unspec. */
- case 0x11: /* 4:3 */
- case 0x12: /* 16:9 */
- case 0x13: /* 2.21:1 */
- p_es->fmt.psz_description =
- strdup(_("DVB subtitles"));
- break;
- case 0x20: /* Hearing impaired unspec. */
- case 0x21: /* h.i. 4:3 */
- case 0x22: /* h.i. 16:9 */
- case 0x23: /* h.i. 2.21:1 */
- p_es->fmt.psz_description =
- strdup(_("DVB subtitles: hearing impaired"));
- break;
- default:
- break;
- }
+ 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++ )
+ {
+ const int i_type = p_sub->p_subtitle[i].i_subtitling_type;
+ if( ( i_type >= 0x10 && i_type <= 0x14 ) ||
+ ( i_type >= 0x20 && i_type <= 0x24 ) )
+ i_page++;
+ }
+#endif
- p_es->fmt.subs.dvb.i_id =
- p_sub->i_composition_page_id;
- /* Hack, FIXME */
- p_es->fmt.subs.dvb.i_id |=
- ((int)p_sub->i_ancillary_page_id << 16);
+ if( !p_demux->p_sys->b_split_es || i_page <= 0 )
+ {
+ p_fmt->subs.dvb.i_id = -1;
+ p_fmt->psz_description = strdup( _("DVB subtitles") );
- i++;
- }
+ if( !p_demux->p_sys->b_split_es && p_dr && p_dr->i_length > 0 )
+ {
+ /* Descriptor pass-through */
+ p_fmt->p_extra = malloc( p_dr->i_length );
+ if( p_fmt->p_extra )
+ {
+ p_fmt->i_extra = p_dr->i_length;
+ memcpy( p_fmt->p_extra, p_dr->p_data, p_dr->i_length );
+ }
+ }
+ }
+ else
+ {
+#ifdef _DVBPSI_DR_59_H_
+ for( int i = 0; i < p_sub->i_subtitles_number; i++ )
+ {
+ ts_es_t *p_es;
- if( !i )
- p_fmt->i_cat = UNKNOWN_ES;
+ /* */
+ if( i == 0 )
+ {
+ p_es = pid->es;
}
else
-#endif /* _DVBPSI_DR_59_H_ */
{
- p_fmt->subs.dvb.i_id = -1;
- p_fmt->psz_description = strdup( _("DVB subtitles") );
+ p_es = malloc( sizeof(*p_es) );
+ if( !p_es )
+ break;
+
+ es_format_Copy( &p_es->fmt, &pid->es->fmt );
+ 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;
+ p_es->i_pes_gathered = 0;
+ p_es->pp_last = &p_es->p_pes;
+ p_es->p_mpeg4desc = NULL;
+ p_es->b_gather = false;
+
+ TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es );
+ }
+
+ /* */
+ const dvbpsi_subtitle_t *p = &p_sub->p_subtitle[i];
+ p_es->fmt.psz_language = strndup( p->i_iso6392_language_code, 3 );
+ switch( p->i_subtitling_type )
+ {
+ case 0x10: /* unspec. */
+ case 0x11: /* 4:3 */
+ case 0x12: /* 16:9 */
+ case 0x13: /* 2.21:1 */
+ case 0x14: /* HD monitor */
+ p_es->fmt.psz_description = strdup( _("DVB subtitles") );
+ break;
+ case 0x20: /* Hearing impaired unspec. */
+ case 0x21: /* h.i. 4:3 */
+ case 0x22: /* h.i. 16:9 */
+ case 0x23: /* h.i. 2.21:1 */
+ case 0x24: /* h.i. HD monitor */
+ p_es->fmt.psz_description = strdup( _("DVB subtitles: hearing impaired") );
+ break;
+ default:
+ break;
}
+
+ /* Hack, FIXME */
+ p_es->fmt.subs.dvb.i_id = ( p->i_composition_page_id << 0 ) |
+ ( p->i_ancillary_page_id << 16 );
}
+#endif
}
}
-
-static void PMTSetupEs0xEA( demux_t *p_demux, ts_pid_t *pid,
- const dvbpsi_pmt_es_t *p_es )
+static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid,
+ const dvbpsi_pmt_es_t *p_es )
{
- /* Registration Descriptor */
- dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x05 );
- if( !p_dr )
+ es_format_t *p_fmt = &pid->es->fmt;
+
+ if( PMTEsHasRegistration( p_demux, p_es, "AC-3" ) ||
+ PMTEsFindDescriptor( p_es, 0x6a ) ||
+ PMTEsFindDescriptor( p_es, 0x81 ) )
{
- msg_Err( p_demux, "Registration descriptor not found" );
- return;
+ p_fmt->i_cat = AUDIO_ES;
+ p_fmt->i_codec = VLC_CODEC_A52;
}
-
- if( p_dr->i_length < 4 ) // XXX VC-1 has extended this descriptor with sub-descriptor
+ else if( PMTEsFindDescriptor( p_es, 0x7a ) )
{
- msg_Warn( p_demux, "invalid Registration Descriptor" );
- return;
+ /* DVB with stream_type 0x06 (ETS EN 300 468) */
+ p_fmt->i_cat = AUDIO_ES;
+ p_fmt->i_codec = VLC_CODEC_EAC3;
}
-
- if( !memcmp( p_dr->p_data, "VC-1", 4 ) )
+ else if( PMTEsHasRegistration( p_demux, p_es, "DTS1" ) ||
+ PMTEsHasRegistration( p_demux, p_es, "DTS2" ) ||
+ PMTEsHasRegistration( p_demux, p_es, "DTS3" ) ||
+ PMTEsFindDescriptor( p_es, 0x73 ) )
+ {
+ /*registration descriptor(ETSI TS 101 154 Annex F)*/
+ p_fmt->i_cat = AUDIO_ES;
+ p_fmt->i_codec = VLC_CODEC_DTS;
+ }
+ else if( PMTEsHasRegistration( p_demux, p_es, "BSSD" ) )
{
- es_format_t *p_fmt = &pid->es->fmt;
+ p_fmt->i_cat = AUDIO_ES;
+ p_fmt->b_packetized = true;
+ p_fmt->i_codec = VLC_CODEC_302M;
+ }
+ else
+ {
+ /* Subtitle/Teletext/VBI fallbacks */
+ dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
- /* registration descriptor for VC-1 (SMPTE rp227) */
- p_fmt->i_cat = VIDEO_ES;
- p_fmt->i_codec = VLC_FOURCC('W','V','C','1');
+#ifdef _DVBPSI_DR_59_H_
+ dvbpsi_subtitling_dr_t *p_sub;
+ if( p_dr && ( p_sub = dvbpsi_DecodeSubtitlingDr( p_dr ) ) )
+ {
+ for( int i = 0; i < p_sub->i_subtitles_number; i++ )
+ {
+ if( p_fmt->i_cat != UNKNOWN_ES )
+ break;
- /* XXX With Simple and Main profile the SEQUENCE
- * header is modified: video width and height are
- * inserted just after the start code as 2 int16_t
- * The packetizer will take care of that. */
+ switch( p_sub->p_subtitle[i].i_subtitling_type )
+ {
+ case 0x01: /* EBU Teletext subtitles */
+ case 0x02: /* Associated EBU Teletext */
+ case 0x03: /* VBI data */
+ PMTSetupEsTeletext( p_demux, pid, p_es );
+ break;
+ case 0x10: /* DVB Subtitle (normal) with no monitor AR critical */
+ case 0x11: /* ... on 4:3 AR monitor */
+ case 0x12: /* ... on 16:9 AR monitor */
+ case 0x13: /* ... on 2.21:1 AR monitor */
+ case 0x14: /* ... for display on a high definition monitor */
+ case 0x20: /* DVB Subtitle (impaired) with no monitor AR critical */
+ case 0x21: /* ... on 4:3 AR monitor */
+ case 0x22: /* ... on 16:9 AR monitor */
+ case 0x23: /* ... on 2.21:1 AR monitor */
+ case 0x24: /* ... for display on a high definition monitor */
+ PMTSetupEsDvbSubtitle( p_demux, pid, p_es );
+ break;
+ default:
+ msg_Err( p_demux, "Unrecognized DVB subtitle type (0x%x)",
+ p_sub->p_subtitle[i].i_subtitling_type );
+ break;
+ }
+ }
+ }
+#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 */
+ PMTEsFindDescriptor( p_es, 0x56 ) ) ) /* EBU Teletext descriptor */
+ {
+ /* Teletext/VBI */
+ PMTSetupEsTeletext( p_demux, pid, p_es );
+ }
}
- else
+
+#ifdef _DVBPSI_DR_52_H_
+ /* FIXME is it useful ? */
+ if( PMTEsFindDescriptor( p_es, 0x52 ) )
{
- msg_Warn( p_demux,
- "unknown Registration Descriptor (%4.4s)",
- p_dr->p_data );
+ dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x52 );
+ dvbpsi_stream_identifier_dr_t *p_si = dvbpsi_DecodeStreamIdentifierDr( p_dr );
+
+ msg_Dbg( p_demux, " * Stream Component Identifier: %d", p_si->i_component_tag );
}
+#endif
}
-static void PMTSetupEs0xD1( demux_t *p_demux, ts_pid_t *pid,
+static void PMTSetupEs0xEA( demux_t *p_demux, ts_pid_t *pid,
const dvbpsi_pmt_es_t *p_es )
{
/* Registration Descriptor */
- dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x05 );
- if( !p_dr )
+ if( !PMTEsHasRegistration( p_demux, p_es, "VC-1" ) )
{
- msg_Err( p_demux, "Registration descriptor not found" );
+ msg_Err( p_demux, "Registration descriptor not found or invalid" );
return;
}
- if( p_dr->i_length < 4 )
+
+ es_format_t *p_fmt = &pid->es->fmt;
+
+ /* registration descriptor for VC-1 (SMPTE rp227) */
+ p_fmt->i_cat = VIDEO_ES;
+ p_fmt->i_codec = VLC_CODEC_VC1;
+
+ /* XXX With Simple and Main profile the SEQUENCE
+ * header is modified: video width and height are
+ * inserted just after the start code as 2 int16_t
+ * The packetizer will take care of that. */
+}
+
+static void PMTSetupEs0xD1( demux_t *p_demux, ts_pid_t *pid,
+ const dvbpsi_pmt_es_t *p_es )
+{
+ /* Registration Descriptor */
+ if( !PMTEsHasRegistration( p_demux, p_es, "drac" ) )
{
- msg_Warn( p_demux, "invalid Registration Descriptor" );
+ msg_Err( p_demux, "Registration descriptor not found or invalid" );
return;
}
- if( !memcmp( p_dr->p_data, "drac", 4 ) )
- {
- es_format_t *p_fmt = &pid->es->fmt;
+ es_format_t *p_fmt = &pid->es->fmt;
- /* registration descriptor for Dirac
- * (backwards compatable with VC-2 (SMPTE Sxxxx:2008)) */
- p_fmt->i_cat = VIDEO_ES;
- p_fmt->i_codec = VLC_FOURCC('d','r','a','c');
- }
- else
- {
- msg_Warn( p_demux,
- "unknown Registration Descriptor (%4.4s)",
- p_dr->p_data );
- }
+ /* registration descriptor for Dirac
+ * (backwards compatable with VC-2 (SMPTE Sxxxx:2008)) */
+ p_fmt->i_cat = VIDEO_ES;
+ p_fmt->i_codec = VLC_CODEC_DIRAC;
}
static void PMTSetupEs0xA0( demux_t *p_demux, ts_pid_t *pid,
static void PMTSetupEsHDMV( demux_t *p_demux, 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 */
{
case 0x80:
p_fmt->i_cat = AUDIO_ES;
- p_fmt->i_codec = VLC_FOURCC( 'b', 'p', 'c', 'm' );
+ p_fmt->i_codec = VLC_CODEC_BD_LPCM;
break;
case 0x82:
case 0x85: /* DTS-HD High resolution audio */
case 0x86: /* DTS-HD Master audio */
case 0xA2: /* Secondary DTS audio */
p_fmt->i_cat = AUDIO_ES;
- p_fmt->i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
+ p_fmt->i_codec = VLC_CODEC_DTS;
break;
case 0x83: /* TrueHD AC3 */
p_fmt->i_cat = AUDIO_ES;
- p_fmt->i_codec = VLC_FOURCC( 'm', 'l', 'p', ' ' );
+ p_fmt->i_codec = VLC_CODEC_TRUEHD;
break;
case 0x84: /* E-AC3 */
- case 0x87: /* E-AC3 */
case 0xA1: /* Secondary E-AC3 */
p_fmt->i_cat = AUDIO_ES;
- p_fmt->i_codec = VLC_FOURCC( 'e', 'a', 'c', '3' );
+ p_fmt->i_codec = VLC_CODEC_EAC3;
break;
case 0x90: /* Presentation graphics */
+ p_fmt->i_cat = SPU_ES;
+ p_fmt->i_codec = VLC_CODEC_BD_PG;
+ break;
case 0x91: /* Interactive graphics */
case 0x92: /* Subtitle */
default:
break;
}
}
+
+static void PMTSetupEsRegistration( demux_t *p_demux, ts_pid_t *pid,
+ const dvbpsi_pmt_es_t *p_es )
+{
+ static const struct
+ {
+ char psz_tag[5];
+ int i_cat;
+ vlc_fourcc_t i_codec;
+ } p_regs[] = {
+ { "AC-3", AUDIO_ES, VLC_CODEC_A52 },
+ { "DTS1", AUDIO_ES, VLC_CODEC_DTS },
+ { "DTS2", AUDIO_ES, VLC_CODEC_DTS },
+ { "DTS3", AUDIO_ES, VLC_CODEC_DTS },
+ { "BSSD", AUDIO_ES, VLC_CODEC_302M },
+ { "VC-1", VIDEO_ES, VLC_CODEC_VC1 },
+ { "drac", VIDEO_ES, VLC_CODEC_DIRAC },
+ { "", UNKNOWN_ES, 0 }
+ };
+ es_format_t *p_fmt = &pid->es->fmt;
+
+ for( int i = 0; p_regs[i].i_cat != UNKNOWN_ES; i++ )
+ {
+ if( PMTEsHasRegistration( p_demux, p_es, p_regs[i].psz_tag ) )
+ {
+ p_fmt->i_cat = p_regs[i].i_cat;
+ p_fmt->i_codec = p_regs[i].i_codec;
+ break;
+ }
+ }
+}
+
static void PMTParseEsIso639( demux_t *p_demux, ts_pid_t *pid,
const dvbpsi_pmt_es_t *p_es )
{
switch( p_decoded->code[0].i_audio_type )
{
case 0:
+ pid->es->fmt.i_priority = 1; // prioritize normal audio tracks
pid->es->fmt.psz_description = NULL;
break;
case 1:
if( ProgramIsSelected( 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,
- true );
- }
- else if ( p_sys->b_access_control )
- {
- msg_Warn( p_demux, "skipping program (not selected)" );
- dvbpsi_DeletePMT(p_pmt);
- return;
+ SetPIDFilter( p_demux, prg->i_pid_pcr, true );
}
/* Parse descriptor */
}
else if( p_dr->i_tag == 0x05 )
{
- if( p_dr->i_tag == 0x05 )
+ /* Registration Descriptor */
+ if( p_dr->i_length != 4 )
{
- /* Registration Descriptor */
- if( p_dr->i_length != 4 )
- {
- msg_Warn( p_demux, "invalid Registration Descriptor" );
- }
- else
+ msg_Warn( p_demux, "invalid Registration Descriptor" );
+ }
+ else
+ {
+ msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data );
+ if( !memcmp( p_dr->p_data, "HDMV", 4 ) )
{
- 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;
- }
+ /* Blu-Ray */
+ b_hdmv = true;
}
}
}
{
PMTSetupEsHDMV( p_demux, pid, p_es );
}
+ else if( p_es->i_type >= 0x80 )
+ {
+ PMTSetupEsRegistration( p_demux, pid, p_es );
+ }
if( pid->es->fmt.i_cat == AUDIO_ES ||
( pid->es->fmt.i_cat == SPU_ES &&
- pid->es->fmt.i_codec != VLC_FOURCC('d','v','b','s') &&
- pid->es->fmt.i_codec != VLC_FOURCC('t','e','l','x') ) )
+ pid->es->fmt.i_codec != VLC_CODEC_DVBS &&
+ pid->es->fmt.i_codec != VLC_CODEC_TELETEXT ) )
{
PMTParseEsIso639( p_demux, pid, p_es );
}
{
if( old_pid )
{
- PIDClean( p_demux->out, old_pid );
+ PIDClean( p_demux, old_pid );
TAB_REMOVE( i_clean, pp_clean, old_pid );
old_pid = 0;
}
pid->extra_es[i]->id =
es_out_Add( p_demux->out, &pid->extra_es[i]->fmt );
}
+ p_sys->i_pmt_es += 1 + pid->i_extra_es;
}
}
/* Add ES to the list */
if( old_pid )
{
- PIDClean( p_demux->out, old_pid );
+ PIDClean( p_demux, old_pid );
TAB_REMOVE( i_clean, pp_clean, old_pid );
}
p_sys->pid[p_es->i_pid] = *pid;
( pid->es->id != NULL || p_sys->b_udp_out ) )
{
/* Set demux filter */
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, p_es->i_pid,
- true );
+ SetPIDFilter( p_demux, p_es->i_pid, true );
}
}
- if( ProgramIsSelected( p_demux, prg->i_number ) )
- {
- /* Set CAM descrambling */
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_CA, p_pmt );
- }
- else
- {
+ /* Set CAM descrambling */
+ if( !ProgramIsSelected( p_demux, prg->i_number )
+ || stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_CA, p_pmt ) != VLC_SUCCESS )
dvbpsi_DeletePMT( p_pmt );
- }
for( int i = 0; i < i_clean; i++ )
{
if( ProgramIsSelected( p_demux, prg->i_number ) )
{
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, pp_clean[i]->i_pid,
- false );
+ SetPIDFilter( p_demux, pp_clean[i]->i_pid, false );
}
- PIDClean( p_demux->out, pp_clean[i] );
+ PIDClean( p_demux, pp_clean[i] );
}
if( i_clean )
free( pp_clean );
if( pid->p_owner->prg[i_prg]->i_pid_pmt != pmt_rm[j]->i_pid )
continue;
- if( p_sys->b_access_control && pid->es->id )
- {
- if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, i,
- false ) )
- p_sys->b_access_control = false;
- }
+ if( pid->es->id )
+ SetPIDFilter( p_demux, i, false );
- PIDClean( p_demux->out, pid );
+ PIDClean( p_demux, pid );
break;
}
}
/* Delete PMT pid */
for( int i = 0; i < i_pmt_rm; i++ )
{
- if( p_sys->b_access_control )
- {
- if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE,
- pmt_rm[i]->i_pid, false ) )
- p_sys->b_access_control = false;
- }
+ SetPIDFilter( p_demux, pmt_rm[i]->i_pid, false );
for( int i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ )
{
es_out_Control( p_demux->out, ES_OUT_DEL_GROUP, i_number );
}
- PIDClean( p_demux->out, &p_sys->pid[pmt_rm[i]->i_pid] );
+ PIDClean( p_demux, &p_sys->pid[pmt_rm[i]->i_pid] );
TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] );
}
p_program->i_pid;
/* Now select PID at access level */
- if( p_sys->b_access_control )
+ if( ProgramIsSelected( p_demux, p_program->i_number ) )
{
- 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( p_sys->i_current_program == 0 )
+ p_sys->i_current_program = p_program->i_number;
- if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE,
- 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;
}
}
}
projects / vlc / blobdiff