#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"
"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" )
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 */
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 */
bool b_start_record;
};
-static int i_broken_epg;
-
static int Demux ( demux_t *p_demux );
static int DemuxFile( demux_t *p_demux );
static int Control( demux_t *p_demux, int i_query, va_list args );
static void PIDInit ( ts_pid_t *pid, 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 * );
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->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];
/* 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;
}
}
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 )
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_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++ )
}
p_pid->b_seen = true;
- if( b_frame )
+ if( b_frame || ( b_wait_es && p_sys->i_pmt_es > 0 ) )
break;
}
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;
+ ts_prg_psi_t *p_prg;
vlc_list_t *p_list;
i_int = (int)va_arg( args, int );
if( pmt->psi->prg[i_prg]->i_number == p_sys->i_current_program )
{
i_pmt_pid = p_sys->pmt[i]->i_pid;
+ p_prg = p_sys->pmt[i]->psi->prg[i_prg];
break;
}
}
stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
false );
+ if( p_prg->i_pid_pcr > 0 )
+ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr,
+ false );
/* All ES */
for( int i = 2; i < 8192; i++ )
{
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 );
+ if( p_prg->i_pid_pcr > 0 )
+ 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++ )
{
else
{
p_sys->i_current_program = -1;
- p_sys->p_programs_list = p_list;
+ p_sys->programs_list.i_count = 0;
+ if( p_list )
+ {
+ vlc_list_t *p_dst = &p_sys->programs_list;
+ free( p_dst->p_values );
+
+ p_dst->p_values = calloc( p_list->i_count,
+ sizeof(*p_dst->p_values) );
+ if( p_dst->p_values )
+ {
+ p_dst->i_count = p_list->i_count;
+ for( int i = 0; i < p_list->i_count; i++ )
+ p_dst->p_values[i] = p_list->p_values[i];
+ }
+ }
}
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++;
}
}
}
}
-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 );
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 ) )
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;
}
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;
}
}
#ifdef TS_USE_DVB_SI
/* FIXME same than dvbsi_to_utf8 from dvb access */
static char *EITConvertToUTF8( const unsigned char *psz_instring,
- size_t i_length )
+ size_t i_length,
+ bool b_broken )
{
const char *psz_encoding;
char *psz_outstring;
{
/* According to ETSI EN 300 468 Annex A, this should be ISO6937,
* but some broadcasters use different charset... */
- if ( i_broken_epg == 1 )
- {
+ if( b_broken )
psz_encoding = "ISO_8859-1";
- }
else
- {
psz_encoding = "ISO_6937";
- }
offset = 0;
}
p_sdt->i_ts_id, p_sdt->i_version, p_sdt->b_current_next,
p_sdt->i_network_id );
- i_broken_epg = 0;
+ p_sys->b_broken_charset = false;
for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next )
{
/* Workarounds for broadcasters with broken EPG */
- if ( p_sdt->i_network_id == 133 )
- i_broken_epg = 1; /* SKY DE & BetaDigital use ISO8859-1 */
+ if( p_sdt->i_network_id == 133 )
+ p_sys->b_broken_charset = true; /* SKY DE & BetaDigital use ISO8859-1 */
- if ( (pD->i_service_provider_name_length == 4) &&
- !strncmp(pD->i_service_provider_name, "CSAT", 4) )
- i_broken_epg = 1; /* CanalSat FR uses 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;
+ }
/* FIXME: Digital+ ES also uses ISO8859-1 */
str1 = EITConvertToUTF8(pD->i_service_provider_name,
- pD->i_service_provider_name_length);
+ pD->i_service_provider_name_length,
+ p_sys->b_broken_charset );
str2 = EITConvertToUTF8(pD->i_service_name,
- pD->i_service_name_length);
+ 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 );
{
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 );
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 )
{
/* */
es_format_Init( p_fmt, SPU_ES, VLC_CODEC_TELETEXT );
- /* In stream output mode, do not separate the stream by page */
- if( p_demux->out->b_sout || i_page <= 0 )
+ 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;
if( !p_dr )
p_dr = PMTEsFindDescriptor( p_es, 0x56 );
- if( p_demux->out->b_sout && p_dr && p_dr->i_length > 0 )
+ if( !p_demux->p_sys->b_split_es && p_dr && p_dr->i_length > 0 )
{
- /* Descriptor pass-through for sout */
+ /* Descriptor pass-through */
p_fmt->p_extra = malloc( p_dr->i_length );
if( p_fmt->p_extra )
{
/* */
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;
}
#endif
- /* In stream output mode, do not separate the stream by page */
- if( p_demux->out->b_sout || i_page <= 0 )
+ 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") );
- if( p_demux->out->b_sout && p_dr && p_dr->i_length > 0 )
+ if( !p_demux->p_sys->b_split_es && p_dr && p_dr->i_length > 0 )
{
- /* Descriptor pass-through for sout */
+ /* Descriptor pass-through */
p_fmt->p_extra = malloc( p_dr->i_length );
if( p_fmt->p_extra )
{
}
#ifdef _DVBPSI_DR_52_H_
- /* FIXME is it usefull ? */
+ /* FIXME is it useful ? */
if( PMTEsFindDescriptor( p_es, 0x52 ) )
{
dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x52 );
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 )
{
{
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 &&
{
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;
false );
}
- PIDClean( p_demux->out, pp_clean[i] );
+ PIDClean( p_demux, pp_clean[i] );
}
if( i_clean )
free( pp_clean );
p_sys->b_access_control = false;
}
- PIDClean( p_demux->out, pid );
+ PIDClean( p_demux, pid );
break;
}
}
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] );
}
projects / vlc / blobdiff