X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fts.c;h=e53aacf1a195b9a51966ee7616b277348bb6b46d;hb=5181b2a77168e9f172df869cbdf7bd4c0a87d512;hp=0bdcf9951ef10c60e1f0f7daa4caed0da498dfa6;hpb=fac21f4c6f33bbd56d0df04cdc19001224912d9f;p=vlc diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 0bdcf9951e..e53aacf1a1 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -1,10 +1,11 @@ /***************************************************************************** * ts.c: Transport Stream input module for VLC. ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004-2005 the VideoLAN team * $Id$ * * Authors: Laurent Aimar + * Jean-Paul Saman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,39 +19,65 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ #include -#include + +#include +#include /* malloc(), free() */ +#include + +#include /* DVB-specific things */ +#include +#include +#include #include "iso_lang.h" -#include "network.h" +#include +#include #include "../mux/mpeg/csa.h" /* Include dvbpsi headers */ #ifdef HAVE_DVBPSI_DR_H # include +# include # include # include # include +# include # include # include #else # include "dvbpsi.h" +# include "demux.h" # include "descriptor.h" # include "tables/pat.h" # include "tables/pmt.h" +# include "tables/sdt.h" # include "descriptors/dr.h" # include "psi.h" #endif +/* EIT support */ +#ifdef _DVBPSI_DR_4D_H_ +# define TS_USE_DVB_SI 1 +# ifdef HAVE_DVBPSI_DR_H +# include +# else +# include "tables/eit.h" +# endif +#endif +#ifdef HAVE_TIME_H +# include +#endif +#undef TS_DEBUG + /* TODO: * - XXX: do not mark options message to be translated, they are too osbcure for now ... * - test it @@ -63,17 +90,73 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); +#define PMT_TEXT N_("Extra PMT") +#define PMT_LONGTEXT N_( \ + "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." ) + +#define PID_TEXT N_("Set id of ES to PID") +#define PID_LONGTEXT N_("Set the internal ID of each elementary stream" \ + " handled by VLC to the same value as the PID in" \ + " the TS stream, instead of 1, 2, 3, etc. Useful to" \ + " do \'#duplicate{..., select=\"es=\"}\'.") + +#define TSOUT_TEXT N_("Fast udp streaming") +#define TSOUT_LONGTEXT N_( \ + "Sends TS to specific ip:port by udp (you must know what you are doing).") + +#define MTUOUT_TEXT N_("MTU for out mode") +#define MTUOUT_LONGTEXT N_("MTU for out mode.") + +#define CSA_TEXT N_("CSA ck") +#define CSA_LONGTEXT N_("Control word for the CSA encryption algorithm") + +#define SILENT_TEXT N_("Silent mode") +#define SILENT_LONGTEXT N_("Do not complain on encrypted PES.") + +#define CAPMT_SYSID_TEXT N_("CAPMT System ID") +#define CAPMT_SYSID_LONGTEXT N_("Only forward descriptors from this SysID to the CAM.") + +#define CPKT_TEXT N_("Packet size in bytes to decrypt") +#define CPKT_LONGTEXT N_("Specify the size of the TS packet to decrypt. " \ + "The decryption routines subtract the TS-header from the value before " \ + "decrypting. " ) + +#define TSDUMP_TEXT N_("Filename of dump") +#define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in.") + +#define APPEND_TEXT N_("Append") +#define APPEND_LONGTEXT N_( \ + "If the file exists and this option is selected, the existing file " \ + "will not be overwritten." ) + +#define DUMPSIZE_TEXT N_("Dump buffer size") +#define DUMPSIZE_LONGTEXT N_( \ + "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." ) + vlc_module_begin(); - set_description( _("ISO 13818-1 MPEG Transport Stream input - new" ) ); - add_string( "ts-extra-pmt", NULL, NULL, "extra PMT", "allow user to specify an extra pmt (pmt_pid=pid:stream_type[,...])", VLC_TRUE ); - add_bool( "ts-es-id-pid", 0, NULL, "set id of es to pid", "set id of es to pid", VLC_TRUE ); - add_string( "ts-out", NULL, NULL, "fast udp streaming", "send TS to specific ip:port by udp (you must know what you are doing)", VLC_TRUE ); - add_integer( "ts-out-mtu", 1500, NULL, "MTU for out mode", "MTU for out mode", VLC_TRUE ); - add_string( "ts-csa-ck", NULL, NULL, "CSA ck", "CSA ck", VLC_TRUE ); - add_bool( "ts-silent", 0, NULL, "Silent mode", "do not complain on encrypted PES", VLC_TRUE ); + set_description( _("MPEG Transport Stream demuxer") ); + set_shortname ( "MPEG-TS" ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + + add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, VLC_TRUE ); + add_bool( "ts-es-id-pid", 1, NULL, PID_TEXT, PID_LONGTEXT, VLC_TRUE ); + add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, VLC_TRUE ); + add_integer( "ts-out-mtu", 1500, NULL, MTUOUT_TEXT, + MTUOUT_LONGTEXT, VLC_TRUE ); + add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, VLC_TRUE ); + add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE ); + add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, VLC_TRUE ); + + add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, VLC_FALSE ); + add_bool( "ts-dump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, VLC_FALSE ); + add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT, + DUMPSIZE_LONGTEXT, VLC_TRUE ); + set_capability( "demux2", 10 ); set_callbacks( Open, Close ); - add_shortcut( "ts2" ); + add_shortcut( "ts" ); vlc_module_end(); /***************************************************************************** @@ -139,11 +222,12 @@ typedef struct decoder_config_descriptor_t dec_descr; sl_config_descriptor_t sl_descr; + } es_mpeg4_descriptor_t; typedef struct { - uint8_t i_iod_label; + uint8_t i_iod_label, i_iod_label_scope; /* IOD */ uint16_t i_od_id; @@ -166,19 +250,23 @@ typedef struct int i_version; int i_number; int i_pid_pcr; + int i_pid_pmt; /* IOD stuff (mpeg4) */ iod_descriptor_t *iod; + } ts_prg_psi_t; typedef struct { - /* for special PAT case */ - dvbpsi_handle handle; + /* for special PAT/SDT case */ + dvbpsi_handle handle; /* PAT/SDT/EIT */ int i_pat_version; + int i_sdt_version; /* For PMT */ int i_prg; ts_prg_psi_t **prg; + } ts_psi_t; typedef struct @@ -192,6 +280,7 @@ typedef struct es_mpeg4_descriptor_t *p_mpeg4desc; int b_gather; + } ts_es_t; typedef struct @@ -218,6 +307,9 @@ typedef struct struct demux_sys_t { + /* TS packet size (188, 192, 204) */ + int i_packet_size; + /* how many TS packet we read at once */ int i_ts_read; @@ -231,23 +323,43 @@ struct demux_sys_t /* */ vlc_bool_t b_es_id_pid; csa_t *csa; + int i_csa_pkt_size; vlc_bool_t b_silent; vlc_bool_t b_udp_out; int fd; /* udp socket */ uint8_t *buffer; + + vlc_bool_t b_dvb_control; + int i_dvb_program; + int64_t i_dvb_start; + int64_t i_dvb_length; + vlc_list_t *p_programs_list; + + /* TS dump */ + char *psz_file; /* file to dump data in */ + FILE *p_file; /* filehandle */ + uint64_t i_write; /* bytes written */ + vlc_bool_t b_file_out; /* dump mode enabled */ + + /* */ + vlc_bool_t b_meta; }; -static int Demux ( demux_t *p_demux ); +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, vlc_bool_t b_psi, ts_psi_t *p_owner ); static void PIDClean( es_out_t *out, ts_pid_t *pid ); static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ); static void PATCallBack( demux_t *, dvbpsi_pat_t * ); static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ); +#ifdef TS_USE_DVB_SI +static void PSINewTableCallBack( demux_t *, dvbpsi_handle, + uint8_t i_table_id, uint16_t i_extension ); +#endif static inline int PIDGet( block_t *p ) { @@ -261,6 +373,11 @@ static void PCRHandle( demux_t *p_demux, ts_pid_t *, block_t * ); static iod_descriptor_t *IODNew( int , uint8_t * ); static void IODFree( iod_descriptor_t * ); +#define TS_PACKET_SIZE_188 188 +#define TS_PACKET_SIZE_192 192 +#define TS_PACKET_SIZE_204 204 +#define TS_PACKET_SIZE_MAX 204 +#define TS_TOPFIELD_HEADER 1320 /***************************************************************************** * Open @@ -271,58 +388,214 @@ static int Open( vlc_object_t *p_this ) demux_sys_t *p_sys; uint8_t *p_peek; - int i_peek; - int i_sync; - int i; + int i_sync, i_peek, i; + int i_packet_size; - ts_pid_t *pat; + ts_pid_t *pat; + const char *psz_mode; + vlc_bool_t b_append; + vlc_bool_t b_topfield = VLC_FALSE; vlc_value_t val; - if( ( i_peek = stream_Peek( p_demux->s, &p_peek, 189 ) ) < 1 ) + if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) < + TS_PACKET_SIZE_MAX ) return VLC_EGENERIC; + + if( p_peek[0] == 'T' && p_peek[1] == 'F' && + p_peek[2] == 'r' && p_peek[3] == 'c' ) { - msg_Err( p_demux, "cannot peek" ); - return VLC_EGENERIC; + b_topfield = VLC_TRUE; + msg_Dbg( p_demux, "this is a topfield file" ); } - /* Search first synch */ - for( i_sync = 0; i_sync < i_peek; i_sync++ ) + /* Search first sync byte */ + for( i_sync = 0; i_sync < TS_PACKET_SIZE_MAX; i_sync++ ) { if( p_peek[i_sync] == 0x47 ) break; } - if( i_sync >= i_peek ) + if( i_sync >= TS_PACKET_SIZE_MAX && !b_topfield ) { - if( strcmp( p_demux->psz_demux, "ts2" ) ) - { - msg_Warn( p_demux, "TS module discarded" ); - return VLC_EGENERIC; - } + if( strcmp( p_demux->psz_demux, "ts" ) ) return VLC_EGENERIC; msg_Warn( p_demux, "this does not look like a TS stream, continuing" ); } - if( strcmp( p_demux->psz_demux, "ts2" ) ) + + if( b_topfield ) + { + /* Read the entire Topfield header */ + i_peek = TS_TOPFIELD_HEADER; + } + else + { + /* Check next 3 sync bytes */ + i_peek = TS_PACKET_SIZE_MAX * 3 + i_sync + 1; + } + + if( ( stream_Peek( p_demux->s, &p_peek, i_peek ) ) < i_peek ) + { + msg_Err( p_demux, "cannot peek" ); + return VLC_EGENERIC; + } + if( p_peek[i_sync + TS_PACKET_SIZE_188] == 0x47 && + p_peek[i_sync + 2 * TS_PACKET_SIZE_188] == 0x47 && + p_peek[i_sync + 3 * TS_PACKET_SIZE_188] == 0x47 ) + { + i_packet_size = TS_PACKET_SIZE_188; + } + else if( p_peek[i_sync + TS_PACKET_SIZE_192] == 0x47 && + p_peek[i_sync + 2 * TS_PACKET_SIZE_192] == 0x47 && + p_peek[i_sync + 3 * TS_PACKET_SIZE_192] == 0x47 ) + { + i_packet_size = TS_PACKET_SIZE_192; + } + else if( p_peek[i_sync + TS_PACKET_SIZE_204] == 0x47 && + p_peek[i_sync + 2 * TS_PACKET_SIZE_204] == 0x47 && + p_peek[i_sync + 3 * TS_PACKET_SIZE_204] == 0x47 ) + { + i_packet_size = TS_PACKET_SIZE_204; + } + else if( !strcmp( p_demux->psz_demux, "ts" ) ) + { + i_packet_size = TS_PACKET_SIZE_188; + } + else if( b_topfield ) + { + i_packet_size = TS_PACKET_SIZE_188; +#if 0 + /* I used the TF5000PVR 2004 Firmware .doc header documentation, + * http://www.i-topfield.com/data/product/firmware/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc + * but after the filename the offsets seem to be incorrect. - DJ */ + int i_duration, i_name; + char *psz_name = malloc(25); + char *psz_event_name; + char *psz_event_text = malloc(130); + char *psz_ext_text = malloc(1025); + + // 2 bytes version Uimsbf (4,5) + // 2 bytes reserved (6,7) + // 2 bytes duration in minutes Uimsbf (8,9( + i_duration = (int) (p_peek[8] << 8) | p_peek[9]; + msg_Dbg( p_demux, "Topfield recording length: +/- %d minutes", i_duration); + // 2 bytes service number in channel list (10, 11) + // 2 bytes service type Bslbf 0=TV 1=Radio Bslb (12, 13) + // 4 bytes of reserved + tuner info (14,15,16,17) + // 2 bytes of Service ID Bslbf (18,19) + // 2 bytes of PMT PID Uimsbf (20,21) + // 2 bytes of PCR PID Uimsbf (22,23) + // 2 bytes of Video PID Uimsbf (24,25) + // 2 bytes of Audio PID Uimsbf (26,27) + // 24 bytes filename Bslbf + memcpy( psz_name, &p_peek[28], 24 ); + psz_name[24] = '\0'; + msg_Dbg( p_demux, "recordingname=%s", psz_name ); + // 1 byte of sat index Uimsbf (52) + // 3 bytes (1 bit of polarity Bslbf +23 bits reserved) + // 4 bytes of freq. Uimsbf (56,57,58,59) + // 2 bytes of symbol rate Uimsbf (60,61) + // 2 bytes of TS stream ID Uimsbf (62,63) + // 4 bytes reserved + // 2 bytes reserved + // 2 bytes duration Uimsbf (70,71) + //i_duration = (int) (p_peek[70] << 8) | p_peek[71]; + //msg_Dbg( p_demux, "Topfield 2nd duration field: +/- %d minutes", i_duration); + // 4 bytes EventID Uimsbf (72-75) + // 8 bytes of Start and End time info (76-83) + // 1 byte reserved (84) + // 1 byte event name length Uimsbf (89) + i_name = (int)(p_peek[89]&~0x81); + msg_Dbg( p_demux, "event name length = %d", i_name); + psz_event_name = malloc( i_name+1 ); + // 1 byte parental rating (90) + // 129 bytes of event text + memcpy( psz_event_name, &p_peek[91], i_name ); + psz_event_name[i_name] = '\0'; + memcpy( psz_event_text, &p_peek[91+i_name], 129-i_name ); + psz_event_text[129-i_name] = '\0'; + msg_Dbg( p_demux, "event name=%s", psz_event_name ); + msg_Dbg( p_demux, "event text=%s", psz_event_text ); + // 12 bytes reserved (220) + // 6 bytes reserved + // 2 bytes Event Text Length Uimsbf + // 4 bytes EventID Uimsbf + // FIXME We just have 613 bytes. not enough for this entire text + // 1024 bytes Extended Event Text Bslbf + memcpy( psz_ext_text, p_peek+372, 1024 ); + psz_ext_text[1024] = '\0'; + msg_Dbg( p_demux, "extended event text=%s", psz_ext_text ); + // 52 bytes reserved Bslbf +#endif + } + else + { + msg_Warn( p_demux, "TS module discarded (lost sync)" ); + return VLC_EGENERIC; + } + + p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + memset( p_sys, 0, sizeof( demux_sys_t ) ); + p_sys->i_packet_size = i_packet_size; + + /* Fill dump mode fields */ + p_sys->i_write = 0; + p_sys->p_file = NULL; + p_sys->b_file_out = VLC_FALSE; + p_sys->psz_file = var_CreateGetString( p_demux, "ts-dump-file" ); + if( *p_sys->psz_file != '\0' ) { - /* Check next 3 sync points */ - i_peek = 188*3 + 1 + i_sync; - if( ( stream_Peek( p_demux->s, &p_peek, i_peek ) ) < i_peek ) + p_sys->b_file_out = VLC_TRUE; + + var_Create( p_demux, "ts-dump-append", VLC_VAR_BOOL|VLC_VAR_DOINHERIT ); + var_Get( p_demux, "ts-dump-append", &val ); + b_append = val.b_bool; + if ( b_append ) + psz_mode = "ab"; + else + psz_mode = "wb"; + + if( !strcmp( p_sys->psz_file, "-" ) ) { - msg_Err( p_demux, "cannot peek" ); - return VLC_EGENERIC; + msg_Info( p_demux, "dumping raw stream to standard output" ); + p_sys->p_file = stdout; } - if( p_peek[i_sync+ 188] != 0x47 || p_peek[i_sync+2*188] != 0x47 || - p_peek[i_sync+3*188] != 0x47 ) + else if( ( p_sys->p_file = utf8_fopen( p_sys->psz_file, psz_mode ) ) == NULL ) { - msg_Warn( p_demux, "TS module discarded (lost sync)" ); - return VLC_EGENERIC; + msg_Err( p_demux, "cannot create `%s' for writing", p_sys->psz_file ); + p_sys->b_file_out = VLC_FALSE; + } + + if( p_sys->b_file_out ) + { + vlc_value_t bufsize; + + /* Determine how many packets to read. */ + var_Create( p_demux, "ts-dump-size", + VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Get( p_demux, "ts-dump-size", &bufsize ); + p_sys->i_ts_read = (int) (bufsize.i_int / p_sys->i_packet_size); + if( p_sys->i_ts_read <= 0 ) + { + 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 ); + 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 ); } } /* Fill p_demux field */ - p_demux->pf_demux = Demux; + if( p_sys->b_file_out ) + p_demux->pf_demux = DemuxFile; + else + p_demux->pf_demux = Demux; p_demux->pf_control = Control; - p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); - memset( p_sys, 0, sizeof( demux_sys_t ) ); /* Init p_sys field */ + p_sys->b_meta = VLC_TRUE; + p_sys->b_dvb_control = VLC_TRUE; + p_sys->i_dvb_program = 0; + p_sys->i_dvb_start = 0;; + p_sys->i_dvb_length = 0; + for( i = 0; i < 8192; i++ ) { ts_pid_t *pid = &p_sys->pid[i]; @@ -331,6 +604,9 @@ static int Open( vlc_object_t *p_this ) pid->b_seen = VLC_FALSE; pid->b_valid = VLC_FALSE; } + /* PID 8191 is padding */ + p_sys->pid[8191].b_seen = VLC_TRUE; + p_sys->i_packet_size = i_packet_size; p_sys->b_udp_out = VLC_FALSE; p_sys->i_ts_read = 50; p_sys->csa = NULL; @@ -340,6 +616,30 @@ static int Open( vlc_object_t *p_this ) PIDInit( pat, VLC_TRUE, NULL ); pat->psi->handle = dvbpsi_AttachPAT( (dvbpsi_pat_callback)PATCallBack, p_demux ); +#ifdef TS_USE_DVB_SI + if( p_sys->b_meta ) + { + ts_pid_t *sdt = &p_sys->pid[0x11]; + ts_pid_t *eit = &p_sys->pid[0x12]; + + PIDInit( sdt, VLC_TRUE, NULL ); + sdt->psi->handle = + dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, + p_demux ); + PIDInit( eit, VLC_TRUE, NULL ); + eit->psi->handle = + dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, + p_demux ); + if( p_sys->b_dvb_control ) + { + if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, 0x11, VLC_TRUE ) || + stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, 0x12, VLC_TRUE ) ) + p_sys->b_dvb_control = VLC_FALSE; + } + } +#endif /* Init PMT array */ p_sys->i_pmt = 0; @@ -348,11 +648,11 @@ static int Open( vlc_object_t *p_this ) /* Read config */ var_Create( p_demux, "ts-es-id-pid", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Get( p_demux, "ts-es-id-pid", &val ); - p_sys->b_es_id_pid = val.b_bool, + p_sys->b_es_id_pid = val.b_bool; var_Create( p_demux, "ts-out", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); var_Get( p_demux, "ts-out", &val ); - if( val.psz_string && *val.psz_string ) + if( val.psz_string && *val.psz_string && !p_sys->b_file_out ) { vlc_value_t mtu; char *psz = strchr( val.psz_string, ':' ); @@ -368,7 +668,7 @@ static int Open( vlc_object_t *p_this ) if( i_port <= 0 ) i_port = 1234; msg_Dbg( p_demux, "resend ts to '%s:%d'", val.psz_string, i_port ); - p_sys->fd = net_OpenUDP( p_demux, "", 0, val.psz_string, i_port ); + p_sys->fd = net_ConnectUDP( VLC_OBJECT(p_demux), val.psz_string, i_port, 0 ); if( p_sys->fd < 0 ) { msg_Err( p_demux, "failed to open udp socket, send disabled" ); @@ -379,12 +679,12 @@ static int Open( vlc_object_t *p_this ) var_Create( p_demux, "ts-out-mtu", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); var_Get( p_demux, "ts-out-mtu", &mtu ); - p_sys->i_ts_read = mtu.i_int / 188; + p_sys->i_ts_read = mtu.i_int / p_sys->i_packet_size; if( p_sys->i_ts_read <= 0 ) { - p_sys->i_ts_read = 1500 / 188; + p_sys->i_ts_read = 1500 / p_sys->i_packet_size; } - p_sys->buffer = malloc( 188 * p_sys->i_ts_read ); + p_sys->buffer = malloc( p_sys->i_packet_size * p_sys->i_ts_read ); } } if( val.psz_string ) @@ -392,7 +692,6 @@ static int Open( vlc_object_t *p_this ) free( val.psz_string ); } - /* We handle description of an extra PMT */ var_Create( p_demux, "ts-extra-pmt", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); var_Get( p_demux, "ts-extra-pmt", &val ); @@ -404,14 +703,19 @@ static int Open( vlc_object_t *p_this ) if( i_pid >= 2 && i_pid < 8192 ) { ts_pid_t *pmt = &p_sys->pid[i_pid]; + ts_prg_psi_t *prg; - msg_Dbg( p_demux, "extra pmt specified (pid=0x%x)", i_pid ); + msg_Dbg( p_demux, "extra pmt specified (pid=%d)", i_pid ); PIDInit( pmt, VLC_TRUE, NULL ); - /* FIXME we should also ask for a number */ - pmt->psi->prg[0]->handle = - dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack, - p_demux ); - pmt->psi->prg[0]->i_number = 0; /* special one */ + + /* Dummy PMT */ + prg = malloc( sizeof( ts_prg_psi_t ) ); + memset( prg, 0, sizeof( ts_prg_psi_t ) ); + prg->i_pid_pcr = -1; + prg->i_pid_pmt = -1; + prg->i_number = 0; /* special */ + prg->handle = dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack, p_demux ); + TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg ); psz = strchr( psz, '=' ) + 1; /* can't failed */ while( psz && *psz ) @@ -445,7 +749,7 @@ static int Open( vlc_object_t *p_this ) { pid->es->fmt.i_id = i_pid; } - msg_Dbg( p_demux, " * es pid=0x%x type=0x%x " + msg_Dbg( p_demux, " * es pid=%d type=%d " "fcc=%4.4s", i_pid, i_stream_type, (char*)&pid->es->fmt.i_codec ); pid->es->id = es_out_Add( p_demux->out, @@ -477,20 +781,41 @@ static int Open( vlc_object_t *p_this ) } else { +#ifndef UNDER_CE + uint64_t i_ck = strtoull( psz, NULL, 16 ); +#else uint64_t i_ck = strtoll( psz, NULL, 16 ); +#endif uint8_t ck[8]; int i; for( i = 0; i < 8; i++ ) { ck[i] = ( i_ck >> ( 56 - 8*i) )&0xff; } - +#ifndef TS_NO_CSA_CK_MSG msg_Dbg( p_demux, "using CSA scrambling with " "ck=%x:%x:%x:%x:%x:%x:%x:%x", ck[0], ck[1], ck[2], ck[3], ck[4], ck[5], ck[6], ck[7] ); - +#endif p_sys->csa = csa_New(); - csa_SetCW( p_sys->csa, ck, ck ); + + if( p_sys->csa ) + { + vlc_value_t pkt_val; + + csa_SetCW( p_sys->csa, ck, ck ); + + var_Create( p_demux, "ts-csa-pkt", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Get( p_demux, "ts-csa-pkt", &pkt_val ); + if( pkt_val.i_int < 4 || pkt_val.i_int > 188 ) + { + msg_Err( p_demux, "wrong packet size %d specified.", pkt_val.i_int ); + msg_Warn( p_demux, "using default packet size of 188 bytes" ); + p_sys->i_csa_pkt_size = 188; + } + else p_sys->i_csa_pkt_size = pkt_val.i_int; + msg_Dbg( p_demux, "decrypting %d bytes of packet", p_sys->i_csa_pkt_size ); + } } } if( val.psz_string ) @@ -531,6 +856,11 @@ static void Close( vlc_object_t *p_this ) case 1: /* CAT */ free( pid->psi ); break; + case 0x11: /* SDT */ + case 0x12: /* EIT */ + dvbpsi_DetachDemux( pid->psi->handle ); + free( pid->psi ); + break; default: PIDClean( p_demux->out, pid ); break; @@ -543,8 +873,17 @@ static void Close( vlc_object_t *p_this ) if( pid->b_seen ) { - msg_Dbg( p_demux, " - pid[0x%x] seen", pid->i_pid ); + msg_Dbg( p_demux, " - pid[%d] seen", pid->i_pid ); } + + if( p_sys->b_dvb_control && pid->i_pid > 0 ) + { + /* too much */ + stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid, + VLC_FALSE ); + } + } if( p_sys->b_udp_out ) @@ -558,9 +897,144 @@ static void Close( vlc_object_t *p_this ) } if( p_sys->i_pmt ) free( p_sys->pmt ); + + if ( p_sys->p_programs_list ) + { + vlc_value_t val; + val.p_list = p_sys->p_programs_list; + var_Change( p_demux, "programs", VLC_VAR_FREELIST, &val, NULL ); + } + + /* If in dump mode, then close the file */ + if( p_sys->b_file_out ) + { + msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", + p_sys->psz_file, p_sys->i_write / 1024 ); + + if( p_sys->p_file != stdout ) + { + fclose( p_sys->p_file ); + p_sys->p_file = NULL; + } + + free( p_sys->buffer ); + } + + free( p_sys->psz_file ); + p_sys->psz_file = NULL; + free( p_sys ); } +/***************************************************************************** + * DemuxFile: + *****************************************************************************/ +static int DemuxFile( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + uint8_t *p_buffer = p_sys->buffer; /* Put first on sync byte */ + int i_diff= 0; + int i_data= 0; + int i_pos = 0; + int i_bufsize = p_sys->i_packet_size * p_sys->i_ts_read; + + i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize ); + if( (i_data <= 0) && (i_data < p_sys->i_packet_size) ) + { + msg_Dbg( p_demux, "error reading malformed packets" ); + return i_data; + } + + /* Test continuity counter */ + while( i_pos < i_data ) + { + ts_pid_t *p_pid; /* point to a PID structure */ + vlc_bool_t b_payload; /* indicates a packet with payload */ + vlc_bool_t b_adaptation; /* adaptation field */ + int i_cc = 0; /* continuity counter */ + + if( p_sys->buffer[i_pos] != 0x47 ) + { + msg_Warn( p_demux, "lost sync" ); + while( !p_demux->b_die && (i_pos < i_data) ) + { + i_pos++; + if( p_sys->buffer[i_pos] == 0x47 ) + break; + } + if( !p_demux->b_die ) + msg_Warn( p_demux, "sync found" ); + } + + /* continuous when (one of this): + * diff == 1 + * diff == 0 and payload == 0 + * diff == 0 and duplicate packet (playload != 0) <- should we + * test the content ? + */ + i_cc = p_buffer[i_pos+3]&0x0f; + b_payload = p_buffer[i_pos+3]&0x10; + b_adaptation = p_buffer[i_pos+3]&0x20; + + /* Get the PID */ + p_pid = &p_sys->pid[ ((p_buffer[i_pos+1]&0x1f)<<8)|p_buffer[i_pos+2] ]; + + /* Detect discontinuity indicator in adaptation field */ + if( b_adaptation && p_buffer[i_pos + 4] > 0 ) + { + if( p_buffer[i_pos+5]&0x80 ) + msg_Warn( p_demux, "discontinuity indicator (pid=%d) ", p_pid->i_pid ); + if( p_buffer[i_pos+5]&0x40 ) + msg_Warn( p_demux, "random access indicator (pid=%d) ", p_pid->i_pid ); + } + + i_diff = ( i_cc - p_pid->i_cc )&0x0f; + if( b_payload && i_diff == 1 ) + { + p_pid->i_cc = ( p_pid->i_cc + 1 ) & 0xf; + } + else + { + if( p_pid->i_cc == 0xff ) + { + msg_Warn( p_demux, "first packet for pid=%d cc=0x%x", + p_pid->i_pid, i_cc ); + p_pid->i_cc = i_cc; + } + else if( i_diff != 0 ) + { + /* FIXME what to do when discontinuity_indicator is set ? */ + msg_Warn( p_demux, "transport error detected 0x%x instead of 0x%x", + i_cc, ( p_pid->i_cc + 1 )&0x0f ); + + p_pid->i_cc = i_cc; + /* Mark transport error in the TS packet. */ + p_buffer[i_pos+1] |= 0x80; + } + } + + /* Test if user wants to decrypt it first */ + if( p_sys->csa ) + csa_Decrypt( p_demux->p_sys->csa, &p_buffer[i_pos], p_demux->p_sys->i_csa_pkt_size ); + + i_pos += p_sys->i_packet_size; + } + + /* Then write */ + i_data = fwrite( p_sys->buffer, 1, i_data, p_sys->p_file ); + if( i_data < 0 ) + { + msg_Err( p_demux, "failed to write data" ); + return -1; + } +#if 0 + msg_Dbg( p_demux, "dumped %d bytes", i_data ); +#endif + + p_sys->i_write += i_data; + return 1; +} + /***************************************************************************** * Demux: *****************************************************************************/ @@ -577,47 +1051,51 @@ static int Demux( demux_t *p_demux ) ts_pid_t *p_pid; /* Get a new TS packet */ - if( ( p_pkt = stream_Block( p_demux->s, 188 ) ) == NULL ) + if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) ) { msg_Dbg( p_demux, "eof ?" ); return 0; } + + /* Check sync byte and re-sync if needed */ if( p_pkt->p_buffer[0] != 0x47 ) { msg_Warn( p_demux, "lost synchro" ); block_Release( p_pkt ); - /* Resynch */ while( !p_demux->b_die ) { - uint8_t *p_peek; - int i_peek = stream_Peek( p_demux->s, &p_peek, 1880 ); - int i_skip = 0; - vlc_bool_t b_ok = VLC_FALSE; + uint8_t *p_peek; + int i_peek, i_skip = 0; - if( i_peek < 189 ) + i_peek = stream_Peek( p_demux->s, &p_peek, + p_sys->i_packet_size * 10 ); + if( i_peek < p_sys->i_packet_size + 1 ) { msg_Dbg( p_demux, "eof ?" ); return 0; } - while( i_skip < i_peek - 188 ) + while( i_skip < i_peek - p_sys->i_packet_size ) { - if( p_peek[i_skip] == 0x47 && p_peek[i_skip+188] == 0x47 ) + if( p_peek[i_skip] == 0x47 && + p_peek[i_skip + p_sys->i_packet_size] == 0x47 ) { - b_ok = VLC_TRUE; break; } i_skip++; } + + msg_Dbg( p_demux, "skipping %d bytes of garbage", i_skip ); stream_Read( p_demux->s, NULL, i_skip ); - msg_Dbg( p_demux, "%d bytes of garbage", i_skip ); - if( b_ok ) + + if( i_skip < i_peek - p_sys->i_packet_size ) { break; } } - if( ( p_pkt = stream_Block( p_demux->s, 188 ) ) == NULL ) + + if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) ) { msg_Dbg( p_demux, "eof ?" ); return 0; @@ -626,7 +1104,8 @@ static int Demux( demux_t *p_demux ) if( p_sys->b_udp_out ) { - memcpy( &p_sys->buffer[i_pkt*188], p_pkt->p_buffer, 188 ); + memcpy( &p_sys->buffer[i_pkt * p_sys->i_packet_size], + p_pkt->p_buffer, p_sys->i_packet_size ); } /* Parse the TS packet */ @@ -636,7 +1115,7 @@ static int Demux( demux_t *p_demux ) { if( p_pid->psi ) { - if( p_pid->i_pid == 0 ) + if( p_pid->i_pid == 0 || p_pid->i_pid == 0x11 || p_pid->i_pid == 0x12 ) { dvbpsi_PushPacket( p_pid->psi->handle, p_pkt->p_buffer ); } @@ -645,7 +1124,8 @@ static int Demux( demux_t *p_demux ) int i_prg; for( i_prg = 0; i_prg < p_pid->psi->i_prg; i_prg++ ) { - dvbpsi_PushPacket( p_pid->psi->prg[i_prg]->handle, p_pkt->p_buffer ); + dvbpsi_PushPacket( p_pid->psi->prg[i_prg]->handle, + p_pkt->p_buffer ); } } block_Release( p_pkt ); @@ -656,6 +1136,7 @@ static int Demux( demux_t *p_demux ) } else { + PCRHandle( p_demux, p_pid, p_pkt ); block_Release( p_pkt ); } } @@ -663,7 +1144,7 @@ static int Demux( demux_t *p_demux ) { if( !p_pid->b_seen ) { - msg_Dbg( p_demux, "pid[0x%x] unknown", p_pid->i_pid ); + msg_Dbg( p_demux, "pid[%d] unknown", p_pid->i_pid ); } /* We have to handle PCR if present */ PCRHandle( p_demux, p_pid, p_pkt ); @@ -680,7 +1161,8 @@ static int Demux( demux_t *p_demux ) if( p_sys->b_udp_out ) { /* Send the complete block */ - net_Write( p_demux, p_sys->fd, p_sys->buffer, p_sys->i_ts_read * 188 ); + net_Write( p_demux, p_sys->fd, NULL, p_sys->buffer, + p_sys->i_ts_read * p_sys->i_packet_size ); } return 1; @@ -689,11 +1171,42 @@ static int Demux( demux_t *p_demux ) /***************************************************************************** * Control: *****************************************************************************/ +static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_length ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + if( pi_length ) + *pi_length = 0; + if( pi_time ) + *pi_time = 0; + +#ifdef HAVE_TIME_H + if( p_sys->b_dvb_control && 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 ); + if( p_sys->i_dvb_start <= t && t < p_sys->i_dvb_start + p_sys->i_dvb_length ) + { + if( pi_length ) + *pi_length = p_sys->i_dvb_length * I64C(1000000); + if( pi_time ) + *pi_time = (t - p_sys->i_dvb_start) * I64C(1000000); + return VLC_SUCCESS; + } + } +#endif + return VLC_EGENERIC; +} + static int Control( demux_t *p_demux, int i_query, va_list args ) { - /* demux_sys_t *p_sys = p_demux->p_sys; */ + demux_sys_t *p_sys = p_demux->p_sys; double f, *pf; int64_t i64; + int64_t *pi64; + int i_int; + + if( p_sys->b_file_out ) + return demux2_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args ); switch( i_query ) { @@ -706,7 +1219,11 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } else { - *pf = 0.0; + int64_t i_time, i_length; + if( !DVBEventInformation( p_demux, &i_time, &i_length ) && i_length > 0 ) + *pf = (double)i_time/(double)i_length; + else + *pf = 0.0; } return VLC_SUCCESS; case DEMUX_SET_POSITION: @@ -741,7 +1258,145 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) } *pi64 = 0; return VLC_EGENERIC; +#else + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( DVBEventInformation( p_demux, pi64, NULL ) ) + *pi64 = 0; + return VLC_SUCCESS; + + case DEMUX_GET_LENGTH: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( DVBEventInformation( p_demux, NULL, pi64 ) ) + *pi64 = 0; + return VLC_SUCCESS; #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_dvb_control && i_int > 0 && i_int != p_sys->i_dvb_program ) + { + int i_pmt_pid = -1; + int i; + + /* Search pmt to be unselected */ + for( i = 0; i < p_sys->i_pmt; i++ ) + { + ts_pid_t *pmt = p_sys->pmt[i]; + int i_prg; + + for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) + { + if( pmt->psi->prg[i_prg]->i_number == p_sys->i_dvb_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, + VLC_FALSE ); + /* All ES */ + for( i = 2; i < 8192; i++ ) + { + ts_pid_t *pid = &p_sys->pid[i]; + int i_prg; + + if( !pid->b_valid || pid->psi ) continue; + + for( 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, VLC_FALSE ); + break; + } + } + } + } + + /* select new program */ + p_sys->i_dvb_program = i_int; + i_pmt_pid = -1; + for( i = 0; i < p_sys->i_pmt; i++ ) + { + ts_pid_t *pmt = p_sys->pmt[i]; + int i_prg; + + for( 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, + VLC_TRUE ); + stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr, + VLC_TRUE ); + + for( i = 2; i < 8192; i++ ) + { + ts_pid_t *pid = &p_sys->pid[i]; + int i_prg; + + if( !pid->b_valid || pid->psi ) continue; + + for( 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 ) + { + 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, VLC_TRUE ); + break; + } + } + } + } + } + else + { + p_sys->i_dvb_program = -1; + p_sys->p_programs_list = p_list; + } + return VLC_SUCCESS; + } + case DEMUX_GET_FPS: case DEMUX_SET_TIME: default: @@ -758,8 +1413,7 @@ static void PIDInit( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner ) pid->p_owner = p_owner; pid->i_owner_number = 0; - pid->extra_es = NULL; - pid->i_extra_es = 0; + TAB_INIT( pid->i_extra_es, pid->extra_es ); if( b_psi ) { @@ -768,11 +1422,12 @@ static void PIDInit( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner ) if( !b_old_valid ) { pid->psi = malloc( sizeof( ts_psi_t ) ); + pid->psi->handle= NULL; pid->psi->i_prg = 0; pid->psi->prg = NULL; - pid->psi->handle= NULL; } pid->psi->i_pat_version = -1; + pid->psi->i_sdt_version = -1; if( p_owner ) { ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) ); @@ -780,6 +1435,7 @@ static void PIDInit( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner ) prg->i_version = -1; prg->i_number = -1; prg->i_pid_pcr = -1; + prg->i_pid_pmt = -1; prg->iod = NULL; prg->handle = NULL; @@ -811,8 +1467,10 @@ static void PIDClean( es_out_t *out, ts_pid_t *pid ) if( pid->psi->handle ) dvbpsi_DetachPMT( pid->psi->handle ); for( i = 0; i < pid->psi->i_prg; i++ ) { - if( pid->psi->prg[i]->iod ) IODFree( pid->psi->prg[i]->iod ); - if( pid->psi->prg[i]->handle ) dvbpsi_DetachPMT( pid->psi->prg[i]->handle ); + if( pid->psi->prg[i]->iod ) + IODFree( pid->psi->prg[i]->iod ); + if( pid->psi->prg[i]->handle ) + dvbpsi_DetachPMT( pid->psi->prg[i]->handle ); free( pid->psi->prg[i] ); } if( pid->psi->prg ) free( pid->psi->prg ); @@ -853,7 +1511,7 @@ static void PIDClean( es_out_t *out, ts_pid_t *pid ) /**************************************************************************** * gathering stuff ****************************************************************************/ -static void ParsePES ( demux_t *p_demux, ts_pid_t *pid ) +static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) { block_t *p_pes = pid->es->p_pes; uint8_t header[30]; @@ -873,11 +1531,12 @@ static void ParsePES ( demux_t *p_demux, ts_pid_t *pid ) /* FIXME find real max size */ i_max = block_ChainExtract( p_pes, header, 30 ); + if( header[0] != 0 || header[1] != 0 || header[2] != 1 ) { - if ( !p_demux->p_sys->b_silent ) - msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x]", header[0], - header[1],header[2],header[3] ); + if( !p_demux->p_sys->b_silent ) + msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x] (pid: %d)", + header[0], header[1],header[2],header[3], pid->i_pid ); block_ChainRelease( p_pes ); return; } @@ -978,7 +1637,8 @@ static void ParsePES ( demux_t *p_demux, ts_pid_t *pid ) { i_skip += 1; } - else if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) && pid->es->p_mpeg4desc ) + else if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) && + pid->es->p_mpeg4desc ) { decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr; @@ -1001,7 +1661,10 @@ static void ParsePES ( demux_t *p_demux, ts_pid_t *pid ) /* */ i_skip += 2; } - +#ifdef ZVBI_COMPILED + else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) ) + i_skip = 0; /*hack for zvbi support */ +#endif /* skip header */ while( p_pes && i_skip > 0 ) { @@ -1021,6 +1684,10 @@ static void ParsePES ( demux_t *p_demux, ts_pid_t *pid ) } } + /* ISO/IEC 13818-1 2.7.5: if no pts and no dts, then dts == pts */ + if( i_pts >= 0 && i_dts < 0 ) + i_dts = i_pts; + if( p_pes ) { block_t *p_block; @@ -1100,75 +1767,98 @@ static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) { const uint8_t *p = p_bk->p_buffer; - const vlc_bool_t b_adaptation= p[3]&0x20; - const vlc_bool_t b_payload = p[3]&0x10; - const int i_cc = p[3]&0x0f; /* continuity counter */ - /* transport_scrambling_control is ignored */ + const vlc_bool_t b_unit_start = p[1]&0x40; + const vlc_bool_t b_adaptation = p[3]&0x20; + const vlc_bool_t b_payload = p[3]&0x10; + const int i_cc = p[3]&0x0f; /* continuity counter */ + vlc_bool_t b_discontinuity = VLC_FALSE;/* discontinuity */ + /* transport_scrambling_control is ignored */ int i_skip = 0; - vlc_bool_t i_ret = VLC_FALSE; - + vlc_bool_t i_ret = VLC_FALSE; int i_diff; - //msg_Dbg( p_demux, "pid=0x%x unit_start=%d adaptation=%d payload=%d cc=0x%x", i_pid, b_unit_start, b_adaptation, b_payload, i_continuity_counter); +#if 0 + msg_Dbg( p_demux, "pid=%d unit_start=%d adaptation=%d payload=%d " + "cc=0x%x", pid->i_pid, b_unit_start, b_adaptation, + b_payload, i_cc ); +#endif + + /* For now, ignore additional error correction + * TODO: handle Reed-Solomon 204,188 error correction */ + p_bk->i_buffer = TS_PACKET_SIZE_188; + if( p[1]&0x80 ) { - msg_Dbg( p_demux, "transport_error_indicator set (pid=0x%x)", pid->i_pid ); + msg_Dbg( p_demux, "transport_error_indicator set (pid=%d)", + pid->i_pid ); + if( pid->es->p_pes ) //&& pid->es->fmt.i_cat == VIDEO_ES ) + pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED; } if( p_demux->p_sys->csa ) { - csa_Decrypt( p_demux->p_sys->csa, p_bk->p_buffer ); + csa_Decrypt( p_demux->p_sys->csa, p_bk->p_buffer, p_demux->p_sys->i_csa_pkt_size ); } if( !b_adaptation ) { + /* We don't have any adaptation_field, so payload starts + * immediately after the 4 byte TS header */ i_skip = 4; } else { - /* p[4] is adaptation length */ + /* p[4] is adaptation_field_length minus one */ i_skip = 5 + p[4]; if( p[4] > 0 ) { - if( p[5]&0x80 ) + /* discontinuity indicator found in stream */ + b_discontinuity = (p[5]&0x80) ? VLC_TRUE : VLC_FALSE; + if( b_discontinuity && pid->es->p_pes ) { - msg_Warn( p_demux, "discontinuity_indicator (pid=0x%x) " - "ignored", pid->i_pid ); + msg_Warn( p_demux, "discontinuity indicator (pid=%d) ", + pid->i_pid ); + /* pid->es->p_pes->i_flags |= BLOCK_FLAG_DISCONTINUITY; */ } +#if 0 + if( p[5]&0x40 ) + msg_Dbg( p_demux, "random access indicator (pid=%d) ", pid->i_pid ); +#endif } } - /* test continuity counter */ + + /* Test continuity counter */ /* continuous when (one of this): * diff == 1 * diff == 0 and payload == 0 - * diff == 0 and duplicate packet (playload != 0) <- do we should test the content ? + * diff == 0 and duplicate packet (playload != 0) <- should we + * test the content ? */ - i_diff = ( i_cc - pid->i_cc )&0x0f; if( b_payload && i_diff == 1 ) { - pid->i_cc++; + pid->i_cc = ( pid->i_cc + 1 ) & 0xf; } else { if( pid->i_cc == 0xff ) { - msg_Warn( p_demux, "first packet for pid=0x%x cc=0x%x", + msg_Warn( p_demux, "first packet for pid=%d cc=0x%x", pid->i_pid, i_cc ); pid->i_cc = i_cc; } - else if( i_diff != 0 ) + else if( i_diff != 0 && !b_discontinuity ) { - /* FIXME what to do when discontinuity_indicator is set ? */ - msg_Warn( p_demux, "discontinuity received 0x%x instead of 0x%x", - i_cc, ( pid->i_cc + 1 )&0x0f ); + msg_Warn( p_demux, "discontinuity received 0x%x instead of 0x%x (pid=%d)", + i_cc, ( pid->i_cc + 1 )&0x0f, pid->i_pid ); pid->i_cc = i_cc; - - if( pid->es->p_pes ) + if( pid->es->p_pes && pid->es->fmt.i_cat != VIDEO_ES ) { - pid->es->p_pes->i_flags |= BLOCK_FLAG_DISCONTINUITY; + /* Small video artifacts are usually better then + * dropping full frames */ + pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED; } } } @@ -1178,32 +1868,48 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) if( i_skip >= 188 || pid->es->id == NULL || p_demux->p_sys->b_udp_out ) { block_Release( p_bk ); + return i_ret; } - else - { - const vlc_bool_t b_unit_start= p[1]&0x40; - /* we have to gather it */ - p_bk->p_buffer += i_skip; - p_bk->i_buffer -= i_skip; + /* We have to gather it */ + p_bk->p_buffer += i_skip; + p_bk->i_buffer -= i_skip; - if( b_unit_start ) + if( b_unit_start ) + { + if( pid->es->p_pes ) { - if( pid->es->p_pes ) - { - ParsePES( p_demux, pid ); - i_ret = VLC_TRUE; - } + ParsePES( p_demux, pid ); + i_ret = VLC_TRUE; + } - block_ChainLastAppend( &pid->es->pp_last, p_bk ); - if( p_bk->i_buffer > 6 ) + block_ChainLastAppend( &pid->es->pp_last, p_bk ); + if( p_bk->i_buffer > 6 ) + { + pid->es->i_pes_size = GetWBE( &p_bk->p_buffer[4] ); + if( pid->es->i_pes_size > 0 ) { - pid->es->i_pes_size = GetWBE( &p_bk->p_buffer[4] ); - if( pid->es->i_pes_size > 0 ) - { - pid->es->i_pes_size += 6; - } + pid->es->i_pes_size += 6; } + } + pid->es->i_pes_gathered += p_bk->i_buffer; + if( pid->es->i_pes_size > 0 && + pid->es->i_pes_gathered >= pid->es->i_pes_size ) + { + ParsePES( p_demux, pid ); + i_ret = VLC_TRUE; + } + } + else + { + if( pid->es->p_pes == NULL ) + { + /* msg_Dbg( p_demux, "broken packet" ); */ + block_Release( p_bk ); + } + else + { + block_ChainLastAppend( &pid->es->pp_last, p_bk ); pid->es->i_pes_gathered += p_bk->i_buffer; if( pid->es->i_pes_size > 0 && pid->es->i_pes_gathered >= pid->es->i_pes_size ) @@ -1212,25 +1918,6 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) i_ret = VLC_TRUE; } } - else - { - if( pid->es->p_pes == NULL ) - { - /* msg_Dbg( p_demux, "broken packet" ); */ - block_Release( p_bk ); - } - else - { - block_ChainLastAppend( &pid->es->pp_last, p_bk ); - pid->es->i_pes_gathered += p_bk->i_buffer; - if( pid->es->i_pes_size > 0 && - pid->es->i_pes_gathered >= pid->es->i_pes_size ) - { - ParsePES( p_demux, pid ); - i_ret = VLC_TRUE; - } - } - } } return i_ret; @@ -1285,9 +1972,7 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) case 0x92: /* DVD_SPU vls (sub) */ es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', 'b' ) ); break; - case 0x93: /* LPCM vls (audio) */ - es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'l', 'p', 'c', 'b' ) ); - break; + case 0x94: /* SDDS (audio) */ es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 'b' ) ); break; @@ -1299,6 +1984,7 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) case 0x06: /* PES_PRIVATE (fixed later) */ case 0x12: /* MPEG-4 generic (sub/scene/...) (fixed later) */ + case 0xEA: /* Privately managed ES (VC-1) (fixed later */ default: es_format_Init( fmt, UNKNOWN_ES, 0 ); break; @@ -1328,6 +2014,7 @@ static int IODDescriptorLength( int *pi_data, uint8_t **pp_data ) return( i_len ); } + static int IODGetByte( int *pi_data, uint8_t **pp_data ) { if( *pi_data > 0 ) @@ -1339,12 +2026,14 @@ static int IODGetByte( int *pi_data, uint8_t **pp_data ) } 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 ); @@ -1381,14 +2070,16 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) iod_descriptor_t *p_iod; int i; int i_es_index; - uint8_t i_flags; + uint8_t i_flags, i_iod_tag, byte1, byte2, byte3; vlc_bool_t b_url; int i_iod_length; p_iod = malloc( sizeof( iod_descriptor_t ) ); memset( p_iod, 0, sizeof( iod_descriptor_t ) ); +#ifdef TS_DEBUG fprintf( stderr, "\n************ IOD ************" ); +#endif for( i = 0; i < 255; i++ ) { p_iod->es_descr[i].b_ok = 0; @@ -1400,19 +2091,38 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) return p_iod; } - p_iod->i_iod_label = IODGetByte( &i_data, &p_data ); + byte1 = IODGetByte( &i_data, &p_data ); + byte2 = IODGetByte( &i_data, &p_data ); + byte3 = IODGetByte( &i_data, &p_data ); + if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor + { + p_iod->i_iod_label_scope = 0x11; + p_iod->i_iod_label = byte1; + i_iod_tag = byte2; + } + else //correct implementation of the IOD_descriptor + { + p_iod->i_iod_label_scope = byte1; + p_iod->i_iod_label = byte2; + i_iod_tag = byte3; + } +#ifdef TS_DEBUG fprintf( stderr, "\n* iod_label:%d", p_iod->i_iod_label ); fprintf( stderr, "\n* ===========" ); - fprintf( stderr, "\n* tag:0x%x", p_data[0] ); - - if( IODGetByte( &i_data, &p_data ) != 0x02 ) + fprintf( stderr, "\n* tag:0x%x", i_iod_tag ); +#endif + if( i_iod_tag != 0x02 ) { - fprintf( stderr, "\n ERR: tag != 0x02" ); +#ifdef TS_DEBUG + fprintf( stderr, "\n ERR: tag %02x != 0x02", i_iod_tag ); +#endif return p_iod; } i_iod_length = IODDescriptorLength( &i_data, &p_data ); +#ifdef TS_DEBUG fprintf( stderr, "\n* length:%d", i_iod_length ); +#endif if( i_iod_length > i_data ) { i_iod_length = i_data; @@ -1422,16 +2132,18 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) i_flags = IODGetByte( &i_data, &p_data ); p_iod->i_od_id |= i_flags >> 6; b_url = ( i_flags >> 5 )&0x01; - +#ifdef TS_DEBUG fprintf( stderr, "\n* od_id:%d", p_iod->i_od_id ); fprintf( stderr, "\n* url flag:%d", b_url ); fprintf( stderr, "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 ); - +#endif if( b_url ) { p_iod->psz_url = IODGetURL( &i_data, &p_data ); +#ifdef TS_DEBUG fprintf( stderr, "\n* url string:%s", p_iod->psz_url ); fprintf( stderr, "\n*****************************\n" ); +#endif return p_iod; } else @@ -1444,13 +2156,13 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) p_iod->i_audioProfileLevelIndication = IODGetByte( &i_data, &p_data ); p_iod->i_visualProfileLevelIndication = IODGetByte( &i_data, &p_data ); p_iod->i_graphicsProfileLevelIndication = IODGetByte( &i_data, &p_data ); - +#ifdef TS_DEBUG fprintf( stderr, "\n* ODProfileLevelIndication:%d", p_iod->i_ODProfileLevelIndication ); fprintf( stderr, "\n* sceneProfileLevelIndication:%d", p_iod->i_sceneProfileLevelIndication ); fprintf( stderr, "\n* audioProfileLevelIndication:%d", p_iod->i_audioProfileLevelIndication ); fprintf( stderr, "\n* visualProfileLevelIndication:%d", p_iod->i_visualProfileLevelIndication ); fprintf( stderr, "\n* graphicsProfileLevelIndication:%d", p_iod->i_graphicsProfileLevelIndication ); - +#endif while( i_data > 0 && i_es_index < 255) { @@ -1472,7 +2184,9 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) { #define es_descr p_iod->es_descr[i_es_index] int i_decoderConfigDescr_length; +#ifdef TS_DEBUG fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length ); +#endif es_descr.b_ok = 1; es_descr.i_es_id = IODGetWord( &i_data, &p_data ); @@ -1481,20 +2195,25 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) b_url = ( i_flags >> 6 )&0x01; es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01; es_descr.i_streamPriority = i_flags & 0x1f; +#ifdef TS_DEBUG fprintf( stderr, "\n* * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag ); fprintf( stderr, "\n* * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag ); fprintf( stderr, "\n* * streamPriority:%d", es_descr.i_streamPriority ); - +#endif if( es_descr.b_streamDependenceFlag ) { es_descr.i_dependOn_es_id = IODGetWord( &i_data, &p_data ); +#ifdef TS_DEBUG fprintf( stderr, "\n* * dependOn_es_id:%d", es_descr.i_dependOn_es_id ); +#endif } if( b_url ) { es_descr.psz_url = IODGetURL( &i_data, &p_data ); +#ifdef TS_DEBUG fprintf( stderr, "\n* url string:%s", es_descr.psz_url ); +#endif } else { @@ -1504,18 +2223,23 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) if( es_descr.b_OCRStreamFlag ) { es_descr.i_OCR_es_id = IODGetWord( &i_data, &p_data ); +#ifdef TS_DEBUG fprintf( stderr, "\n* * OCR_es_id:%d", es_descr.i_OCR_es_id ); +#endif } if( IODGetByte( &i_data, &p_data ) != 0x04 ) { +#ifdef TS_DEBUG fprintf( stderr, "\n* ERR missing DecoderConfigDescr" ); +#endif es_descr.b_ok = 0; break; } i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data ); - +#ifdef TS_DEBUG fprintf( stderr, "\n* - DecoderConfigDesc length:%d", i_decoderConfigDescr_length ); +#endif #define dec_descr es_descr.dec_descr dec_descr.i_objectTypeIndication = IODGetByte( &i_data, &p_data ); i_flags = IODGetByte( &i_data, &p_data ); @@ -1524,12 +2248,14 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) dec_descr.i_bufferSizeDB = IODGet3Bytes( &i_data, &p_data ); dec_descr.i_maxBitrate = IODGetDWord( &i_data, &p_data ); dec_descr.i_avgBitrate = IODGetDWord( &i_data, &p_data ); +#ifdef TS_DEBUG fprintf( stderr, "\n* * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication ); fprintf( stderr, "\n* * streamType:0x%x", dec_descr.i_streamType ); fprintf( stderr, "\n* * upStream:%d", dec_descr.b_upStream ); fprintf( stderr, "\n* * bufferSizeDB:%d", dec_descr.i_bufferSizeDB ); fprintf( stderr, "\n* * maxBitrate:%d", dec_descr.i_maxBitrate ); fprintf( stderr, "\n* * avgBitrate:%d", dec_descr.i_avgBitrate ); +#endif if( i_decoderConfigDescr_length > 13 && IODGetByte( &i_data, &p_data ) == 0x05 ) { int i; @@ -1559,15 +2285,20 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) if( IODGetByte( &i_data, &p_data ) != 0x06 ) { +#ifdef TS_DEBUG fprintf( stderr, "\n* ERR missing SLConfigDescr" ); +#endif es_descr.b_ok = 0; break; } i_SLConfigDescr_length = IODDescriptorLength( &i_data, &p_data ); - +#ifdef TS_DEBUG fprintf( stderr, "\n* - SLConfigDescr length:%d", i_SLConfigDescr_length ); +#endif i_predefined = IODGetByte( &i_data, &p_data ); +#ifdef TS_DEBUG fprintf( stderr, "\n* * i_predefined:0x%x", i_predefined ); +#endif switch( i_predefined ) { case 0x01: @@ -1603,7 +2334,9 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) } break; default: +#ifdef TS_DEBUG fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" ); +#endif es_descr.b_ok = 0; break; } @@ -1612,7 +2345,9 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) #undef sl_descr #undef es_descr default: +#ifdef TS_DEBUG fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length ); +#endif break; } @@ -1620,9 +2355,9 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) i_data = i_data_sav - i_length; i_es_index++; } - - +#ifdef TS_DEBUG fprintf( stderr, "\n*****************************\n" ); +#endif return p_iod; } @@ -1669,6 +2404,469 @@ static void IODFree( iod_descriptor_t *p_iod ) ** libdvbpsi callbacks **************************************************************************** ****************************************************************************/ +static vlc_bool_t DVBProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + if ( !p_sys->b_dvb_control ) return VLC_FALSE; + if ( (p_sys->i_dvb_program == -1 && p_sys->p_programs_list == NULL) + || p_sys->i_dvb_program == 0 ) + return VLC_TRUE; + if ( p_sys->i_dvb_program == i_pgrm ) return VLC_TRUE; + + if ( p_sys->p_programs_list != NULL ) + { + int i; + for ( i = 0; i < p_sys->p_programs_list->i_count; i++ ) + { + if ( i_pgrm == p_sys->p_programs_list->p_values[i].i_int ) + return VLC_TRUE; + } + } + return VLC_FALSE; +} + +#ifdef TS_USE_DVB_SI +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 ); + + 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->i_service_id, p_srv->b_eit_schedule, + p_srv->b_eit_present, p_srv->i_running_status, + p_srv->b_free_ca ); + + if( p_sys->i_dvb_program != -1 && p_sys->i_dvb_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 ) + { + if( p_dr->i_tag == 0x48 ) + { + static const char *ppsz_type[17] = { + "Reserved", + "Digital television service", + "Digital radio sound service", + "Teletext service", + "NVOD reference service", + "NVOD time-shifted service", + "Mosaic service", + "PAL coded signal", + "SECAM coded signal", + "D/D2-MAC", + "FM Radio", + "NTSC coded signal", + "Data broadcast service", + "Reserved for Common Interface Usage", + "RCS Map (see EN 301 790 [35])", + "RCS FLS (see EN 301 790 [35])", + "DVB MHP service" + }; + dvbpsi_service_dr_t *pD = dvbpsi_DecodeServiceDr( p_dr ); + char str1[257]; + char str2[257]; + + 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'; + + msg_Dbg( p_demux, " - type=%d provider=%s name=%s", + pD->i_service_type, str1, str2 ); + + vlc_meta_SetTitle( p_meta, 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]; + } + } + + if( p_srv->i_running_status >= 0x01 && p_srv->i_running_status <= 0x04 ) + { + static const char *ppsz_status[5] = { + "Unknown", + "Not running", + "Starts in a few seconds", + "Pausing", + "Running" + }; + psz_status = ppsz_status[p_srv->i_running_status]; + } + + if( psz_type ) + vlc_meta_AddExtra( p_meta, "Type", psz_type ); + if( psz_status ) + vlc_meta_AddExtra( p_meta, "Status", psz_status ); + + es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META, + p_srv->i_service_id, p_meta ); + vlc_meta_Delete( p_meta ); + } + + sdt->psi->i_sdt_version = p_sdt->i_version; + dvbpsi_DeleteSDT( p_sdt ); +} + +/* i_year: year - 1900 i_month: 0-11 i_mday: 1-31 i_hour: 0-23 i_minute: 0-59 i_second: 0-59 */ +static int64_t vlc_timegm( int i_year, int i_month, int i_mday, int i_hour, int i_minute, int i_second ) +{ + static const int pn_day[12+1] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }; + int64_t i_day; + int i; + + if( i_year < 70 || + i_month < 0 || i_month > 11 || i_mday < 1 || i_mday > 31 || + i_hour < 0 || i_hour > 23 || i_minute < 0 || i_minute > 59 || i_second < 0 || i_second > 59 ) + return -1; + + /* Count the number of days */ + i_day = 365 * (i_year-70) + pn_day[i_month] + i_mday - 1; +#define LEAP(y) ( ((y)%4) == 0 && (((y)%100) != 0 || ((y)%400) == 0) ? 1 : 0) + for( i = 70; i < i_year; i++ ) + i_day += LEAP(1900+i); + if( i_month > 1 ) + i_day += LEAP(1900+i_year); +#undef LEAP + /**/ + return ((24*i_day + i_hour)*60 + i_minute)*60 + i_second; +} + +static void EITDecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d ) +{ + const int yp = (int)( ( (double)i_mjd - 15078.2)/365.25 ); + const int mp = (int)( ((double)i_mjd - 14956.1 - (int)(yp * 365.25)) / 30.6001 ); + const int c = ( mp == 14 || mp == 15 ) ? 1 : 0; + + *p_y = 1900 + yp + c*1; + *p_m = mp - 1 + c*12; + *p_d = i_mjd - 14956 - (int)(yp*365.25) - (int)(mp*30.6001); +} +#define CVT_FROM_BCD(v) ((((v) >> 4)&0xf)*10 + ((v)&0xf)) +static int64_t EITConvertStartTime( uint64_t i_date ) +{ + const int i_mjd = i_date >> 24; + const int i_hour = CVT_FROM_BCD(i_date >> 16); + const int i_minute = CVT_FROM_BCD(i_date >> 8); + const int i_second = CVT_FROM_BCD(i_date ); + int i_year; + int i_month; + int i_day; + + /* if all 40 bits are 1, the start is unknown */ + if( i_date == UINT64_C(0xffffffffff) ) + return -1; + + EITDecodeMjd( i_mjd, &i_year, &i_month, &i_day ); + return vlc_timegm( i_year - 1900, i_month - 1, i_day, i_hour, i_minute, i_second ); +} +static int EITConvertDuration( uint32_t i_duration ) +{ + return CVT_FROM_BCD(i_duration >> 16) * 3600 + + CVT_FROM_BCD(i_duration >> 8 ) * 60 + + CVT_FROM_BCD(i_duration ); +} +#undef CVT_FROM_BCD + +static inline char *FixUTF8( char *p ) +{ + EnsureUTF8( p ); + return p; +} +/* FIXME same than dvbsi_to_utf8 from dvb access */ +static char *EITConvertToUTF8( unsigned char *psz_instring, size_t i_length ) +{ + const char *psz_encoding; + const unsigned char *psz_stringstart, *psz_outstring; + char *psz_tmp; + char psz_encbuf[12]; + size_t i_in, i_out; + vlc_iconv_t iconv_handle; + if( i_length < 1 ) return NULL; + if( psz_instring[0] >= 0x20 ) + { + psz_stringstart = psz_instring; + psz_encoding = "ISO_8859-1"; /* should be ISO6937 according to spec, but this seems to be the one used */ + } + else switch( psz_instring[0] ) + { + case 0x01: + psz_stringstart = &psz_instring[1]; + psz_encoding = "ISO_8859-5"; + break; + case 0x02: + psz_stringstart = &psz_instring[1]; + psz_encoding = "ISO_8859-6"; + break; + case 0x03: + psz_stringstart = &psz_instring[1]; + psz_encoding = "ISO_8859-7"; + break; + case 0x04: + psz_stringstart = &psz_instring[1]; + psz_encoding = "ISO_8859-8"; + break; + case 0x05: + psz_stringstart = &psz_instring[1]; + psz_encoding = "ISO_8859-9"; + break; + case 0x06: + psz_stringstart = &psz_instring[1]; + psz_encoding = "ISO_8859-10"; + break; + case 0x07: + psz_stringstart = &psz_instring[1]; + psz_encoding = "ISO_8859-11"; + break; + case 0x08: + psz_stringstart = &psz_instring[1]; /*possibly reserved?*/ + psz_encoding = "ISO_8859-12"; + break; + case 0x09: + psz_stringstart = &psz_instring[1]; + psz_encoding = "ISO_8859-13"; + break; + case 0x0a: + psz_stringstart = &psz_instring[1]; + psz_encoding = "ISO_8859-14"; + break; + case 0x0b: + psz_stringstart = &psz_instring[1]; + psz_encoding = "ISO_8859-15"; + break; + case 0x10: + if( i_length < 3 || psz_instring[1] != '\0' || psz_instring[2] > 0x0f + || psz_instring[2] == 0 ) + return FixUTF8(strndup(psz_instring,i_length)); + sprintf( psz_encbuf, "ISO_8859-%d", psz_instring[2] ); + psz_stringstart = &psz_instring[3]; + psz_encoding = psz_encbuf; + break; + case 0x11: + psz_stringstart = &psz_instring[1]; + psz_encoding = "UTF-16"; + break; + case 0x12: + psz_stringstart = &psz_instring[1]; + psz_encoding = "KSC5601-1987"; + break; + case 0x13: + psz_stringstart = &psz_instring[1]; + psz_encoding = "GB2312";/*GB-2312-1980 */ + break; + case 0x14: + psz_stringstart = &psz_instring[1]; + psz_encoding = "BIG-5"; + break; + case 0x15: + return FixUTF8(strndup(&psz_instring[1],i_length-1)); + break; + default: + /* invalid */ + return FixUTF8(strndup(psz_instring,i_length)); + } + iconv_handle = vlc_iconv_open( "UTF-8", psz_encoding ); + i_in = i_length - (psz_stringstart - psz_instring ); + i_out = i_in * 6; + psz_outstring = psz_tmp = (char*)malloc( i_out * sizeof(char) + 1 ); + vlc_iconv( iconv_handle, &psz_stringstart, &i_in, &psz_tmp, &i_out ); + vlc_iconv_close( iconv_handle ); + *psz_tmp = '\0'; + return psz_outstring; +} + +static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) +{ + 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_dvb_program != -1 && p_sys->i_dvb_program != p_eit->i_service_id ) ) + { + dvbpsi_DeleteEIT( p_eit ); + return; + } + + msg_Dbg( p_demux, "new EIT service_id=%d version=%d current_next=%d " + "ts_id=%d network_id=%d segment_last_section_number=%d " + "last_table_id=%d", + p_eit->i_service_id, p_eit->i_version, p_eit->b_current_next, + p_eit->i_ts_id, p_eit->i_network_id, + p_eit->i_segment_last_section_number, p_eit->i_last_table_id ); + + p_epg = vlc_epg_New( NULL ); + for( p_evt = p_eit->p_first_event; p_evt; p_evt = p_evt->p_next ) + { + dvbpsi_descriptor_t *p_dr; + char *psz_name = NULL; + char *psz_text = NULL; + char *psz_extra = strdup(""); + int64_t i_start; + int i_duration; + + i_start = EITConvertStartTime( p_evt->i_start_time ); + i_duration = EITConvertDuration( p_evt->i_duration ); + + msg_Dbg( p_demux, " * event id=%d start_time:%d duration=%d " + "running=%d free_ca=%d", + p_evt->i_event_id, (int)i_start, (int)i_duration, + p_evt->i_running_status, p_evt->b_free_ca ); + + for( p_dr = p_evt->p_first_descriptor; p_dr; p_dr = p_dr->p_next ) + { + if( p_dr->i_tag == 0x4d ) + { + dvbpsi_short_event_dr_t *pE = dvbpsi_DecodeShortEventDr( p_dr ); + + if( pE ) + { + psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length); + psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length ); + msg_Dbg( p_demux, " - short event lang=%3.3s '%s' : '%s'", + pE->i_iso_639_code, psz_name, psz_text ); + } + } + else if( p_dr->i_tag == 0x4e ) + { + dvbpsi_extended_event_dr_t *pE = dvbpsi_DecodeExtendedEventDr( p_dr ); + if( pE ) + { + int i; + msg_Dbg( p_demux, " - extended event lang=%3.3s [%d/%d]", + pE->i_iso_639_code, + pE->i_descriptor_number, pE->i_last_descriptor_number ); + + if( pE->i_text_length > 0 ) + { + char *psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length ); + msg_Dbg( p_demux, " - text='%s'", psz_text ); + + psz_extra = realloc( psz_extra, strlen(psz_extra) + strlen(psz_text) + 1 ); + strcat( psz_extra, psz_text ); + free( psz_text ); + } + + for( 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] ); + + 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 ); + strcat( psz_extra, "(" ); + strcat( psz_extra, psz_dsc ); + strcat( psz_extra, " " ); + strcat( psz_extra, psz_itm ); + strcat( psz_extra, ")" ); + } + if( psz_dsc ) + free( psz_dsc ); + if( psz_itm ) + free( psz_itm ); + } + } + } + else + { + msg_Dbg( p_demux, " - tag=0x%x(%d)", p_dr->i_tag, p_dr->i_tag ); + } + } + + /* */ + if( i_start > 0 ) + vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text, psz_extra ); + + /* Update "now playing" field */ + if( p_evt->i_running_status == 0x04 && i_start > 0 ) + vlc_epg_SetCurrent( p_epg, i_start ); + + if( psz_name ) + free( psz_name ); + if( psz_text ) + free( psz_text ); + + free( psz_extra ); + } + if( p_epg->i_event > 0 ) + { + if( p_eit->i_service_id == p_sys->i_dvb_program ) + { + 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; + } + } + es_out_Control( p_demux->out, ES_OUT_SET_GROUP_EPG, p_eit->i_service_id, p_epg ); + } + vlc_epg_Delete( p_epg ); + + dvbpsi_DeleteEIT( p_eit ); +} + +static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h, + uint8_t i_table_id, uint16_t i_extension ) +{ +#if 0 + msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", + i_table_id, i_table_id, i_extension, i_extension ); +#endif + if( p_demux->p_sys->pid[0].psi->i_pat_version != -1 && i_table_id == 0x42 ) + { + msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", + i_table_id, i_table_id, i_extension, i_extension ); + + dvbpsi_AttachSDT( h, i_table_id, i_extension, + (dvbpsi_sdt_callback)SDTCallBack, p_demux ); + } + else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 && + ( i_table_id == 0x4e || /* Current/Following */ + (i_table_id >= 0x50 && i_table_id <= 0x5f) ) ) /* Schedule */ + { + 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 ); + } +} +#endif + static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) { demux_sys_t *p_sys = p_demux->p_sys; @@ -1677,7 +2875,9 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ts_pid_t *pmt = NULL; ts_prg_psi_t *prg = NULL; - int i; + + ts_pid_t **pp_clean = NULL; + int i_clean = 0, i; msg_Dbg( p_demux, "PMTCallBack called" ); @@ -1687,15 +2887,15 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) int i_prg; for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ ) { - if( p_sys->pmt[i]->psi->prg[i_prg]->i_number == p_pmt->i_program_number ) + if( p_sys->pmt[i]->psi->prg[i_prg]->i_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 ) break; } if( pmt == NULL ) @@ -1717,9 +2917,10 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) { ts_pid_t *pid = &p_sys->pid[i]; - if( pid->b_valid && pid->p_owner == pmt->psi && pid->i_owner_number == prg->i_number && pid->psi == NULL ) + if( pid->b_valid && pid->p_owner == pmt->psi && + pid->i_owner_number == prg->i_number && pid->psi == NULL ) { - PIDClean( p_demux->out, pid ); + TAB_APPEND( i_clean, pp_clean, pid ); } } if( prg->iod ) @@ -1728,21 +2929,41 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) prg->iod = NULL; } - msg_Dbg( p_demux, "new PMT program number=%d version=%d pid_pcr=0x%x", + msg_Dbg( p_demux, "new PMT program number=%d version=%d pid_pcr=%d", p_pmt->i_program_number, p_pmt->i_version, p_pmt->i_pcr_pid ); prg->i_pid_pcr = p_pmt->i_pcr_pid; prg->i_version = p_pmt->i_version; + if( DVBProgramIsSelected( p_demux, prg->i_number ) ) + { + /* Set demux filter */ + stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, prg->i_pid_pcr, + VLC_TRUE ); + } + else if ( p_sys->b_dvb_control ) + { + msg_Warn( p_demux, "skipping program (not selected)" ); + dvbpsi_DeletePMT(p_pmt); + return; + } + /* Parse descriptor */ for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next ) { if( p_dr->i_tag == 0x1d ) { /* We have found an IOD descriptor */ - msg_Warn( p_demux, " * descriptor : IOD (0x1d)" ); + msg_Dbg( p_demux, " * descriptor : IOD (0x1d)" ); prg->iod = IODNew( p_dr->i_length, p_dr->p_data ); } + else if( p_dr->i_tag == 0x9 ) + { + 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 { msg_Dbg( p_demux, " * descriptor : unknown (0x%x)", p_dr->i_tag ); @@ -1751,20 +2972,46 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) for( p_es = p_pmt->p_first_es; p_es != NULL; p_es = p_es->p_next ) { - ts_pid_t *pid = &p_sys->pid[p_es->i_pid]; + ts_pid_t tmp_pid, *old_pid = 0, *pid = &tmp_pid; - if( pid->b_valid ) + /* Find out if the PID was already declared */ + for( i = 0; i < i_clean; i++ ) { - msg_Warn( p_demux, "pmt error: pid=0x%x already defined", - p_es->i_pid ); - continue; + if( pp_clean[i] == &p_sys->pid[p_es->i_pid] ) + { + old_pid = pp_clean[i]; + break; + } + } + + if( !old_pid && p_sys->pid[p_es->i_pid].b_valid ) + { + ts_pid_t *pid = &p_sys->pid[p_es->i_pid]; + if( ( pid->i_pid == 0x11 /* SDT */ || + pid->i_pid == 0x12 /* EDT */ ) && pid->psi ) + { + /* This doesn't look like a DVB stream so don't try + * parsing the SDT/EDT */ + dvbpsi_DetachDemux( pid->psi->handle ); + free( pid->psi ); + pid->psi = 0; + } + else + { + msg_Warn( p_demux, "pmt error: pid=%d already defined", + p_es->i_pid ); + continue; + } } PIDInit( pid, VLC_FALSE, pmt->psi ); PIDFillFormat( pid, p_es->i_type ); pid->i_owner_number = prg->i_number; + pid->i_pid = p_es->i_pid; + pid->b_seen = p_sys->pid[p_es->i_pid].b_seen; - if( p_es->i_type == 0x10 || p_es->i_type == 0x11 || p_es->i_type == 0x12 ) + if( p_es->i_type == 0x10 || p_es->i_type == 0x11 || + p_es->i_type == 0x12 ) { /* MPEG-4 stream: search SL_DESCRIPTOR */ dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;; @@ -1773,7 +3020,6 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) if( p_dr && p_dr->i_length == 2 ) { - int i; int i_es_id = ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1]; msg_Warn( p_demux, "found SL_descriptor es_id=%d", i_es_id ); @@ -1811,6 +3057,9 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) case 0x20: /* mpeg4 */ pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','v'); break; + case 0x21: /* h264 */ + pid->es->fmt.i_codec = VLC_FOURCC('h','2','6','4'); + break; case 0x60: case 0x61: case 0x62: @@ -1879,65 +3128,339 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) for( p_dr = p_es->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next ) { - msg_Dbg( p_demux, " * es pid=0x%x type=0x%x dr->i_tag=0x%x", + msg_Dbg( p_demux, " * es pid=%d type=%d dr->i_tag=0x%x", p_es->i_pid, p_es->i_type, p_dr->i_tag ); - if( p_dr->i_tag == 0x6a ) + if( p_dr->i_tag == 0x05 ) + { + /* Registration Descriptor */ + if( p_dr->i_length != 4 ) + { + msg_Warn( p_demux, "invalid Registration Descriptor" ); + } + else + { + if( !memcmp( p_dr->p_data, "AC-3", 4 ) ) + { + /* ATSC with stream_type 0x81 (but this descriptor + * is then not mandatory */ + pid->es->fmt.i_cat = AUDIO_ES; + pid->es->fmt.i_codec = VLC_FOURCC('a','5','2',' '); + } + else if( !memcmp( p_dr->p_data, "DTS1", 4 ) || + !memcmp( p_dr->p_data, "DTS2", 4 ) || + !memcmp( p_dr->p_data, "DTS3", 4 ) ) + { + /*registration descriptor(ETSI TS 101 154 Annex F)*/ + pid->es->fmt.i_cat = AUDIO_ES; + pid->es->fmt.i_codec = VLC_FOURCC('d','t','s',' '); + } + else if( !memcmp( p_dr->p_data, "BSSD", 4 ) ) + { + pid->es->fmt.i_cat = AUDIO_ES; + pid->es->fmt.i_codec = VLC_FOURCC('l','p','c','m'); + } + else + { + msg_Warn( p_demux, + "unknown Registration Descriptor (%4.4s)", + p_dr->p_data ); + } + } + + } + else if( p_dr->i_tag == 0x6a ) { + /* DVB with stream_type 0x06 */ pid->es->fmt.i_cat = AUDIO_ES; pid->es->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); } -#ifdef _DVBPSI_DR_59_H_ - else if( p_dr->i_tag == 0x59 ) + 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" ); + pid->es->fmt.i_cat = AUDIO_ES; + pid->es->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' ); + } + else if( p_dr->i_tag == 0x45 ) { - uint16_t n; - dvbpsi_subtitling_dr_t *sub; + 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_stream_identifier_dr_t *si; + si = dvbpsi_DecodeStreamIdentifierDr( p_dr ); + msg_Dbg( p_demux, " * Stream Component Identifier: %d", si->i_component_tag ); + } +#endif + else if( p_dr->i_tag == 0x56 ) + { + msg_Dbg( p_demux, " * EBU Teletext descriptor" ); + pid->es->fmt.i_cat = SPU_ES; + pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' ); + pid->es->fmt.i_extra = p_dr->i_length; + pid->es->fmt.p_extra = malloc( p_dr->i_length ); + memcpy( pid->es->fmt.p_extra, p_dr->p_data, + p_dr->i_length ); + +#if defined _DVBPSI_DR_56_H_ && defined DVBPSI_VERSION \ + && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5) + pid->es->fmt.i_group = p_pmt->i_program_number; + + /* In stream output mode, only enable descriptor + * pass-through. */ + if( !p_demux->out->b_sout ) + { + uint16_t n, i = 0; + dvbpsi_teletext_dr_t *sub; + + sub = dvbpsi_DecodeTeletextDr( p_dr ); + if( !sub ) continue; + + /* 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 == 0x2 + || p_page->i_teletext_type == 0x5 ) + { + ts_es_t *p_es; + + if( i == 0 ) + { + p_es = pid->es; + } + else + { + p_es = malloc( sizeof( ts_es_t ) ); + + 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 ); + } + + p_es->fmt.psz_language = malloc( 4 ); + memcpy( p_es->fmt.psz_language, + p_page->i_iso6392_language_code, 3 ); + p_es->fmt.psz_language[3] = 0; + + switch( p_page->i_teletext_type ) + { + case 0x2: + p_es->fmt.psz_description = + strdup(_("Teletext subtitles")); + msg_Dbg( p_demux, + " * sub lan=%s page=%d%x", + p_es->fmt.psz_language, + p_page->i_teletext_magazine_number, + p_page->i_teletext_page_number ); + break; + + case 0x5: + p_es->fmt.psz_description = + strdup(_("Teletext hearing impaired subtitles")); + msg_Dbg( p_demux, + " * hearing impaired lan=%s page=%d%x", + p_es->fmt.psz_language, + p_page->i_teletext_magazine_number, + p_page->i_teletext_page_number ); + break; + default: + break; + } + + p_es->fmt.subs.dvb.i_id = + p_page->i_teletext_page_number; + /* Hack, FIXME */ + p_es->fmt.subs.dvb.i_id |= + ((int)p_page->i_teletext_magazine_number << 16); + + i++; + } + } + + if( !i ) + pid->es->fmt.i_cat = UNKNOWN_ES; + } + else +#endif /* defined _DVBPSI_DR_56_H_ && DVBPSI_VERSION(0,1,6) */ + { + pid->es->fmt.subs.dvb.i_id = -1; + pid->es->fmt.psz_description = strdup( "Teletext" ); + } + } + else if( p_dr->i_tag == 0x59 ) + { /* DVB subtitles */ pid->es->fmt.i_cat = SPU_ES; pid->es->fmt.i_codec = VLC_FOURCC( 'd', 'v', 'b', 's' ); - pid->es->fmt.i_group = p_pmt->i_program_number; + pid->es->fmt.i_extra = p_dr->i_length; + pid->es->fmt.p_extra = malloc( p_dr->i_length ); + memcpy( pid->es->fmt.p_extra, p_dr->p_data, + p_dr->i_length ); - sub = dvbpsi_DecodeSubtitlingDr( p_dr ); - if( !sub ) continue; +#ifdef _DVBPSI_DR_59_H_ + pid->es->fmt.i_group = p_pmt->i_program_number; - /* Each subtitle ES contains n languages, - * We are going to create n ES for the n tracks */ - if( sub->i_subtitles_number > 0 ) + /* In stream output mode, only enable descriptor + * pass-through. */ + if( !p_demux->out->b_sout ) { - pid->es->fmt.psz_language = malloc( 4 ); - memcpy( pid->es->fmt.psz_language, - sub->p_subtitle[0].i_iso6392_language_code, 3); - pid->es->fmt.psz_language[3] = 0; + uint16_t n, i = 0; + dvbpsi_subtitling_dr_t *sub; + + sub = dvbpsi_DecodeSubtitlingDr( p_dr ); + if( !sub ) continue; + + for( n = 0; n < sub->i_subtitles_number; n++ ) + { + dvbpsi_subtitle_t *p_sub = &sub->p_subtitle[n]; + ts_es_t *p_es; + + if( i == 0 ) + { + p_es = pid->es; + } + else + { + p_es = malloc( sizeof( ts_es_t ) ); + + 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 ); + } + + p_es->fmt.psz_language = malloc( 4 ); + memcpy( p_es->fmt.psz_language, + p_sub->i_iso6392_language_code, 3 ); + p_es->fmt.psz_language[3] = 0; + + switch( p_sub->i_subtitling_type ) + { + case 0x10: + p_es->fmt.psz_description = + strdup(_("subtitles")); + break; + case 0x11: + p_es->fmt.psz_description = + strdup(_("4:3 subtitles")); + break; + case 0x12: + p_es->fmt.psz_description = + strdup(_("16:9 subtitles")); + break; + case 0x13: + p_es->fmt.psz_description = + strdup(_("2.21:1 subtitles")); + break; + case 0x20: + p_es->fmt.psz_description = + strdup(_("hearing impaired")); + break; + case 0x21: + p_es->fmt.psz_description = + strdup(_("4:3 hearing impaired")); + break; + case 0x22: + p_es->fmt.psz_description = + strdup(_("16:9 hearing impaired")); + break; + case 0x23: + p_es->fmt.psz_description = + strdup(_("2.21:1 hearing impaired")); + break; + default: + break; + } - pid->es->fmt.subs.dvb.i_id = - sub->p_subtitle[0].i_composition_page_id; + 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); + + i++; + } + + if( !i ) + pid->es->fmt.i_cat = UNKNOWN_ES; + } + else +#endif /* _DVBPSI_DR_59_H_ */ + { + pid->es->fmt.subs.dvb.i_id = -1; + pid->es->fmt.psz_description = strdup( "DVB subtitles" ); } - else pid->es->fmt.i_cat = UNKNOWN_ES; + } + } + } + else if( p_es->i_type == 0xEA ) + { + dvbpsi_descriptor_t *p_dr; + + for( p_dr = p_es->p_first_descriptor; p_dr != NULL; + p_dr = p_dr->p_next ) + { + msg_Dbg( p_demux, " * es pid=%d type=%d dr->i_tag=0x%x", + p_es->i_pid, p_es->i_type, p_dr->i_tag ); - for( n = 1; n < sub->i_subtitles_number; n++ ) + if( p_dr->i_tag == 0x05 ) + { + /* Registration Descriptor */ + if( p_dr->i_length < 4 ) // XXX VC-1 has extended this descriptor with sub-descriptor { - ts_es_t *p_es = malloc( sizeof( ts_es_t ) ); - p_es->fmt = pid->es->fmt; - 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->fmt.psz_language = malloc( 4 ); - memcpy( p_es->fmt.psz_language, - sub->p_subtitle[n].i_iso6392_language_code, 3); - p_es->fmt.psz_language[3] = 0; - - p_es->fmt.subs.dvb.i_id = - sub->p_subtitle[n].i_composition_page_id; - - TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es ); + msg_Warn( p_demux, "invalid Registration Descriptor" ); + } + else + { + if( !memcmp( p_dr->p_data, "VC-1", 4 ) ) + { + /* registration descriptor for VC-1 (SMPTE rp227) */ + pid->es->fmt.i_cat = VIDEO_ES; + pid->es->fmt.i_codec = VLC_FOURCC('W','V','C','1'); + + /* 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. */ + } + else + { + msg_Warn( p_demux, + "unknown Registration Descriptor (%4.4s)", + p_dr->p_data ); + } } } -#endif /* _DVBPSI_DR_59_H_ */ } } else if( p_es->i_type == 0xa0 ) @@ -1980,7 +3503,8 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) 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('d','v','b','s') && + pid->es->fmt.i_codec != VLC_FOURCC('t','e','l','x') ) ) { /* get language descriptor */ dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor; @@ -1992,10 +3516,77 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) if( p_decoded ) { +#if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2) + pid->es->fmt.psz_language = malloc( 4 ); + 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: + 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 = + malloc( sizeof(*pid->es->fmt.p_extra_languages) * + pid->es->fmt.i_extra_languages ); + for( 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); + 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; + } + + } +#else pid->es->fmt.psz_language = malloc( 4 ); memcpy( pid->es->fmt.psz_language, p_decoded->i_iso_639_code, 3 ); pid->es->fmt.psz_language[3] = 0; +#endif } } } @@ -2003,31 +3594,108 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) pid->es->fmt.i_group = p_pmt->i_program_number; if( pid->es->fmt.i_cat == UNKNOWN_ES ) { - msg_Dbg( p_demux, " * es pid=0x%x type=0x%x *unknown*", + msg_Dbg( p_demux, " * es pid=%d type=%d *unknown*", p_es->i_pid, p_es->i_type ); } else if( !p_sys->b_udp_out ) { - int i; - - msg_Dbg( p_demux, " * es pid=0x%x type=0x%x fcc=%4.4s", + msg_Dbg( p_demux, " * es pid=%d type=%d fcc=%4.4s", p_es->i_pid, p_es->i_type, (char*)&pid->es->fmt.i_codec ); - if( p_sys->b_es_id_pid ) + if( p_sys->b_es_id_pid ) pid->es->fmt.i_id = p_es->i_pid; + + /* Check if we can avoid restarting the ES */ + if( old_pid && + pid->es->fmt.i_codec == old_pid->es->fmt.i_codec && + pid->es->fmt.i_extra == old_pid->es->fmt.i_extra && + pid->es->fmt.i_extra == 0 && + pid->i_extra_es == old_pid->i_extra_es && + ( ( !pid->es->fmt.psz_language && + !old_pid->es->fmt.psz_language ) || + ( pid->es->fmt.psz_language && + old_pid->es->fmt.psz_language && + !strcmp( pid->es->fmt.psz_language, + old_pid->es->fmt.psz_language ) ) ) ) { - pid->es->fmt.i_id = p_es->i_pid; + pid->es->id = old_pid->es->id; + old_pid->es->id = NULL; + for( i = 0; i < pid->i_extra_es; i++ ) + { + pid->extra_es[i]->id = old_pid->extra_es[i]->id; + old_pid->extra_es[i]->id = NULL; + } } + else + { + if( old_pid ) + { + PIDClean( p_demux->out, old_pid ); + TAB_REMOVE( i_clean, pp_clean, old_pid ); + old_pid = 0; + } - pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt ); + pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt ); + for( i = 0; i < pid->i_extra_es; i++ ) + { + pid->extra_es[i]->id = + es_out_Add( p_demux->out, &pid->extra_es[i]->fmt ); + } + } + } - for( i = 0; i < pid->i_extra_es; i++ ) + /* Add ES to the list */ + if( old_pid ) + { + PIDClean( p_demux->out, old_pid ); + TAB_REMOVE( i_clean, pp_clean, old_pid ); + } + p_sys->pid[p_es->i_pid] = *pid; + + for( p_dr = p_es->p_first_descriptor; p_dr != NULL; + p_dr = p_dr->p_next ) + { + if( p_dr->i_tag == 0x9 ) { - pid->extra_es[i]->id = - es_out_Add( p_demux->out, &pid->extra_es[i]->fmt); + uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8) + | p_dr->p_data[1]; + msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", + i_sysid ); } } + + if( DVBProgramIsSelected( p_demux, prg->i_number ) + && (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, + VLC_TRUE ); + } + } + + if( DVBProgramIsSelected( p_demux, prg->i_number ) ) + { + /* Set CAM descrambling */ + stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_CA, p_pmt ); + } + else + { + dvbpsi_DeletePMT( p_pmt ); + } + + for ( i = 0; i < i_clean; i++ ) + { + if( DVBProgramIsSelected( p_demux, prg->i_number ) ) + { + stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, pp_clean[i]->i_pid, + VLC_FALSE ); + } + + PIDClean( p_demux->out, pp_clean[i] ); } - dvbpsi_DeletePMT(p_pmt); + if( i_clean ) free( pp_clean ); } static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) @@ -2040,13 +3708,14 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) msg_Dbg( p_demux, "PATCallBack called" ); if( pat->psi->i_pat_version != -1 && - ( !p_pat->b_current_next || p_pat->i_version == pat->psi->i_pat_version ) ) + ( !p_pat->b_current_next || + p_pat->i_version == pat->psi->i_pat_version ) ) { dvbpsi_DeletePAT( p_pat ); return; } - msg_Dbg( p_demux, "new PAT ts_id=0x%x version=%d current_next=%d", + msg_Dbg( p_demux, "new PAT ts_id=%d version=%d current_next=%d", p_pat->i_ts_id, p_pat->i_version, p_pat->b_current_next ); /* Clean old */ @@ -2069,16 +3738,17 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) int i_prg; for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) { - if( p_program->i_number == pmt->psi->prg[i_prg]->i_number ) + if( p_program->i_number == + pmt->psi->prg[i_prg]->i_number ) { b_keep = VLC_TRUE; break; } } - if( b_keep ) - break; + if( b_keep ) break; } } + if( !b_keep ) { TAB_APPEND( i_pmt_rm, pmt_rm, pmt ); @@ -2097,36 +3767,57 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) int i_prg; for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ ) { - if( pid->p_owner->prg[i_prg]->i_pid_pcr == pmt_rm[j]->i_pid && - pid->es->id ) + /* We only remove es that aren't defined by extra pmt */ + if( pid->p_owner->prg[i_prg]->i_pid_pmt != + pmt_rm[j]->i_pid ) continue; + + if( p_sys->b_dvb_control && pid->es->id ) { - /* We only remove es that aren't defined by extra pmt */ - PIDClean( p_demux->out, pid ); - break; + if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, i, + VLC_FALSE ) ) + p_sys->b_dvb_control = VLC_FALSE; } - } - if( !pid->b_valid ) + + PIDClean( p_demux->out, pid ); break; + } + + if( !pid->b_valid ) break; } } /* Delete PMT pid */ for( i = 0; i < i_pmt_rm; i++ ) { + int i_prg; + if( p_sys->b_dvb_control ) + { + if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, + pmt_rm[i]->i_pid, VLC_FALSE ) ) + p_sys->b_dvb_control = VLC_FALSE; + } + + for( i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ ) + { + const int i_number = pmt_rm[i]->psi->prg[i_prg]->i_number; + if( i_number != 0 ) + es_out_Control( p_demux->out, ES_OUT_DEL_GROUP, i_number ); + } + PIDClean( p_demux->out, &p_sys->pid[pmt_rm[i]->i_pid] ); TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] ); } - if( pmt_rm ) - { - free( pmt_rm ); - } + + if( pmt_rm ) free( pmt_rm ); } /* now create programs */ for( p_program = p_pat->p_first_program; p_program != NULL; p_program = p_program->p_next ) { - msg_Dbg( p_demux, " * number=%d pid=0x%x", p_program->i_number, + msg_Dbg( p_demux, " * number=%d pid=%d", p_program->i_number, p_program->i_pid ); if( p_program->i_number != 0 ) { @@ -2155,8 +3846,27 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) PIDInit( pmt, VLC_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; + (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( p_sys->b_dvb_control ) + { + if( DVBProgramIsSelected( p_demux, p_program->i_number ) ) + { + if( p_sys->i_dvb_program == 0 ) + p_sys->i_dvb_program = p_program->i_number; + + if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, + ACCESS_SET_PRIVATE_ID_STATE, + p_program->i_pid, VLC_TRUE ) ) + p_sys->b_dvb_control = VLC_FALSE; + } + } } } } @@ -2164,4 +3874,3 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) dvbpsi_DeletePAT( p_pat ); } -