X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fts.c;h=f6c6fefd1db4b287b20dd6437538029c84b39220;hb=9cc6af385502109b03f69c282e935cbde4081756;hp=720034ab0ca1b4c377bfcddfeaa8316470f5b9be;hpb=46576f85796c8fd8a06df1d39102fed7b6f9a82c;p=vlc diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 720034ab0c..f6c6fefd1d 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -1,25 +1,25 @@ /***************************************************************************** * ts.c: Transport Stream input module for VLC. ***************************************************************************** - * Copyright (C) 2004-2005 the VideoLAN team + * Copyright (C) 2004-2005 VLC authors and VideoLAN * $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 - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -35,62 +35,46 @@ #include -#include /* DVB-specific things */ +#include /* DVB-specific things */ #include #include #include +#include /* FromCharset, for EIT */ -#include -#include -#include -#include +#include /* net_ for ts-out mode */ #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 +# include +# include +# include +# include +# include +# include +# include +# include /* 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 +# include /* TDT support */ -#ifdef _DVBPSI_DR_58_H_ -# define TS_USE_TDT 1 -# ifdef HAVE_DVBPSI_DR_H -# include -# else -# include "tables/tot.h" -# endif -#else -# include -#endif +# include + +#include "../mux/mpeg/dvbpsi_compat.h" #undef TS_DEBUG +VLC_FORMAT(1, 2) static void ts_debug(const char *format, ...) +{ +#ifdef TS_DEBUG + va_list ap; + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); +#else + (void)format; +#endif +} /***************************************************************************** * Module descriptor @@ -124,63 +108,59 @@ static void Close ( vlc_object_t * ); #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 CSA_TEXT N_("CSA Key") +#define CSA_LONGTEXT N_("CSA encryption key. This must be a " \ + "16 char string (8 hexadecimal bytes).") #define CSA2_TEXT N_("Second CSA Key") #define CSA2_LONGTEXT N_("The even CSA encryption key. This must be a " \ "16 char string (8 hexadecimal bytes).") -#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." ) - #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." ) +#define SEEK_PERCENT_TEXT N_("Seek based on percent not time") +#define SEEK_PERCENT_LONGTEXT N_( \ + "Seek and position based on a percent byte position, not a PCR generated " \ + "time position. If seeking doesn't work property, turn on this option." ) + +#define PCR_TEXT N_("Trust in-stream PCR") +#define PCR_LONGTEXT N_("Use the stream PCR as a reference.") + vlc_module_begin () set_description( N_("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, true ) - add_bool( "ts-es-id-pid", true, NULL, PID_TEXT, PID_LONGTEXT, true ) - add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true ) - add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT, + add_string( "ts-extra-pmt", NULL, PMT_TEXT, PMT_LONGTEXT, true ) + add_bool( "ts-trust-pcr", true, PCR_TEXT, PCR_LONGTEXT, true ) + change_safe() + add_bool( "ts-es-id-pid", true, PID_TEXT, PID_LONGTEXT, true ) + change_safe() + add_string( "ts-out", NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true ) + add_integer( "ts-out-mtu", 1400, MTUOUT_TEXT, MTUOUT_LONGTEXT, true ) - add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ) - add_string( "ts-csa2-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true ) - add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true ) - add_bool( "ts-silent", false, NULL, SILENT_TEXT, SILENT_LONGTEXT, true ) - add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, false ) - add_bool( "ts-dump-append", false, NULL, APPEND_TEXT, APPEND_LONGTEXT, false ) - add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT, - DUMPSIZE_LONGTEXT, true ) - add_bool( "ts-split-es", true, NULL, SPLIT_ES_TEXT, SPLIT_ES_LONGTEXT, false ) + add_string( "ts-csa-ck", NULL, CSA_TEXT, CSA_LONGTEXT, true ) + change_safe() + add_string( "ts-csa2-ck", NULL, CSA2_TEXT, CSA2_LONGTEXT, true ) + change_safe() + add_integer( "ts-csa-pkt", 188, CPKT_TEXT, CPKT_LONGTEXT, true ) + change_safe() + + add_bool( "ts-split-es", true, SPLIT_ES_TEXT, SPLIT_ES_LONGTEXT, false ) + add_bool( "ts-seek-percent", false, SEEK_PERCENT_TEXT, SEEK_PERCENT_LONGTEXT, true ) + + add_obsolete_bool( "ts-silent" ); set_capability( "demux", 10 ) set_callbacks( Open, Close ) @@ -203,78 +183,28 @@ typedef struct { uint8_t i_objectTypeIndication; uint8_t i_streamType; - bool b_upStream; - uint32_t i_bufferSizeDB; - uint32_t i_maxBitrate; - uint32_t i_avgBitrate; - int i_decoder_specific_info_len; - uint8_t *p_decoder_specific_info; + int i_extra; + uint8_t *p_extra; } decoder_config_descriptor_t; -typedef struct -{ - bool b_useAccessUnitStartFlag; - bool b_useAccessUnitEndFlag; - bool b_useRandomAccessPointFlag; - bool b_useRandomAccessUnitsOnlyFlag; - bool b_usePaddingFlag; - bool b_useTimeStampsFlags; - bool b_useIdleFlag; - bool b_durationFlag; - uint32_t i_timeStampResolution; - uint32_t i_OCRResolution; - uint8_t i_timeStampLength; - uint8_t i_OCRLength; - uint8_t i_AU_Length; - uint8_t i_instantBitrateLength; - uint8_t i_degradationPriorityLength; - uint8_t i_AU_seqNumLength; - uint8_t i_packetSeqNumLength; - - uint32_t i_timeScale; - uint16_t i_accessUnitDuration; - uint16_t i_compositionUnitDuration; - - uint64_t i_startDecodingTimeStamp; - uint64_t i_startCompositionTimeStamp; - -} sl_config_descriptor_t; - typedef struct { bool b_ok; uint16_t i_es_id; - bool b_streamDependenceFlag; - bool b_OCRStreamFlag; - uint8_t i_streamPriority; - char *psz_url; - uint16_t i_dependOn_es_id; - uint16_t i_OCR_es_id; - decoder_config_descriptor_t dec_descr; - sl_config_descriptor_t sl_descr; } es_mpeg4_descriptor_t; typedef struct { - uint8_t i_iod_label, i_iod_label_scope; - /* IOD */ - uint16_t i_od_id; char *psz_url; - uint8_t i_ODProfileLevelIndication; - uint8_t i_sceneProfileLevelIndication; - uint8_t i_audioProfileLevelIndication; - uint8_t i_visualProfileLevelIndication; - uint8_t i_graphicsProfileLevelIndication; - es_mpeg4_descriptor_t es_descr[255]; } iod_descriptor_t; @@ -282,11 +212,11 @@ typedef struct typedef struct { dvbpsi_handle handle; - int i_version; int i_number; int i_pid_pcr; int i_pid_pmt; + mtime_t i_pcr_value; /* IOD stuff (mpeg4) */ iod_descriptor_t *iod; @@ -305,17 +235,23 @@ typedef struct } ts_psi_t; +typedef enum +{ + TS_ES_DATA_PES, + TS_ES_DATA_TABLE_SECTION +} ts_es_data_type_t; + typedef struct { es_format_t fmt; es_out_id_t *id; - int i_pes_size; - int i_pes_gathered; - block_t *p_pes; + ts_es_data_type_t data_type; + int i_data_size; + int i_data_gathered; + block_t *p_data; block_t **pp_last; es_mpeg4_descriptor_t *p_mpeg4desc; - int b_gather; } ts_es_t; @@ -352,6 +288,16 @@ struct demux_sys_t /* how many TS packet we read at once */ int i_ts_read; + /* to determine length and time */ + int i_pid_ref_pcr; + mtime_t i_first_pcr; + mtime_t i_current_pcr; + mtime_t i_last_pcr; + bool b_force_seek_per_percent; + int i_pcrs_num; + mtime_t *p_pcrs; + int64_t *p_pos; + /* All pid */ ts_pid_t pid[8192]; @@ -365,12 +311,12 @@ struct demux_sys_t 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 */ uint8_t *buffer; + bool b_trust_pcr; /* */ bool b_access_control; @@ -384,32 +330,29 @@ struct demux_sys_t /* */ int i_current_program; - 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 */ - bool b_file_out; /* dump mode enabled */ + vlc_list_t programs_list; /* */ bool b_start_record; }; 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( demux_t *, ts_pid_t *pid ); -static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ); +static void PIDFillFormat( ts_es_t *es, int i_stream_type ); -static void PATCallBack( demux_t *, dvbpsi_pat_t * ); -static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ); -#ifdef TS_USE_DVB_SI +static void PATCallBack( void*, dvbpsi_pat_t * ); +static void PMTCallBack( void *data, dvbpsi_pmt_t *p_pmt ); +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) +static void PSINewTableCallBack( dvbpsi_t *handle, uint8_t i_table_id, + uint16_t i_extension, demux_t * ); +#else static void PSINewTableCallBack( demux_t *, dvbpsi_handle, uint8_t i_table_id, uint16_t i_extension ); #endif + static int ChangeKeyCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static inline int PIDGet( block_t *p ) @@ -417,110 +360,49 @@ static inline int PIDGet( block_t *p ) return ( (p->p_buffer[1]&0x1f)<<8 )|p->p_buffer[2]; } -static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ); +static bool GatherData( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ); +static block_t* ReadTSPacket( demux_t *p_demux ); +static mtime_t GetPCR( block_t *p_pkt ); +static int SeekToPCR( demux_t *p_demux, int64_t i_pos ); +static int Seek( demux_t *p_demux, double f_percent ); +static void GetFirstPCR( demux_t *p_demux ); +static void GetLastPCR( demux_t *p_demux ); +static void CheckPCR( demux_t *p_demux ); 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_USER_PMT_NUMBER (0) static int UserPmt( demux_t *p_demux, const char * ); +static int SetPIDFilter( demux_t *, int i_pid, bool b_selected ); +static void SetPrgFilter( demux_t *, int i_prg, bool b_selected ); + #define TS_PACKET_SIZE_188 188 #define TS_PACKET_SIZE_192 192 #define TS_PACKET_SIZE_204 204 #define TS_PACKET_SIZE_MAX 204 #define TS_TOPFIELD_HEADER 1320 -/***************************************************************************** - * Open - *****************************************************************************/ -static int Open( vlc_object_t *p_this ) +static int DetectPacketSize( demux_t *p_demux ) { - demux_t *p_demux = (demux_t*)p_this; - demux_sys_t *p_sys; - const uint8_t *p_peek; - int i_sync, i_peek, i; - int i_packet_size; - - ts_pid_t *pat; - const char *psz_mode; - bool b_append; - bool b_topfield = false; - - if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) < - TS_PACKET_SIZE_MAX ) return VLC_EGENERIC; + if( stream_Peek( p_demux->s, + &p_peek, TS_PACKET_SIZE_MAX ) < TS_PACKET_SIZE_MAX ) + return -1; if( memcmp( p_peek, "TFrc", 4 ) == 0 ) { - b_topfield = true; - msg_Dbg( p_demux, "this is a topfield file" ); - } - - /* 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 >= TS_PACKET_SIZE_MAX && !b_topfield ) - { - if( !p_demux->b_force ) - return VLC_EGENERIC; - msg_Warn( p_demux, "this does not look like a TS stream, continuing" ); - } - - 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( p_demux->b_force ) - { - 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_name = xmalloc(25); char *psz_event_name; - char *psz_event_text = malloc(130); - char *psz_ext_text = malloc(1025); + char *psz_event_text = xmalloc(130); + char *psz_ext_text = xmalloc(1025); // 2 bytes version Uimsbf (4,5) // 2 bytes reserved (6,7) @@ -555,7 +437,7 @@ static int Open( vlc_object_t *p_this ) // 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 ); + psz_event_name = xmalloc( i_name+1 ); // 1 byte parental rating (90) // 129 bytes of event text memcpy( psz_event_name, &p_peek[91], i_name ); @@ -575,84 +457,138 @@ static int Open( vlc_object_t *p_this ) msg_Dbg( p_demux, "extended event text=%s", psz_ext_text ); // 52 bytes reserved Bslbf #endif + msg_Dbg( p_demux, "this is a topfield file" ); + return TS_PACKET_SIZE_188; } - else - { - msg_Warn( p_demux, "TS module discarded (lost sync)" ); - return VLC_EGENERIC; - } - - p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); - if( !p_sys ) - return VLC_ENOMEM; - memset( p_sys, 0, sizeof( demux_sys_t ) ); - p_sys->i_packet_size = i_packet_size; - vlc_mutex_init( &p_sys->csa_lock ); - /* Fill dump mode fields */ - p_sys->i_write = 0; - p_sys->buffer = NULL; - p_sys->p_file = NULL; - p_sys->b_file_out = false; - p_sys->psz_file = var_CreateGetString( p_demux, "ts-dump-file" ); - if( *p_sys->psz_file != '\0' ) + for( int i_sync = 0; i_sync < TS_PACKET_SIZE_MAX; i_sync++ ) { - p_sys->b_file_out = true; - - b_append = var_CreateGetBool( p_demux, "ts-dump-append" ); - if ( b_append ) - psz_mode = "ab"; - else - psz_mode = "wb"; + if( p_peek[i_sync] != 0x47 ) + continue; - if( !strcmp( p_sys->psz_file, "-" ) ) + /* Check next 3 sync bytes */ + int i_peek = TS_PACKET_SIZE_MAX * 3 + i_sync + 1; + if( ( stream_Peek( p_demux->s, &p_peek, i_peek ) ) < i_peek ) { - msg_Info( p_demux, "dumping raw stream to standard output" ); - p_sys->p_file = stdout; + msg_Err( p_demux, "cannot peek" ); + return -1; } - else if( ( p_sys->p_file = vlc_fopen( p_sys->psz_file, psz_mode ) ) == NULL ) + if( p_peek[i_sync + 1 * 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 ) { - msg_Err( p_demux, "cannot create `%s' for writing", p_sys->psz_file ); - p_sys->b_file_out = false; + return TS_PACKET_SIZE_188; } - - if( p_sys->b_file_out ) + else if( p_peek[i_sync + 1 * 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 ) { - /* Determine how many packets to read. */ - int bufsize = var_CreateGetInteger( p_demux, "ts-dump-size" ); - p_sys->i_ts_read = (int) (bufsize / 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 = xmalloc( p_sys->i_packet_size * p_sys->i_ts_read ); - msg_Info( p_demux, "%s raw stream to file `%s' reading packets %d", - b_append ? "appending" : "dumping", p_sys->psz_file, - p_sys->i_ts_read ); + return TS_PACKET_SIZE_192; + } + else if( p_peek[i_sync + 1 * 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 ) + { + return TS_PACKET_SIZE_204; } } - /* Fill p_demux field */ - if( p_sys->b_file_out ) - p_demux->pf_demux = DemuxFile; - else - p_demux->pf_demux = Demux; + if( p_demux->b_force ) + { + msg_Warn( p_demux, "this does not look like a TS stream, continuing" ); + return TS_PACKET_SIZE_188; + } + msg_Dbg( p_demux, "TS module discarded (lost sync)" ); + return -1; +} + +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) +static void vlc_dvbpsi_reset( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + ts_pid_t *pat = &p_sys->pid[0]; + ts_pid_t *sdt = &p_sys->pid[0x11]; + ts_pid_t *eit = &p_sys->pid[0x12]; + ts_pid_t *tdt = &p_sys->pid[0x14]; + + if( pat->psi->handle ) + { + if( dvbpsi_decoder_present( pat->psi->handle ) ) + dvbpsi_pat_detach( pat->psi->handle ); + dvbpsi_delete( pat->psi->handle ); + pat->psi->handle = NULL; + } + + if( sdt->psi->handle ) + { + if( dvbpsi_decoder_present( sdt->psi->handle ) ) + dvbpsi_DetachDemux( sdt->psi->handle ); + dvbpsi_delete( sdt->psi->handle ); + sdt->psi->handle = NULL; + } + + if( eit->psi->handle ) + { + if( dvbpsi_decoder_present( eit->psi->handle ) ) + dvbpsi_DetachDemux( eit->psi->handle ); + dvbpsi_delete( eit->psi->handle ); + eit->psi->handle = NULL; + } + + if( tdt->psi->handle ) + { + if( dvbpsi_decoder_present( tdt->psi->handle ) ) + dvbpsi_DetachDemux( tdt->psi->handle ); + dvbpsi_delete( tdt->psi->handle ); + tdt->psi->handle = NULL; + } +} +#endif + +/***************************************************************************** + * Open + *****************************************************************************/ +static int Open( vlc_object_t *p_this ) +{ + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; + + int i_packet_size; + + ts_pid_t *pat; + + /* Search first sync byte */ + i_packet_size = DetectPacketSize( p_demux ); + if( i_packet_size < 0 ) + return VLC_EGENERIC; + + p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; + memset( p_sys, 0, sizeof( demux_sys_t ) ); + p_sys->i_packet_size = i_packet_size; + vlc_mutex_init( &p_sys->csa_lock ); + + p_sys->buffer = NULL; + p_demux->pf_demux = Demux; p_demux->pf_control = Control; /* Init p_sys field */ 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++ ) + for( int i = 0; i < 8192; i++ ) { ts_pid_t *pid = &p_sys->pid[i]; - pid->i_pid = i; pid->b_seen = false; pid->b_valid = false; @@ -666,45 +602,91 @@ static int Open( vlc_object_t *p_this ) p_sys->csa = NULL; p_sys->b_start_record = false; +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) +# define VLC_DVBPSI_DEMUX_TABLE_INIT(table,obj) \ + do { \ + (table)->psi->handle = dvbpsi_new( &dvbpsi_messages, DVBPSI_MSG_DEBUG ); \ + if( ! (table)->psi->handle ) \ + { \ + vlc_mutex_destroy( &p_sys->csa_lock ); \ + free( p_sys ); \ + return VLC_ENOMEM; \ + } \ + (table)->psi->handle->p_sys = (void *) VLC_OBJECT(obj); \ + if( !dvbpsi_AttachDemux( (table)->psi->handle, (dvbpsi_demux_new_cb_t)PSINewTableCallBack, (obj) ) ) \ + { \ + vlc_dvbpsi_reset( obj ); \ + vlc_mutex_destroy( &p_sys->csa_lock ); \ + free( p_sys ); \ + return VLC_EGENERIC; \ + } \ + } while (0); +#endif + /* Init PAT handler */ pat = &p_sys->pid[0]; PIDInit( pat, true, NULL ); - pat->psi->handle = dvbpsi_AttachPAT( (dvbpsi_pat_callback)PATCallBack, - p_demux ); -#ifdef TS_USE_DVB_SI +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + pat->psi->handle = dvbpsi_new( &dvbpsi_messages, DVBPSI_MSG_DEBUG ); + if( !pat->psi->handle ) + { + vlc_mutex_destroy( &p_sys->csa_lock ); + free( p_sys ); + return VLC_ENOMEM; + } + pat->psi->handle->p_sys = (void *) p_demux; + if( !dvbpsi_pat_attach( pat->psi->handle, PATCallBack, p_demux ) ) + { + vlc_dvbpsi_reset( p_demux ); + vlc_mutex_destroy( &p_sys->csa_lock ); + free( p_sys ); + return VLC_EGENERIC; + } +#else + pat->psi->handle = dvbpsi_AttachPAT( PATCallBack, p_demux ); +#endif if( p_sys->b_dvb_meta ) { ts_pid_t *sdt = &p_sys->pid[0x11]; ts_pid_t *eit = &p_sys->pid[0x12]; PIDInit( sdt, true, NULL ); +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + VLC_DVBPSI_DEMUX_TABLE_INIT( sdt, p_demux ) +#else sdt->psi->handle = dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, p_demux ); +#endif PIDInit( eit, true, NULL ); +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + VLC_DVBPSI_DEMUX_TABLE_INIT( eit, p_demux ) +#else eit->psi->handle = dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, p_demux ); -#ifdef TS_USE_TDT +#endif ts_pid_t *tdt = &p_sys->pid[0x14]; PIDInit( tdt, true, NULL ); +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + VLC_DVBPSI_DEMUX_TABLE_INIT( tdt, p_demux ) +#else tdt->psi->handle = dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, p_demux ); #endif + if( p_sys->b_access_control ) { - if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x11, true ) || -#ifdef TS_USE_TDT - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x14, true ) || -#endif - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, 0x12, true ) ) + if( SetPIDFilter( p_demux, 0x11, true ) || + SetPIDFilter( p_demux, 0x14, true ) || + SetPIDFilter( p_demux, 0x12, true ) ) p_sys->b_access_control = false; } } + +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) +# undef VLC_DVBPSI_DEMUX_TABLE_INIT #endif /* Init PMT array */ @@ -714,8 +696,10 @@ static int Open( vlc_object_t *p_this ) /* Read config */ p_sys->b_es_id_pid = var_CreateGetBool( p_demux, "ts-es-id-pid" ); + p_sys->b_trust_pcr = var_CreateGetBool( p_demux, "ts-trust-pcr" ); + char* psz_string = var_CreateGetString( p_demux, "ts-out" ); - if( psz_string && *psz_string && !p_sys->b_file_out ) + if( psz_string && *psz_string ) { char *psz = strchr( psz_string, ':' ); int i_port = 0; @@ -744,7 +728,7 @@ static int Open( vlc_object_t *p_this ) { p_sys->i_ts_read = 1500 / p_sys->i_packet_size; } - p_sys->buffer = malloc( p_sys->i_packet_size * p_sys->i_ts_read ); + p_sys->buffer = xmalloc( p_sys->i_packet_size * p_sys->i_ts_read ); } } free( psz_string ); @@ -803,17 +787,36 @@ static int Open( vlc_object_t *p_this ) } 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 ) ) + p_sys->i_pid_ref_pcr = -1; + p_sys->i_first_pcr = -1; + p_sys->i_current_pcr = -1; + p_sys->i_last_pcr = -1; + p_sys->b_force_seek_per_percent = var_InheritBool( p_demux, "ts-seek-percent" ); + p_sys->i_pcrs_num = 10; + p_sys->p_pcrs = (mtime_t *)calloc( p_sys->i_pcrs_num, sizeof( mtime_t ) ); + p_sys->p_pos = (int64_t *)calloc( p_sys->i_pcrs_num, sizeof( int64_t ) ); + + bool can_seek = false; + stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &can_seek ); + if( can_seek ) + { + GetFirstPCR( p_demux ); + CheckPCR( p_demux ); + GetLastPCR( p_demux ); + } + if( p_sys->i_first_pcr < 0 || p_sys->i_last_pcr < 0 ) + { + p_sys->b_force_seek_per_percent = true; + } + + while( p_sys->i_pmt_es <= 0 && vlc_object_alive( p_demux ) ) { if( p_demux->pf_demux( p_demux ) != 1 ) break; } - return VLC_SUCCESS; } @@ -835,7 +838,14 @@ static void Close( vlc_object_t *p_this ) switch( pid->i_pid ) { case 0: /* PAT */ +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + if( dvbpsi_decoder_present( pid->psi->handle ) ) + dvbpsi_pat_detach( pid->psi->handle ); + dvbpsi_delete( pid->psi->handle ); + pid->psi->handle = NULL; +#else dvbpsi_DetachPAT( pid->psi->handle ); +#endif free( pid->psi ); break; case 1: /* CAT */ @@ -846,6 +856,10 @@ static void Close( vlc_object_t *p_this ) { /* SDT or EIT or TDT */ dvbpsi_DetachDemux( pid->psi->handle ); +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + dvbpsi_delete( pid->psi->handle ); + pid->psi->handle = NULL; +#endif free( pid->psi ); } else @@ -865,13 +879,9 @@ static void Close( vlc_object_t *p_this ) msg_Dbg( p_demux, " - pid[%d] seen", pid->i_pid ); } - if( p_sys->b_access_control && pid->i_pid > 0 ) - { - /* too much */ - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid, - false ); - } + /* too much */ + if( pid->i_pid > 0 ) + SetPIDFilter( p_demux, pid->i_pid, false ); } vlc_mutex_lock( &p_sys->csa_lock ); @@ -885,24 +895,8 @@ static void Close( vlc_object_t *p_this ) 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 ); - } - - /* If in dump mode, then close the file */ - if( p_sys->b_file_out ) - { - msg_Info( p_demux ,"closing %s (%"PRId64" KiB dumped)", - p_sys->psz_file, p_sys->i_write / 1024 ); + free( p_sys->programs_list.p_values ); - if( p_sys->p_file != stdout ) - { - fclose( p_sys->p_file ); - } - } /* When streaming, close the port */ if( p_sys->fd > -1 ) { @@ -910,7 +904,9 @@ static void Close( vlc_object_t *p_this ) } free( p_sys->buffer ); - free( p_sys->psz_file ); + + free( p_sys->p_pcrs ); + free( p_sys->p_pos ); vlc_mutex_destroy( &p_sys->csa_lock ); free( p_sys ); @@ -939,231 +935,81 @@ static int ChangeKeyCallback( vlc_object_t *p_this, char const *psz_cmd, } /***************************************************************************** - * DemuxFile: + * Demux: *****************************************************************************/ -static int DemuxFile( demux_t *p_demux ) +static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - const int i_bufsize = p_sys->i_packet_size * p_sys->i_ts_read; - uint8_t *p_buffer = p_sys->buffer; /* Put first on sync byte */ - const int 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; - } + bool b_wait_es = p_sys->i_pmt_es <= 0; - /* Test continuity counter */ - for( int i_pos = 0; i_pos < i_data; ) + /* We read at most 100 TS packet or until a frame is completed */ + for( int i_pkt = 0; i_pkt < p_sys->i_ts_read; i_pkt++ ) { - if( p_sys->buffer[i_pos] != 0x47 ) + bool b_frame = false; + block_t *p_pkt; + if( !(p_pkt = ReadTSPacket( p_demux )) ) { - msg_Warn( p_demux, "lost sync" ); - while( vlc_object_alive (p_demux) && (i_pos < i_data) ) - { - i_pos++; - if( p_sys->buffer[i_pos] == 0x47 ) - break; - } - if( vlc_object_alive (p_demux) ) - msg_Warn( p_demux, "sync found" ); + return 0; } - /* continuous when (one of this): - * diff == 1 - * diff == 0 and payload == 0 - * diff == 0 and duplicate packet (playload != 0) <- should we - * test the content ? - */ - const int i_cc = p_buffer[i_pos+3]&0x0f; - const bool b_payload = p_buffer[i_pos+3]&0x10; - const bool b_adaptation = p_buffer[i_pos+3]&0x20; - - /* Get the PID */ - ts_pid_t *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_sys->b_start_record ) { - 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 ); + /* Enable recording once synchronized */ + stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, true, "ts" ); + p_sys->b_start_record = false; } - const int i_diff = ( i_cc - p_pid->i_cc )&0x0f; - if( b_payload && i_diff == 1 ) + if( p_sys->b_udp_out ) { - p_pid->i_cc = ( p_pid->i_cc + 1 ) & 0xf; + memcpy( &p_sys->buffer[i_pkt * p_sys->i_packet_size], + p_pkt->p_buffer, p_sys->i_packet_size ); } - else + + /* Parse the TS packet */ + ts_pid_t *p_pid = &p_sys->pid[PIDGet( p_pkt )]; + + if( p_pid->b_valid ) { - if( p_pid->i_cc == 0xff ) + if( p_pid->psi ) + { + if( p_pid->i_pid == 0 || ( p_sys->b_dvb_meta && ( p_pid->i_pid == 0x11 || p_pid->i_pid == 0x12 || p_pid->i_pid == 0x14 ) ) ) + { + dvbpsi_PushPacket( p_pid->psi->handle, p_pkt->p_buffer ); + } + else + { + for( int 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 ); + } + } + block_Release( p_pkt ); + } + else if( !p_sys->b_udp_out ) { - msg_Warn( p_demux, "first packet for pid=%d cc=0x%x", - p_pid->i_pid, i_cc ); - p_pid->i_cc = i_cc; + b_frame = GatherData( p_demux, p_pid, p_pkt ); } - else if( i_diff != 0 ) + else { - /* 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; + PCRHandle( p_demux, p_pid, p_pkt ); + block_Release( p_pkt ); } } - - /* Test if user wants to decrypt it first */ - if( p_sys->csa ) + else { - vlc_mutex_lock( &p_sys->csa_lock ); - csa_Decrypt( p_demux->p_sys->csa, &p_buffer[i_pos], p_demux->p_sys->i_csa_pkt_size ); - vlc_mutex_unlock( &p_sys->csa_lock ); + if( !p_pid->b_seen ) + { + 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 ); + block_Release( p_pkt ); } + p_pid->b_seen = true; - i_pos += p_sys->i_packet_size; - } - - /* Then write */ - const int i_write = fwrite( p_sys->buffer, 1, i_data, p_sys->p_file ); - if( i_write < 0 ) - { - msg_Err( p_demux, "failed to write data" ); - return -1; - } - - p_sys->i_write += i_write; - return 1; -} - -/***************************************************************************** - * Demux: - *****************************************************************************/ -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++ ) - { - bool b_frame = false; - block_t *p_pkt; - - /* Get a new TS packet */ - 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 ); - - while( vlc_object_alive (p_demux) ) - { - const uint8_t *p_peek; - int i_peek, i_skip = 0; - - 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 - p_sys->i_packet_size ) - { - if( p_peek[i_skip] == 0x47 && - p_peek[i_skip + p_sys->i_packet_size] == 0x47 ) - { - break; - } - i_skip++; - } - - msg_Dbg( p_demux, "skipping %d bytes of garbage", i_skip ); - stream_Read( p_demux->s, NULL, i_skip ); - - if( i_skip < i_peek - p_sys->i_packet_size ) - { - break; - } - } - - if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) ) - { - msg_Dbg( p_demux, "eof ?" ); - return 0; - } - } - - if( p_sys->b_start_record ) - { - /* Enable recording once synchronized */ - stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, true, "ts" ); - p_sys->b_start_record = false; - } - - if( p_sys->b_udp_out ) - { - memcpy( &p_sys->buffer[i_pkt * p_sys->i_packet_size], - p_pkt->p_buffer, p_sys->i_packet_size ); - } - - /* Parse the TS packet */ - ts_pid_t *p_pid = &p_sys->pid[PIDGet( p_pkt )]; - - if( p_pid->b_valid ) - { - if( p_pid->psi ) - { - if( p_pid->i_pid == 0 || ( p_sys->b_dvb_meta && ( p_pid->i_pid == 0x11 || p_pid->i_pid == 0x12 || p_pid->i_pid == 0x14 ) ) ) - { - dvbpsi_PushPacket( p_pid->psi->handle, p_pkt->p_buffer ); - } - else - { - for( int 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 ); - } - } - block_Release( p_pkt ); - } - else if( !p_sys->b_udp_out ) - { - b_frame = GatherPES( p_demux, p_pid, p_pkt ); - } - else - { - PCRHandle( p_demux, p_pid, p_pkt ); - block_Release( p_pkt ); - } - } - else - { - if( !p_pid->b_seen ) - { - 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 ); - block_Release( p_pkt ); - } - p_pid->b_seen = true; - - if( b_frame || ( b_wait_es && p_sys->i_pmt_es > 0 ) ) - break; + if( b_frame || ( b_wait_es && p_sys->i_pmt_es > 0 ) ) + break; } if( p_sys->b_udp_out ) @@ -1173,6 +1019,7 @@ static int Demux( demux_t *p_demux ) p_sys->i_ts_read * p_sys->i_packet_size ); } + demux_UpdateTitleFromStream( p_demux ); return 1; } @@ -1189,11 +1036,7 @@ static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_ if( p_sys->i_dvb_length > 0 ) { -#ifdef TS_USE_TDT const int64_t t = mdate() + p_sys->i_tdt_delta; -#else - const int64_t t = CLOCK_FREQ * time ( NULL ); -#endif if( p_sys->i_dvb_start <= t && t < p_sys->i_dvb_start + p_sys->i_dvb_length ) { @@ -1216,194 +1059,155 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) int64_t *pi64; int i_int; - if( p_sys->b_file_out ) - return demux_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args ); - switch( i_query ) { case DEMUX_GET_POSITION: pf = (double*) va_arg( args, double* ); - i64 = stream_Size( p_demux->s ); - if( i64 > 0 ) - { - double f_current = stream_Tell( p_demux->s ); - *pf = f_current / (double)i64; - } - else + + if( p_sys->b_force_seek_per_percent || + (p_sys->b_dvb_meta && p_sys->b_access_control) || + p_sys->i_current_pcr - p_sys->i_first_pcr < 0 || + p_sys->i_last_pcr - p_sys->i_first_pcr <= 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 if( (i64 = stream_Size( p_demux->s) ) > 0 ) + *pf = (double)stream_Tell( p_demux->s ) / (double)i64; else *pf = 0.0; } + else + { + *pf = (double)(p_sys->i_current_pcr - p_sys->i_first_pcr) / (double)(p_sys->i_last_pcr - p_sys->i_first_pcr); + } return VLC_SUCCESS; + case DEMUX_SET_POSITION: f = (double) va_arg( args, double ); - i64 = stream_Size( p_demux->s ); - - if( stream_Seek( p_demux->s, (int64_t)(i64 * f) ) ) - return VLC_EGENERIC; + if( p_sys->b_force_seek_per_percent || + (p_sys->b_dvb_meta && p_sys->b_access_control) || + p_sys->i_last_pcr - p_sys->i_first_pcr <= 0 ) + { + i64 = stream_Size( p_demux->s ); + if( stream_Seek( p_demux->s, (int64_t)(i64 * f) ) ) + return VLC_EGENERIC; + } + else + { + if( Seek( p_demux, f ) ) + { + p_sys->b_force_seek_per_percent = true; + return VLC_EGENERIC; + } + } return VLC_SUCCESS; -#if 0 case DEMUX_GET_TIME: pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_time < 0 ) + if( (p_sys->b_dvb_meta && p_sys->b_access_control) || + p_sys->b_force_seek_per_percent || + p_sys->i_current_pcr - p_sys->i_first_pcr < 0 ) + { + if( DVBEventInformation( p_demux, pi64, NULL ) ) + { + *pi64 = 0; + } + } + else { - *pi64 = 0; - return VLC_EGENERIC; + *pi64 = (p_sys->i_current_pcr - p_sys->i_first_pcr) * 100 / 9; } - *pi64 = p_sys->i_time; return VLC_SUCCESS; case DEMUX_GET_LENGTH: pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) + if( (p_sys->b_dvb_meta && p_sys->b_access_control) || + p_sys->b_force_seek_per_percent || + p_sys->i_last_pcr - p_sys->i_first_pcr <= 0 ) { - *pi64 = INT64_C(1000000) * ( stream_Size( p_demux->s ) / 50 ) / - p_sys->i_mux_rate; - return VLC_SUCCESS; + if( DVBEventInformation( p_demux, NULL, pi64 ) ) + { + *pi64 = 0; + } + } + else + { + *pi64 = (p_sys->i_last_pcr - p_sys->i_first_pcr) * 100 / 9; } - *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_access_control && i_int > 0 && i_int != p_sys->i_current_program ) + if( i_int == 0 && p_sys->i_current_program > 0 ) + i_int = p_sys->i_current_program; + + if( p_sys->i_current_program > 0 ) + { + if( p_sys->i_current_program != i_int ) + SetPrgFilter( p_demux, p_sys->i_current_program, false ); + } + else if( p_sys->i_current_program < 0 ) { - int i_pmt_pid = -1; + for( int i = 0; i < p_sys->programs_list.i_count; i++ ) + SetPrgFilter( p_demux, p_sys->programs_list.p_values[i].i_int, false ); + } - /* Search pmt to be unselected */ - for( int i = 0; i < p_sys->i_pmt; i++ ) + if( i_int > 0 ) + { + p_sys->i_current_program = i_int; + SetPrgFilter( p_demux, p_sys->i_current_program, true ); + } + else if( i_int < 0 ) + { + p_sys->i_current_program = -1; + p_sys->programs_list.i_count = 0; + if( p_list ) { - ts_pid_t *pmt = p_sys->pmt[i]; + vlc_list_t *p_dst = &p_sys->programs_list; + free( p_dst->p_values ); - for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) + p_dst->p_values = calloc( p_list->i_count, + sizeof(*p_dst->p_values) ); + if( p_dst->p_values ) { - if( pmt->psi->prg[i_prg]->i_number == p_sys->i_current_program ) + p_dst->i_count = p_list->i_count; + for( int i = 0; i < p_list->i_count; i++ ) { - i_pmt_pid = p_sys->pmt[i]->i_pid; - break; + p_dst->p_values[i] = p_list->p_values[i]; + SetPrgFilter( p_demux, p_dst->p_values[i].i_int, true ); } } - if( i_pmt_pid > 0 ) break; } + } + return VLC_SUCCESS; + } - if( i_pmt_pid > 0 ) - { - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid, - false ); - /* All ES */ - for( int i = 2; i < 8192; i++ ) - { - ts_pid_t *pid = &p_sys->pid[i]; + case DEMUX_GET_TITLE_INFO: + { + struct input_title_t ***v = va_arg( args, struct input_title_t*** ); + int *c = va_arg( args, int * ); - if( !pid->b_valid || pid->psi ) - continue; + *va_arg( args, int* ) = 0; /* Title offset */ + *va_arg( args, int* ) = 0; /* Chapter offset */ + return stream_Control( p_demux->s, STREAM_GET_TITLE_INFO, v, c ); + } - for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ ) - { - if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id ) - { - /* We only remove es that aren't defined by extra pmt */ - stream_Control( p_demux->s, - STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, - i, false ); - break; - } - } - } - } + case DEMUX_SET_TITLE: + return stream_vaControl( p_demux->s, STREAM_SET_TITLE, args ); - /* select new program */ - p_sys->i_current_program = i_int; - i_pmt_pid = -1; - for( int i = 0; i < p_sys->i_pmt; i++ ) - { - ts_pid_t *pmt = p_sys->pmt[i]; + case DEMUX_SET_SEEKPOINT: + return stream_vaControl( p_demux->s, STREAM_SET_SEEKPOINT, args ); - for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) - { - if( pmt->psi->prg[i_prg]->i_number == i_int ) - { - i_pmt_pid = p_sys->pmt[i]->i_pid; - p_prg = p_sys->pmt[i]->psi->prg[i_prg]; - break; - } - } - if( i_pmt_pid > 0 ) - break; - } - if( i_pmt_pid > 0 ) - { - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid, - true ); - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr, - true ); - - for( int i = 2; i < 8192; i++ ) - { - ts_pid_t *pid = &p_sys->pid[i]; - - if( !pid->b_valid || pid->psi ) - continue; - - for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ ) - { - if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id ) - { - if ( pid->es->fmt.i_cat == VIDEO_ES && !i_vpid ) - i_vpid = i; - if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid1 ) - i_apid1 = i; - else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid2 ) - i_apid2 = i; - else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid3 ) - i_apid3 = i; - - stream_Control( p_demux->s, - STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, - i, true ); - break; - } - } - } - } - } - else - { - p_sys->i_current_program = -1; - p_sys->p_programs_list = p_list; - } - return VLC_SUCCESS; - } + case DEMUX_GET_META: + return stream_vaControl( p_demux->s, STREAM_GET_META, args ); case DEMUX_CAN_RECORD: pb_bool = (bool*)va_arg( args, bool * ); @@ -1418,8 +1222,9 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) p_sys->b_start_record = b_bool; return VLC_SUCCESS; - case DEMUX_GET_FPS: - case DEMUX_SET_TIME: + case DEMUX_GET_SIGNAL: + return stream_vaControl( p_demux->s, STREAM_GET_SIGNAL, args ); + default: return VLC_EGENERIC; } @@ -1435,6 +1240,7 @@ static int UserPmt( demux_t *p_demux, const char *psz_fmt ) char *psz = psz_dup; int i_pid; int i_number; + ts_prg_psi_t *prg = NULL; if( !psz_dup ) return VLC_ENOMEM; @@ -1451,22 +1257,37 @@ static int UserPmt( demux_t *p_demux, const char *psz_fmt ) /* */ ts_pid_t *pmt = &p_sys->pid[i_pid]; - ts_prg_psi_t *prg; msg_Dbg( p_demux, "user pmt specified (pid=%d,number=%d)", i_pid, i_number ); PIDInit( pmt, true, NULL ); /* Dummy PMT */ - prg = malloc( sizeof( ts_prg_psi_t ) ); + prg = calloc( 1, sizeof( ts_prg_psi_t ) ); if( !prg ) goto error; - memset( prg, 0, sizeof( ts_prg_psi_t ) ); prg->i_pid_pcr = -1; prg->i_pid_pmt = -1; prg->i_version = -1; prg->i_number = i_number != 0 ? i_number : TS_USER_PMT_NUMBER; - prg->handle = dvbpsi_AttachPMT( i_number != TS_USER_PMT_NUMBER ? i_number : 1, (dvbpsi_pmt_callback)PMTCallBack, p_demux ); +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + prg->handle = dvbpsi_new( &dvbpsi_messages, DVBPSI_MSG_DEBUG ); + if( !prg->handle ) + goto error; + prg->handle->p_sys = (void *) VLC_OBJECT(p_demux); + if( !dvbpsi_pmt_attach( prg->handle, + ((i_number != TS_USER_PMT_NUMBER ? i_number : 1)), + PMTCallBack, p_demux ) ) + { + dvbpsi_delete( prg->handle ); + prg->handle = NULL; + goto error; + } +#else + prg->handle = dvbpsi_AttachPMT( + ((i_number != TS_USER_PMT_NUMBER) ? i_number : 1), + PMTCallBack, p_demux ); +#endif TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg ); psz = strchr( psz, '=' ); @@ -1521,7 +1342,7 @@ static int UserPmt( demux_t *p_demux, const char *psz_fmt ) else { const int i_stream_type = strtol( psz_opt, NULL, 0 ); - PIDFillFormat( pid, i_stream_type ); + PIDFillFormat( pid->es, i_stream_type ); } pid->es->fmt.i_group = i_number; if( p_sys->b_es_id_pid ) @@ -1547,10 +1368,73 @@ static int UserPmt( demux_t *p_demux, const char *psz_fmt ) return VLC_SUCCESS; error: + free( prg ); free( psz_dup ); return VLC_EGENERIC; } +static int SetPIDFilter( demux_t *p_demux, int i_pid, bool b_selected ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + if( !p_sys->b_access_control ) + return VLC_EGENERIC; + + return stream_Control( p_demux->s, STREAM_SET_PRIVATE_ID_STATE, + i_pid, b_selected ); +} + +static void SetPrgFilter( demux_t *p_demux, int i_prg_id, bool b_selected ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + ts_prg_psi_t *p_prg = NULL; + int i_pmt_pid = -1; + + /* Search pmt to be unselected */ + for( int i = 0; i < p_sys->i_pmt; i++ ) + { + ts_pid_t *pmt = p_sys->pmt[i]; + + for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) + { + if( pmt->psi->prg[i_prg]->i_number == i_prg_id ) + { + i_pmt_pid = p_sys->pmt[i]->i_pid; + p_prg = p_sys->pmt[i]->psi->prg[i_prg]; + break; + } + } + if( i_pmt_pid > 0 ) + break; + } + if( i_pmt_pid <= 0 ) + return; + assert( p_prg ); + + SetPIDFilter( p_demux, i_pmt_pid, b_selected ); + if( p_prg->i_pid_pcr > 0 ) + SetPIDFilter( p_demux, p_prg->i_pid_pcr, b_selected ); + + /* All ES */ + for( int i = 2; i < 8192; i++ ) + { + ts_pid_t *pid = &p_sys->pid[i]; + + if( !pid->b_valid || pid->psi ) + continue; + + for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ ) + { + if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id ) + { + /* We only remove/select es that aren't defined by extra pmt */ + SetPIDFilter( p_demux, i, b_selected ); + break; + } + } + } +} + static void PIDInit( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner ) { bool b_old_valid = pid->b_valid; @@ -1570,11 +1454,8 @@ static void PIDInit( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner ) if( !b_old_valid ) { pid->psi = xmalloc( sizeof( ts_psi_t ) ); - if( pid->psi ) - { - pid->psi->handle = NULL; - TAB_INIT( pid->psi->i_prg, pid->psi->prg ); - } + pid->psi->handle = NULL; + TAB_INIT( pid->psi->i_prg, pid->psi->prg ); } assert( pid->psi ); @@ -1583,35 +1464,30 @@ static void PIDInit( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner ) if( p_owner ) { ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) ); - if( prg ) - { - /* PMT */ - prg->i_version = -1; - prg->i_number = -1; - prg->i_pid_pcr = -1; - prg->i_pid_pmt = -1; - prg->iod = NULL; - prg->handle = NULL; - - TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg ); - } + if( !prg ) + return; + /* PMT */ + prg->i_version = -1; + prg->i_number = -1; + prg->i_pid_pcr = -1; + prg->i_pid_pmt = -1; + prg->i_pcr_value= -1; + prg->iod = NULL; + prg->handle = NULL; + + TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg ); } } else { pid->psi = NULL; - pid->es = malloc( sizeof( ts_es_t ) ); - if( pid->es ) - { - es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 ); - pid->es->id = NULL; - pid->es->p_pes = NULL; - pid->es->i_pes_size= 0; - pid->es->i_pes_gathered= 0; - pid->es->pp_last = &pid->es->p_pes; - pid->es->p_mpeg4desc = NULL; - pid->es->b_gather = false; - } + pid->es = calloc( 1, sizeof( ts_es_t ) ); + if( !pid->es ) + return; + + es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 ); + pid->es->data_type = TS_ES_DATA_PES; + pid->es->pp_last = &pid->es->p_data; } } @@ -1623,13 +1499,30 @@ static void PIDClean( demux_t *p_demux, ts_pid_t *pid ) if( pid->psi ) { if( pid->psi->handle ) + { +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + if( dvbpsi_decoder_present( pid->psi->handle ) ) + dvbpsi_pmt_detach( pid->psi->handle ); + dvbpsi_delete( pid->psi->handle ); + pid->psi->handle = NULL; +#else dvbpsi_DetachPMT( pid->psi->handle ); +#endif + } for( int 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 ) + { +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + if( dvbpsi_decoder_present( pid->psi->prg[i]->handle ) ) + dvbpsi_pmt_detach( pid->psi->prg[i]->handle ); + dvbpsi_delete( pid->psi->prg[i]->handle ); +#else dvbpsi_DetachPMT( pid->psi->prg[i]->handle ); +#endif + } free( pid->psi->prg[i] ); } free( pid->psi->prg ); @@ -1643,8 +1536,8 @@ static void PIDClean( demux_t *p_demux, ts_pid_t *pid ) p_sys->i_pmt_es--; } - if( pid->es->p_pes ) - block_ChainRelease( pid->es->p_pes ); + if( pid->es->p_data ) + block_ChainRelease( pid->es->p_data ); es_format_Clean( &pid->es->fmt ); @@ -1658,8 +1551,8 @@ static void PIDClean( demux_t *p_demux, ts_pid_t *pid ) p_sys->i_pmt_es--; } - if( pid->extra_es[i]->p_pes ) - block_ChainRelease( pid->extra_es[i]->p_pes ); + if( pid->extra_es[i]->p_data ) + block_ChainRelease( pid->extra_es[i]->p_data ); es_format_Clean( &pid->extra_es[i]->fmt ); @@ -1675,9 +1568,9 @@ static void PIDClean( demux_t *p_demux, 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 ) { - block_t *p_pes = pid->es->p_pes; + demux_sys_t *p_sys = p_demux->p_sys; uint8_t header[34]; unsigned i_pes_size = 0; unsigned i_skip = 0; @@ -1685,20 +1578,13 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) mtime_t i_pts = -1; mtime_t i_length = 0; - /* remove the pes from pid */ - pid->es->p_pes = NULL; - pid->es->i_pes_size= 0; - pid->es->i_pes_gathered= 0; - pid->es->pp_last = &pid->es->p_pes; - /* FIXME find real max size */ /* const int i_max = */ block_ChainExtract( p_pes, header, 34 ); - + if( header[0] != 0 || header[1] != 0 || header[2] != 1 ) { - if( !p_demux->p_sys->b_silent ) - msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x] (pid: %d)", - header[0], header[1],header[2],header[3], pid->i_pid ); + msg_Warn( p_demux, "invalid header [0x%02x:%02x:%02x:%02x] (pid: %d)", + header[0], header[1],header[2],header[3], pid->i_pid ); block_ChainRelease( p_pes ); return; } @@ -1785,142 +1671,543 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid ) i_skip += 1; } } - break; + break; + } + + if( pid->es->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', 'b' ) || + pid->es->fmt.i_codec == VLC_FOURCC( 'd', 't', 's', 'b' ) ) + { + i_skip += 4; + } + else if( pid->es->fmt.i_codec == VLC_FOURCC( 'l', 'p', 'c', 'b' ) || + pid->es->fmt.i_codec == VLC_FOURCC( 's', 'p', 'u', 'b' ) || + pid->es->fmt.i_codec == VLC_FOURCC( 's', 'd', 'd', 'b' ) ) + { + i_skip += 1; + } + else if( pid->es->fmt.i_codec == VLC_CODEC_SUBT && + pid->es->p_mpeg4desc ) + { + decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr; + + if( dcd->i_extra > 2 && + dcd->p_extra[0] == 0x10 && + ( dcd->p_extra[1]&0x10 ) ) + { + /* display length */ + if( p_pes->i_buffer + 2 <= i_skip ) + i_length = GetWBE( &p_pes->p_buffer[i_skip] ); + + i_skip += 2; + } + if( p_pes->i_buffer + 2 <= i_skip ) + i_pes_size = GetWBE( &p_pes->p_buffer[i_skip] ); + /* */ + i_skip += 2; + } + + /* skip header */ + while( p_pes && i_skip > 0 ) + { + if( p_pes->i_buffer <= i_skip ) + { + block_t *p_next = p_pes->p_next; + + i_skip -= p_pes->i_buffer; + block_Release( p_pes ); + p_pes = p_next; + } + else + { + p_pes->i_buffer -= i_skip; + p_pes->p_buffer += i_skip; + break; + } + } + + /* 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; + + if( i_dts >= 0 ) + p_pes->i_dts = VLC_TS_0 + i_dts * 100 / 9; + + if( i_pts >= 0 ) + p_pes->i_pts = VLC_TS_0 + i_pts * 100 / 9; + + p_pes->i_length = i_length * 100 / 9; + + p_block = block_ChainGather( p_pes ); + if( pid->es->fmt.i_codec == VLC_CODEC_SUBT ) + { + if( i_pes_size > 0 && p_block->i_buffer > i_pes_size ) + { + p_block->i_buffer = i_pes_size; + } + /* Append a \0 */ + p_block = block_Realloc( p_block, 0, p_block->i_buffer + 1 ); + if( !p_block ) + abort(); + p_block->p_buffer[p_block->i_buffer -1] = '\0'; + } + else if( pid->es->fmt.i_codec == VLC_CODEC_TELETEXT ) + { + if( p_block->i_pts <= VLC_TS_INVALID ) + { + /* Teletext may have missing PTS (ETSI EN 300 472 Annexe A) + * In this case use the last PCR + 40ms */ + for( int i = 0; pid->p_owner && i < pid->p_owner->i_prg; i++ ) + { + if( pid->i_owner_number == pid->p_owner->prg[i]->i_number ) + { + mtime_t i_pcr = pid->p_owner->prg[i]->i_pcr_value; + if( i_pcr > VLC_TS_INVALID ) + p_block->i_pts = VLC_TS_0 + i_pcr * 100 / 9 + 40000; + break; + } + } + } + } + + for( int i = 0; i < pid->i_extra_es; i++ ) + { + es_out_Send( p_demux->out, pid->extra_es[i]->id, + block_Duplicate( p_block ) ); + } + + if (!p_sys->b_trust_pcr) + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts); + + es_out_Send( p_demux->out, pid->es->id, p_block ); + } + else + { + msg_Warn( p_demux, "empty pes" ); + } +} + +static void ParseTableSection( demux_t *p_demux, ts_pid_t *pid, block_t *p_data ) +{ + block_t *p_content = block_ChainGather( p_data ); + mtime_t i_date = -1; + for( int i = 0; pid->p_owner && i < pid->p_owner->i_prg; i++ ) + { + if( pid->i_owner_number == pid->p_owner->prg[i]->i_number ) + { + i_date = pid->p_owner->prg[i]->i_pcr_value; + if( i_date >= 0 ) + break; + } + } + if( i_date >= 0 ) + { + if( pid->es->fmt.i_codec == VLC_CODEC_SCTE_27 ) + { + /* We need to extract the truncated pts stored inside the payload */ + if( p_content->i_buffer > 9 && p_content->p_buffer[0] == 0xc6 ) + { + int i_index = 0; + int i_offset = 4; + if( p_content->p_buffer[3] & 0x40 ) + { + i_index = ((p_content->p_buffer[7] & 0x0f) << 8) | + p_content->p_buffer[8]; + i_offset = 9; + } + if( i_index == 0 && p_content->i_buffer > i_offset + 8 ) + { + bool is_immediate = p_content->p_buffer[i_offset + 3] & 0x40; + if( !is_immediate ) + { + mtime_t i_display_in = GetDWBE( &p_content->p_buffer[i_offset + 4] ); + if( i_display_in < i_date ) + i_date = i_display_in + (1ll << 32); + else + i_date = i_display_in; + } + + } + } + } + p_content->i_dts = + p_content->i_pts = VLC_TS_0 + i_date * 100 / 9; + } + es_out_Send( p_demux->out, pid->es->id, p_content ); +} +static void ParseData( demux_t *p_demux, ts_pid_t *pid ) +{ + block_t *p_data = pid->es->p_data; + + /* remove the pes from pid */ + pid->es->p_data = NULL; + pid->es->i_data_size = 0; + pid->es->i_data_gathered = 0; + pid->es->pp_last = &pid->es->p_data; + + if( pid->es->data_type == TS_ES_DATA_PES ) + { + ParsePES( p_demux, pid, p_data ); + } + else if( pid->es->data_type == TS_ES_DATA_TABLE_SECTION ) + { + ParseTableSection( p_demux, pid, p_data ); + } + else + { + block_ChainRelease( p_data ); + } +} + +static block_t* ReadTSPacket( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + block_t *p_pkt; + + /* Get a new TS packet */ + if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) ) + { + msg_Dbg( p_demux, "eof ?" ); + return NULL; + } + + /* 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 ); + while( vlc_object_alive (p_demux) ) + { + const uint8_t *p_peek; + int i_peek, i_skip = 0; + + 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 NULL; + } + + while( i_skip < i_peek - p_sys->i_packet_size ) + { + if( p_peek[i_skip] == 0x47 && + p_peek[i_skip + p_sys->i_packet_size] == 0x47 ) + { + break; + } + i_skip++; + } + msg_Dbg( p_demux, "skipping %d bytes of garbage", i_skip ); + stream_Read( p_demux->s, NULL, i_skip ); + + if( i_skip < i_peek - p_sys->i_packet_size ) + { + break; + } + } + if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) ) + { + msg_Dbg( p_demux, "eof ?" ); + return NULL; + } + } + return p_pkt; +} + +static mtime_t AdjustPCRWrapAround( demux_t *p_demux, mtime_t i_pcr ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + /* + * PCR is 33bit. If PCR reaches to 0x1FFFFFFFF (26:30:43.717), ressets from 0. + * So, need to add 0x1FFFFFFFF, for calculating duration or current position. + */ + mtime_t i_adjust = 0; + int64_t i_pos = stream_Tell( p_demux->s ); + int i; + for( i = 1; i < p_sys->i_pcrs_num && p_sys->p_pos[i] <= i_pos; ++i ) + { + if( p_sys->p_pcrs[i-1] > p_sys->p_pcrs[i] ) + i_adjust += 0x1FFFFFFFF; + } + if( p_sys->p_pcrs[i-1] > i_pcr ) + i_adjust += 0x1FFFFFFFF; + + return i_pcr + i_adjust; +} + +static mtime_t GetPCR( block_t *p_pkt ) +{ + const uint8_t *p = p_pkt->p_buffer; + + mtime_t i_pcr = -1; + + if( ( p[3]&0x20 ) && /* adaptation */ + ( p[5]&0x10 ) && + ( p[4] >= 7 ) ) + { + /* PCR is 33 bits */ + i_pcr = ( (mtime_t)p[6] << 25 ) | + ( (mtime_t)p[7] << 17 ) | + ( (mtime_t)p[8] << 9 ) | + ( (mtime_t)p[9] << 1 ) | + ( (mtime_t)p[10] >> 7 ); + } + return i_pcr; +} + +static int SeekToPCR( demux_t *p_demux, int64_t i_pos ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + + mtime_t i_pcr = -1; + int64_t i_initial_pos = stream_Tell( p_demux->s ); + + if( i_pos < 0 ) + return VLC_EGENERIC; + + int64_t i_last_pos = i_pos + p_sys->i_packet_size * 4500; //XXX + if( i_last_pos > stream_Size( p_demux->s ) - p_sys->i_packet_size ) + { + i_last_pos = stream_Size( p_demux->s ) - p_sys->i_packet_size; + } + + if( stream_Seek( p_demux->s, i_pos ) ) + return VLC_EGENERIC; + + while( vlc_object_alive( p_demux ) ) + { + block_t *p_pkt; + if( !( p_pkt = ReadTSPacket( p_demux ) ) ) + { + break; + } + if( PIDGet( p_pkt ) == p_sys->i_pid_ref_pcr ) + { + i_pcr = GetPCR( p_pkt ); + } + block_Release( p_pkt ); + if( i_pcr >= 0 ) + break; + if( stream_Tell( p_demux->s ) >= i_last_pos ) + break; } - - if( pid->es->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', 'b' ) || - pid->es->fmt.i_codec == VLC_FOURCC( 'd', 't', 's', 'b' ) ) + if( i_pcr < 0 ) { - i_skip += 4; + stream_Seek( p_demux->s, i_initial_pos ); + return VLC_EGENERIC; } - else if( pid->es->fmt.i_codec == VLC_FOURCC( 'l', 'p', 'c', 'b' ) || - pid->es->fmt.i_codec == VLC_FOURCC( 's', 'p', 'u', 'b' ) || - pid->es->fmt.i_codec == VLC_FOURCC( 's', 'd', 'd', 'b' ) ) + else { - i_skip += 1; + p_sys->i_current_pcr = i_pcr; + return VLC_SUCCESS; } - else if( pid->es->fmt.i_codec == VLC_CODEC_SUBT && - pid->es->p_mpeg4desc ) - { - decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr; +} - if( dcd->i_decoder_specific_info_len > 2 && - dcd->p_decoder_specific_info[0] == 0x10 && - ( dcd->p_decoder_specific_info[1]&0x10 ) ) - { - /* display length */ - if( p_pes->i_buffer + 2 <= i_skip ) - i_length = GetWBE( &p_pes->p_buffer[i_skip] ); +static int Seek( demux_t *p_demux, double f_percent ) +{ + demux_sys_t *p_sys = p_demux->p_sys; - i_skip += 2; + int64_t i_initial_pos = stream_Tell( p_demux->s ); + mtime_t i_initial_pcr = p_sys->i_current_pcr; + + /* + * Find the time position by using binary search algorithm. + */ + mtime_t i_target_pcr = (p_sys->i_last_pcr - p_sys->i_first_pcr) * f_percent + p_sys->i_first_pcr; + + int64_t i_head_pos = 0; + int64_t i_tail_pos; + { + mtime_t i_adjust = 0; + int i; + for( i = 1; i < p_sys->i_pcrs_num; ++i ) + { + if( p_sys->p_pcrs[i-1] > p_sys->p_pcrs[i] ) + i_adjust += 0x1FFFFFFFF; + if( p_sys->p_pcrs[i] + i_adjust > i_target_pcr ) + break; } - if( p_pes->i_buffer + 2 <= i_skip ) - i_pes_size = GetWBE( &p_pes->p_buffer[i_skip] ); - /* */ - i_skip += 2; + i_head_pos = p_sys->p_pos[i-1]; + i_tail_pos = ( i < p_sys->i_pcrs_num ) ? p_sys->p_pos[i] : stream_Size( p_demux->s ); } -#ifdef ZVBI_COMPILED - else if( pid->es->fmt.i_codec == VLC_CODEC_TELETEXT ) - i_skip = 0; /*hack for zvbi support */ -#endif - /* skip header */ - while( p_pes && i_skip > 0 ) + msg_Dbg( p_demux, "Seek():i_head_pos:%"PRId64", i_tail_pos:%"PRId64, i_head_pos, i_tail_pos); + + bool b_found = false; + int i_cnt = 0; + while( i_head_pos <= i_tail_pos ) { - if( p_pes->i_buffer <= i_skip ) + int64_t i_pos = i_head_pos + (i_tail_pos - i_head_pos) / 2; + if( SeekToPCR( p_demux, i_pos ) ) + break; + p_sys->i_current_pcr = AdjustPCRWrapAround( p_demux, p_sys->i_current_pcr ); + int64_t i_diff_msec = (p_sys->i_current_pcr - i_target_pcr) * 100 / 9 / 1000; + if( i_diff_msec > 500 ) { - block_t *p_next = p_pes->p_next; - - i_skip -= p_pes->i_buffer; - block_Release( p_pes ); - p_pes = p_next; + i_tail_pos = i_pos - p_sys->i_packet_size; + } + else if( i_diff_msec < -500 ) + { + i_head_pos = i_pos + p_sys->i_packet_size; } else { - p_pes->i_buffer -= i_skip; - p_pes->p_buffer += i_skip; + // diff time <= 500msec + b_found = true; break; } + ++i_cnt; + } + if( !b_found ) + { + msg_Dbg( p_demux, "Seek():cannot find a time position. i_cnt:%d", i_cnt ); + stream_Seek( p_demux->s, i_initial_pos ); + p_sys->i_current_pcr = i_initial_pcr; + return VLC_EGENERIC; } + else + { + msg_Dbg( p_demux, "Seek():can find a time position. i_cnt:%d", i_cnt ); + return VLC_SUCCESS; + } +} - /* 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; +static void GetFirstPCR( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; - if( p_pes ) + int64_t i_initial_pos = stream_Tell( p_demux->s ); + + if( stream_Seek( p_demux->s, 0 ) ) + return; + + while( vlc_object_alive (p_demux) ) { - block_t *p_block; - int i; + block_t *p_pkt; + if( !( p_pkt = ReadTSPacket( p_demux ) ) ) + { + break; + } + mtime_t i_pcr = GetPCR( p_pkt ); + if( i_pcr >= 0 ) + { + p_sys->i_pid_ref_pcr = PIDGet( p_pkt ); + p_sys->i_first_pcr = i_pcr; + p_sys->i_current_pcr = i_pcr; + } + block_Release( p_pkt ); + if( p_sys->i_first_pcr >= 0 ) + break; + } + stream_Seek( p_demux->s, i_initial_pos ); +} - if( i_dts >= 0 ) - p_pes->i_dts = VLC_TS_0 + i_dts * 100 / 9; +static void GetLastPCR( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; - if( i_pts >= 0 ) - p_pes->i_pts = VLC_TS_0 + i_pts * 100 / 9; + int64_t i_initial_pos = stream_Tell( p_demux->s ); + mtime_t i_initial_pcr = p_sys->i_current_pcr; - p_pes->i_length = i_length * 100 / 9; + int64_t i_last_pos = stream_Size( p_demux->s ) - p_sys->i_packet_size; + int64_t i_pos = i_last_pos - p_sys->i_packet_size * 4500; /* FIXME if the value is not reasonable, please change it. */ + if( i_pos < 0 ) + return; - p_block = block_ChainGather( p_pes ); - if( pid->es->fmt.i_codec == VLC_CODEC_SUBT ) + while( vlc_object_alive( p_demux ) ) + { + if( SeekToPCR( p_demux, i_pos ) ) + break; + p_sys->i_last_pcr = AdjustPCRWrapAround( p_demux, p_sys->i_current_pcr ); + if( ( i_pos = stream_Tell( p_demux->s ) ) >= i_last_pos ) + break; + } + if( p_sys->i_last_pcr >= 0 ) + { + int64_t i_size = stream_Size( p_demux->s ); + mtime_t i_duration_msec = ( p_sys->i_last_pcr - p_sys->i_first_pcr ) * 100 / 9 / 1000; + int64_t i_rate = ( i_size < 0 || i_duration_msec <= 0 ) ? 0 : i_size * 1000 * 8 / i_duration_msec; + const int64_t TS_SUPPOSED_MAXRATE = 55 * 1000 * 1000; //FIXME I think it's enough. + const int64_t TS_SUPPOSED_MINRATE = 0.5 * 1000 * 1000; //FIXME + if( i_rate < TS_SUPPOSED_MINRATE || i_rate > TS_SUPPOSED_MAXRATE ) { - if( i_pes_size > 0 && p_block->i_buffer > i_pes_size ) - { - p_block->i_buffer = i_pes_size; - } - /* Append a \0 */ - p_block = block_Realloc( p_block, 0, p_block->i_buffer + 1 ); - p_block->p_buffer[p_block->i_buffer -1] = '\0'; + msg_Dbg( p_demux, "calculated bitrate (%"PRId64"bit/s) is too low or too high. min bitrate (%"PRId64"bit/s) max bitrate (%"PRId64"bit/s)", + i_rate, TS_SUPPOSED_MINRATE, TS_SUPPOSED_MAXRATE ); + p_sys->i_last_pcr = -1; } + } + stream_Seek( p_demux->s, i_initial_pos ); + p_sys->i_current_pcr = i_initial_pcr; +} + +static void CheckPCR( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; - for( i = 0; i < pid->i_extra_es; i++ ) + int64_t i_initial_pos = stream_Tell( p_demux->s ); + mtime_t i_initial_pcr = p_sys->i_current_pcr; + + int64_t i_size = stream_Size( p_demux->s ); + + int i = 0; + p_sys->p_pcrs[0] = p_sys->i_first_pcr; + p_sys->p_pos[0] = i_initial_pos; + + for( i = 1; i < p_sys->i_pcrs_num && vlc_object_alive( p_demux ); ++i ) + { + int64_t i_pos = i_size / p_sys->i_pcrs_num * i; + if( SeekToPCR( p_demux, i_pos ) ) + break; + p_sys->p_pcrs[i] = p_sys->i_current_pcr; + p_sys->p_pos[i] = stream_Tell( p_demux->s ); + if( p_sys->p_pcrs[i-1] > p_sys->p_pcrs[i] ) { - es_out_Send( p_demux->out, pid->extra_es[i]->id, - block_Duplicate( p_block ) ); + msg_Dbg( p_demux, "PCR Wrap Around found between %d%% and %d%% (pcr:%"PRId64"(0x%09"PRIx64") pcr:%"PRId64"(0x%09"PRIx64"))", + (int)((i-1)*100/p_sys->i_pcrs_num), (int)(i*100/p_sys->i_pcrs_num), p_sys->p_pcrs[i-1], p_sys->p_pcrs[i-1], p_sys->p_pcrs[i], p_sys->p_pcrs[i] ); } - - es_out_Send( p_demux->out, pid->es->id, p_block ); } - else + if( i < p_sys->i_pcrs_num ) { - msg_Warn( p_demux, "empty pes" ); + msg_Dbg( p_demux, "Force Seek Per Percent: Seeking failed at %d%%.", (int)(i*100/p_sys->i_pcrs_num) ); + p_sys->b_force_seek_per_percent = true; } + + stream_Seek( p_demux->s, i_initial_pos ); + p_sys->i_current_pcr = i_initial_pcr; } static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) { 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 ) ) - { - /* PCR is 33 bits */ - const mtime_t i_pcr = ( (mtime_t)p[6] << 25 ) | - ( (mtime_t)p[7] << 17 ) | - ( (mtime_t)p[8] << 9 ) | - ( (mtime_t)p[9] << 1 ) | - ( (mtime_t)p[10] >> 7 ); + mtime_t i_pcr = GetPCR( p_bk ); + if( i_pcr < 0 ) + return; - /* Search program and set the PCR */ - for( int i = 0; i < p_sys->i_pmt; i++ ) - { - for( int i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ ) + if( p_sys->i_pid_ref_pcr == pid->i_pid ) + p_sys->i_current_pcr = AdjustPCRWrapAround( p_demux, i_pcr ); + + /* Search program and set the PCR */ + for( int i = 0; i < p_sys->i_pmt; i++ ) + for( int i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ ) + if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr ) { - if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr ) - { + p_sys->pmt[i]->psi->prg[i_prg]->i_pcr_value = i_pcr; + if (p_sys->b_trust_pcr) es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR, - (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number, - (int64_t)(VLC_TS_0 + i_pcr * 100 / 9) ); - } + (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number, + (int64_t)(VLC_TS_0 + i_pcr * 100 / 9) ); } - } - } } -static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) +static bool GatherData( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) { const uint8_t *p = p_bk->p_buffer; const bool b_unit_start = p[1]&0x40; @@ -1948,8 +2235,8 @@ static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) { 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( pid->es->p_data ) //&& pid->es->fmt.i_cat == VIDEO_ES ) + pid->es->p_data->i_flags |= BLOCK_FLAG_CORRUPTED; } if( p_demux->p_sys->csa ) @@ -1973,11 +2260,11 @@ static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) { /* discontinuity indicator found in stream */ b_discontinuity = (p[5]&0x80) ? true : false; - if( b_discontinuity && pid->es->p_pes ) + if( b_discontinuity && pid->es->p_data ) { msg_Warn( p_demux, "discontinuity indicator (pid=%d) ", pid->i_pid ); - /* pid->es->p_pes->i_flags |= BLOCK_FLAG_DISCONTINUITY; */ + /* pid->es->p_data->i_flags |= BLOCK_FLAG_DISCONTINUITY; */ } #if 0 if( p[5]&0x40 ) @@ -2012,11 +2299,11 @@ static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) i_cc, ( pid->i_cc + 1 )&0x0f, pid->i_pid ); pid->i_cc = i_cc; - if( pid->es->p_pes && pid->es->fmt.i_cat != VIDEO_ES ) + if( pid->es->p_data && pid->es->fmt.i_cat != VIDEO_ES ) { /* Small video artifacts are usually better than * dropping full frames */ - pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED; + pid->es->p_data->i_flags |= BLOCK_FLAG_CORRUPTED; } } } @@ -2052,32 +2339,55 @@ static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) if( b_unit_start ) { - if( pid->es->p_pes ) + if( pid->es->data_type == TS_ES_DATA_TABLE_SECTION && p_bk->i_buffer > 0 ) + { + int i_pointer_field = __MIN( p_bk->p_buffer[0], p_bk->i_buffer - 1 ); + block_t *p = block_Duplicate( p_bk ); + if( p ) + { + p->i_buffer = i_pointer_field; + p->p_buffer++; + block_ChainLastAppend( &pid->es->pp_last, p ); + } + p_bk->i_buffer -= 1 + i_pointer_field; + p_bk->p_buffer += 1 + i_pointer_field; + } + if( pid->es->p_data ) { - ParsePES( p_demux, pid ); + ParseData( p_demux, pid ); i_ret = true; } block_ChainLastAppend( &pid->es->pp_last, p_bk ); - if( p_bk->i_buffer > 6 ) + if( pid->es->data_type == TS_ES_DATA_PES ) + { + if( p_bk->i_buffer > 6 ) + { + pid->es->i_data_size = GetWBE( &p_bk->p_buffer[4] ); + if( pid->es->i_data_size > 0 ) + { + pid->es->i_data_size += 6; + } + } + } + else if( pid->es->data_type == TS_ES_DATA_TABLE_SECTION ) { - pid->es->i_pes_size = GetWBE( &p_bk->p_buffer[4] ); - if( pid->es->i_pes_size > 0 ) + if( p_bk->i_buffer > 3 && p_bk->p_buffer[0] != 0xff ) { - pid->es->i_pes_size += 6; + pid->es->i_data_size = 3 + (((p_bk->p_buffer[1] & 0xf) << 8) | p_bk->p_buffer[2]); } } - 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 ) + pid->es->i_data_gathered += p_bk->i_buffer; + if( pid->es->i_data_size > 0 && + pid->es->i_data_gathered >= pid->es->i_data_size ) { - ParsePES( p_demux, pid ); + ParseData( p_demux, pid ); i_ret = true; } } else { - if( pid->es->p_pes == NULL ) + if( pid->es->p_data == NULL ) { /* msg_Dbg( p_demux, "broken packet" ); */ block_Release( p_bk ); @@ -2085,11 +2395,12 @@ static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *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 ) + pid->es->i_data_gathered += p_bk->i_buffer; + + if( pid->es->i_data_size > 0 && + pid->es->i_data_gathered >= pid->es->i_data_size ) { - ParsePES( p_demux, pid ); + ParseData( p_demux, pid ); i_ret = true; } } @@ -2098,9 +2409,9 @@ static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) return i_ret; } -static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) +static void PIDFillFormat( ts_es_t *es, int i_stream_type ) { - es_format_t *fmt = &pid->es->fmt; + es_format_t *fmt = &es->fmt; switch( i_stream_type ) { @@ -2115,21 +2426,26 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) break; case 0x11: /* MPEG4 (audio) LATM */ case 0x0f: /* ISO/IEC 13818-7 Audio with ADTS transport syntax */ + case 0x1c: /* ISO/IEC 14496-3 Audio, without using any additional + transport syntax, such as DST, ALS and SLS */ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MP4A ); break; case 0x10: /* MPEG4 (video) */ es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MP4V ); - pid->es->b_gather = true; break; case 0x1B: /* H264 <- check transport syntax/needed descriptor */ es_format_Init( fmt, VIDEO_ES, VLC_CODEC_H264 ); break; + case 0x42: /* CAVS (Chinese AVS) */ + es_format_Init( fmt, VIDEO_ES, VLC_CODEC_CAVS ); + break; case 0x81: /* A52 (audio) */ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_A52 ); break; - case 0x82: /* DVD_SPU (sub) */ - es_format_Init( fmt, SPU_ES, VLC_CODEC_SPU ); + case 0x82: /* SCTE-27 (sub) */ + es_format_Init( fmt, SPU_ES, VLC_CODEC_SCTE_27 ); + es->data_type = TS_ES_DATA_TABLE_SECTION; break; case 0x83: /* LPCM (audio) */ es_format_Init( fmt, AUDIO_ES, VLC_CODEC_DVD_LPCM ); @@ -2157,7 +2473,6 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) case 0xa0: /* MSCODEC vlc (video) (fixed later) */ es_format_Init( fmt, UNKNOWN_ES, 0 ); - pid->es->b_gather = true; break; case 0x06: /* PES_PRIVATE (fixed later) */ @@ -2170,8 +2485,6 @@ static int PIDFillFormat( ts_pid_t *pid, int i_stream_type ) /* PES packets usually contain truncated frames */ fmt->b_packetized = false; - - return fmt->i_cat == UNKNOWN_ES ? VLC_EGENERIC : VLC_SUCCESS ; } /***************************************************************************** @@ -2188,142 +2501,86 @@ static int IODDescriptorLength( int *pi_data, uint8_t **pp_data ) (*pi_data)--; i_len = ( i_len << 7 ) + ( i_b&0x7f ); - } while( i_b&0x80 ); + } while( i_b&0x80 && *pi_data > 0 ); - return( i_len ); + if (i_len > *pi_data) + i_len = *pi_data; + + return i_len; } -static int IODGetByte( int *pi_data, uint8_t **pp_data ) +static int IODGetBytes( int *pi_data, uint8_t **pp_data, size_t bytes ) { - if( *pi_data > 0 ) + uint32_t res = 0; + while( *pi_data > 0 && bytes-- ) { - const int i_b = **pp_data; + res <<= 8; + res |= **pp_data; (*pp_data)++; (*pi_data)--; - return( i_b ); } - return( 0 ); -} - -static int IODGetWord( int *pi_data, uint8_t **pp_data ) -{ - const int i1 = IODGetByte( pi_data, pp_data ); - const int i2 = IODGetByte( pi_data, pp_data ); - return( ( i1 << 8 ) | i2 ); -} - -static int IODGet3Bytes( int *pi_data, uint8_t **pp_data ) -{ - const int i1 = IODGetByte( pi_data, pp_data ); - const int i2 = IODGetByte( pi_data, pp_data ); - const int i3 = IODGetByte( pi_data, pp_data ); - - return( ( i1 << 16 ) | ( i2 << 8) | i3 ); -} -static uint32_t IODGetDWord( int *pi_data, uint8_t **pp_data ) -{ - const uint32_t i1 = IODGetWord( pi_data, pp_data ); - const uint32_t i2 = IODGetWord( pi_data, pp_data ); - return( ( i1 << 16 ) | i2 ); + return res; } static char* IODGetURL( int *pi_data, uint8_t **pp_data ) { - char *url; - int i_url_len, i; - - i_url_len = IODGetByte( pi_data, pp_data ); - url = malloc( i_url_len + 1 ); - if( !url ) return NULL; - for( i = 0; i < i_url_len; i++ ) - { - url[i] = IODGetByte( pi_data, pp_data ); - } - url[i_url_len] = '\0'; - return( url ); + int len = IODGetBytes( pi_data, pp_data, 1 ); + if (len > *pi_data) + len = *pi_data; + char *url = strndup( (char*)*pp_data, len ); + *pp_data += len; + *pi_data -= len; + return url; } static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) { - iod_descriptor_t *p_iod; - int i; - int i_es_index; - uint8_t i_flags, i_iod_tag, byte1, byte2, byte3; - bool b_url; - int i_iod_length; + uint8_t i_iod_tag, i_iod_label, byte1, byte2, byte3; - p_iod = malloc( sizeof( iod_descriptor_t ) ); - if( !p_iod ) return NULL; - 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; - } - i_es_index = 0; + iod_descriptor_t *p_iod = calloc( 1, sizeof( iod_descriptor_t ) ); + if( !p_iod ) + return NULL; if( i_data < 3 ) { return p_iod; } - byte1 = IODGetByte( &i_data, &p_data ); - byte2 = IODGetByte( &i_data, &p_data ); - byte3 = IODGetByte( &i_data, &p_data ); + byte1 = IODGetBytes( &i_data, &p_data, 1 ); + byte2 = IODGetBytes( &i_data, &p_data, 1 ); + byte3 = IODGetBytes( &i_data, &p_data, 1 ); if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor { - p_iod->i_iod_label_scope = 0x11; - p_iod->i_iod_label = byte1; + 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_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", i_iod_tag ); -#endif + + ts_debug( "\n* iod label:%d tag:0x%x", i_iod_label, i_iod_tag ); + if( i_iod_tag != 0x02 ) { -#ifdef TS_DEBUG - fprintf( stderr, "\n ERR: tag %02x != 0x02", i_iod_tag ); -#endif + ts_debug( "\n ERR: tag %02x != 0x02", i_iod_tag ); 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; - } + IODDescriptorLength( &i_data, &p_data ); - p_iod->i_od_id = ( IODGetByte( &i_data, &p_data ) << 2 ); - 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 ) + uint16_t i_od_id = ( IODGetBytes( &i_data, &p_data, 1 ) << 2 ); + uint8_t i_flags = IODGetBytes( &i_data, &p_data, 1 ); + i_od_id |= i_flags >> 6; + ts_debug( "\n* od_id:%d", i_od_id ); + ts_debug( "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 ); + if ((i_flags >> 5) & 0x01) { 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 + ts_debug( "\n* url string:%s", p_iod->psz_url ); + ts_debug( "\n*****************************\n" ); return p_iod; } else @@ -2331,246 +2588,121 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data ) p_iod->psz_url = NULL; } - p_iod->i_ODProfileLevelIndication = IODGetByte( &i_data, &p_data ); - p_iod->i_sceneProfileLevelIndication = IODGetByte( &i_data, &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 + /* Profile Level Indication */ + IODGetBytes( &i_data, &p_data, 1 ); /* OD */ + IODGetBytes( &i_data, &p_data, 1 ); /* scene */ + IODGetBytes( &i_data, &p_data, 1 ); /* audio */ + IODGetBytes( &i_data, &p_data, 1 ); /* visual */ + IODGetBytes( &i_data, &p_data, 1 ); /* graphics */ - while( i_data > 0 && i_es_index < 255) + int i_length = 0; + int i_data_sav = i_data; + uint8_t *p_data_sav = p_data; + for (int i = 0; i_data > 0 && i < 255; i++) { - int i_tag, i_length; - int i_data_sav; - uint8_t *p_data_sav; + es_mpeg4_descriptor_t *es_descr = &p_iod->es_descr[i]; - i_tag = IODGetByte( &i_data, &p_data ); + p_data = p_data_sav + i_length; + i_data = i_data_sav - i_length; + + int i_tag = IODGetBytes( &i_data, &p_data, 1 ); i_length = IODDescriptorLength( &i_data, &p_data ); i_data_sav = i_data; p_data_sav = p_data; - i_data = i_length; - - switch( i_tag ) - { - case 0x03: - { -#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 ); - i_flags = IODGetByte( &i_data, &p_data ); - es_descr.b_streamDependenceFlag = ( i_flags >> 7 )&0x01; - 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 - { - es_descr.psz_url = NULL; - } - - 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 ); - dec_descr.i_streamType = i_flags >> 2; - dec_descr.b_upStream = ( i_flags >> 1 )&0x01; - 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; - dec_descr.i_decoder_specific_info_len = - IODDescriptorLength( &i_data, &p_data ); - if( dec_descr.i_decoder_specific_info_len > 0 ) - { - dec_descr.p_decoder_specific_info = - malloc( dec_descr.i_decoder_specific_info_len ); - } - for( i = 0; i < dec_descr.i_decoder_specific_info_len; i++ ) - { - dec_descr.p_decoder_specific_info[i] = IODGetByte( &i_data, &p_data ); - } - } - else - { - dec_descr.i_decoder_specific_info_len = 0; - dec_descr.p_decoder_specific_info = NULL; - } - } -#undef dec_descr -#define sl_descr es_descr.sl_descr - { - int i_SLConfigDescr_length; - int i_predefined; - - 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: - { - sl_descr.b_useAccessUnitStartFlag = 0; - sl_descr.b_useAccessUnitEndFlag = 0; - sl_descr.b_useRandomAccessPointFlag = 0; - //sl_descr.b_useRandomAccessUnitsOnlyFlag = 0; - sl_descr.b_usePaddingFlag = 0; - sl_descr.b_useTimeStampsFlags = 0; - sl_descr.b_useIdleFlag = 0; - sl_descr.b_durationFlag = 0; // FIXME FIXME - sl_descr.i_timeStampResolution = 1000; - sl_descr.i_OCRResolution = 0; // FIXME FIXME - sl_descr.i_timeStampLength = 32; - sl_descr.i_OCRLength = 0; // FIXME FIXME - sl_descr.i_AU_Length = 0; - sl_descr.i_instantBitrateLength= 0; // FIXME FIXME - sl_descr.i_degradationPriorityLength= 0; - sl_descr.i_AU_seqNumLength = 0; - sl_descr.i_packetSeqNumLength = 0; - if( sl_descr.b_durationFlag ) - { - sl_descr.i_timeScale = 0; // FIXME FIXME - sl_descr.i_accessUnitDuration = 0; // FIXME FIXME - sl_descr.i_compositionUnitDuration= 0; // FIXME FIXME - } - if( !sl_descr.b_useTimeStampsFlags ) - { - sl_descr.i_startDecodingTimeStamp = 0; // FIXME FIXME - sl_descr.i_startCompositionTimeStamp= 0; // FIXME FIXME - } - } - break; - default: -#ifdef TS_DEBUG - fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" ); -#endif - es_descr.b_ok = 0; - break; - } + i_data = i_length; + + if ( i_tag != 0x03 ) + { + ts_debug( "\n* - OD tag:0x%x Unsupported", i_tag ); + continue; + } + + es_descr->i_es_id = IODGetBytes( &i_data, &p_data, 2 ); + int i_flags = IODGetBytes( &i_data, &p_data, 1 ); + bool b_streamDependenceFlag = ( i_flags >> 7 )&0x01; + if( b_streamDependenceFlag ) + IODGetBytes( &i_data, &p_data, 2 ); /* dependOn_es_id */ + + if( (i_flags >> 6) & 0x01 ) + es_descr->psz_url = IODGetURL( &i_data, &p_data ); + + bool b_OCRStreamFlag = ( i_flags >> 5 )&0x01; + if( b_OCRStreamFlag ) + IODGetBytes( &i_data, &p_data, 2 ); /* OCR_es_id */ + + if( IODGetBytes( &i_data, &p_data, 1 ) != 0x04 ) + { + ts_debug( "\n* ERR missing DecoderConfigDescr" ); + continue; + } + decoder_config_descriptor_t *dec_descr = &es_descr->dec_descr; + dec_descr->i_objectTypeIndication = IODGetBytes( &i_data, &p_data, 1 ); + i_flags = IODGetBytes( &i_data, &p_data, 1 ); + dec_descr->i_streamType = i_flags >> 2; + + IODGetBytes( &i_data, &p_data, 3); /* bufferSizeDB */ + IODGetBytes( &i_data, &p_data, 4); /* maxBitrate */ + IODGetBytes( &i_data, &p_data, 4 ); /* avgBitrate */ + + int i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data ); + if( i_decoderConfigDescr_length > 13 && IODGetBytes( &i_data, &p_data, 1 ) == 0x05 ) + { + dec_descr->i_extra = IODDescriptorLength( &i_data, &p_data ); + if( dec_descr->i_extra > 0 ) + { + dec_descr->p_extra = xmalloc( dec_descr->i_extra ); + memcpy(dec_descr->p_extra, p_data, dec_descr->i_extra); + p_data += dec_descr->i_extra; + i_data -= dec_descr->i_extra; } - break; -#undef sl_descr -#undef es_descr + } + else + { + dec_descr->i_extra = 0; + dec_descr->p_extra = NULL; + } + + if( IODGetBytes( &i_data, &p_data, 1 ) != 0x06 ) + { + ts_debug( "\n* ERR missing SLConfigDescr" ); + continue; + } + IODDescriptorLength( &i_data, &p_data ); /* SLConfigDescr_length */ + switch( IODGetBytes( &i_data, &p_data, 1 ) /* predefined */ ) + { default: -#ifdef TS_DEBUG - fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length ); -#endif + ts_debug( "\n* ERR unsupported SLConfigDescr predefined" ); + case 0x01: + // FIXME break; } - - p_data = p_data_sav + i_length; - i_data = i_data_sav - i_length; - i_es_index++; + es_descr->b_ok = true; } -#ifdef TS_DEBUG - fprintf( stderr, "\n*****************************\n" ); -#endif + return p_iod; } static void IODFree( iod_descriptor_t *p_iod ) { - int i; - if( p_iod->psz_url ) { free( p_iod->psz_url ); - p_iod->psz_url = NULL; free( p_iod ); return; } - for( i = 0; i < 255; i++ ) + for( int i = 0; i < 255; i++ ) { #define es_descr p_iod->es_descr[i] if( es_descr.b_ok ) { if( es_descr.psz_url ) - { free( es_descr.psz_url ); - es_descr.psz_url = NULL; - } else - { - free( es_descr.dec_descr.p_decoder_specific_info ); - es_descr.dec_descr.p_decoder_specific_info = NULL; - es_descr.dec_descr.i_decoder_specific_info_len = 0; - } + free( es_descr.dec_descr.p_extra ); } - es_descr.b_ok = 0; #undef es_descr } free( p_iod ); @@ -2585,19 +2717,17 @@ static bool ProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm ) { demux_sys_t *p_sys = p_demux->p_sys; - if( !p_sys->b_access_control ) - return false; - if( ( p_sys->i_current_program == -1 && p_sys->p_programs_list == NULL ) || + if( ( p_sys->i_current_program == -1 && p_sys->programs_list.i_count == 0 ) || p_sys->i_current_program == 0 ) return true; if( p_sys->i_current_program == i_pgrm ) return true; - if( p_sys->p_programs_list != NULL ) + if( p_sys->programs_list.i_count != 0 ) { - for( int i = 0; i < p_sys->p_programs_list->i_count; i++ ) + for( int i = 0; i < p_sys->programs_list.i_count; i++ ) { - if( i_pgrm == p_sys->p_programs_list->p_values[i].i_int ) + if( i_pgrm == p_sys->programs_list.p_values[i].i_int ) return true; } } @@ -2622,165 +2752,39 @@ static void ValidateDVBMeta( demux_t *p_demux, int i_pid ) ts_pid_t *p_pid = &p_sys->pid[i]; if( p_pid->psi ) { + +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + if( dvbpsi_decoder_present( p_pid->psi->handle )) + dvbpsi_DetachDemux( p_pid->psi->handle ); + dvbpsi_delete( p_pid->psi->handle ); +#else dvbpsi_DetachDemux( p_pid->psi->handle ); +#endif free( p_pid->psi ); p_pid->psi = NULL; p_pid->b_valid = false; } - if( p_sys->b_access_control ) - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, i, false ); - + SetPIDFilter( p_demux, i, false ); } p_sys->b_dvb_meta = false; } +#include "dvb-text.h" -#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, bool b_broken ) { - const char *psz_encoding; - char *psz_outstring; - char psz_encbuf[sizeof( "ISO_8859-123" )]; - size_t i_in, i_out, offset = 1; - vlc_iconv_t iconv_handle; - - if( i_length < 1 ) return NULL; - if( psz_instring[0] >= 0x20 ) - { - /* According to ETSI EN 300 468 Annex A, this should be ISO6937, - * but some broadcasters use different charset... */ - if( b_broken ) - psz_encoding = "ISO_8859-1"; - else - psz_encoding = "ISO_6937"; - - offset = 0; - } - else switch( psz_instring[0] ) - { - case 0x01: - psz_encoding = "ISO_8859-5"; - break; - case 0x02: - psz_encoding = "ISO_8859-6"; - break; - case 0x03: - psz_encoding = "ISO_8859-7"; - break; - case 0x04: - psz_encoding = "ISO_8859-8"; - break; - case 0x05: - psz_encoding = "ISO_8859-9"; - break; - case 0x06: - psz_encoding = "ISO_8859-10"; - break; - case 0x07: - psz_encoding = "ISO_8859-11"; - break; - case 0x08: - psz_encoding = "ISO_8859-12"; - break; - case 0x09: - psz_encoding = "ISO_8859-13"; - break; - case 0x0a: - psz_encoding = "ISO_8859-14"; - break; - case 0x0b: - psz_encoding = "ISO_8859-15"; - break; - case 0x10: -#warning Is Latin-10 (psz_instring[2] == 16) really illegal? - if( i_length < 3 || psz_instring[1] != 0x00 || psz_instring[2] > 15 - || psz_instring[2] == 0 ) - { - psz_encoding = "UTF-8"; - offset = 0; - } - else - { - sprintf( psz_encbuf, "ISO_8859-%u", psz_instring[2] ); - psz_encoding = psz_encbuf; - offset = 3; - } - break; - case 0x11: -#warning Is there a BOM or do we use a fixed endianess? - psz_encoding = "UTF-16"; - break; - case 0x12: - psz_encoding = "KSC5601-1987"; - break; - case 0x13: - psz_encoding = "GB2312"; /* GB-2312-1980 */ - break; - case 0x14: - psz_encoding = "BIG-5"; - break; - case 0x15: - psz_encoding = "UTF-8"; - break; - default: - /* invalid */ - psz_encoding = "UTF-8"; - offset = 0; - } - - i_in = i_length - offset; - i_out = i_in * 6 + 1; - - psz_outstring = malloc( i_out ); - if( !psz_outstring ) - { - return NULL; - } - - iconv_handle = vlc_iconv_open( "UTF-8", psz_encoding ); - if( iconv_handle == (vlc_iconv_t)(-1) ) - { - /* Invalid character set (e.g. ISO_8859-12) */ - memcpy( psz_outstring, &psz_instring[offset], i_in ); - psz_outstring[i_in] = '\0'; - EnsureUTF8( psz_outstring ); - } - else - { - const char *psz_in = (const char *)&psz_instring[offset]; - char *psz_out = psz_outstring; - - while( vlc_iconv( iconv_handle, &psz_in, &i_in, - &psz_out, &i_out ) == (size_t)(-1) ) - { - /* skip naughty byte. This may fail terribly for multibyte stuff, - * but what can we do anyway? */ - psz_in++; - i_in--; - vlc_iconv( iconv_handle, NULL, NULL, NULL, NULL ); /* reset */ - } - vlc_iconv_close( iconv_handle ); - - *psz_out = '\0'; - - /* Convert EIT-coded CR/LFs */ - unsigned char *pbuf = (unsigned char *)psz_outstring; - for( ; pbuf < (unsigned char *)psz_out ; pbuf++) - { - if( pbuf[0] == 0xc2 && pbuf[1] == 0x8a ) - { - pbuf[0] = ' '; - pbuf[1] = '\n'; - } - } - - - } - return psz_outstring; + /* Deal with no longer broken providers (no switch byte + but sending ISO_8859-1 instead of ISO_6937) without + removing them from the broken providers table + (keep the entry for correctly handling recorded TS). + */ + b_broken = b_broken && i_length && *psz_instring > 0x20; + + if( b_broken ) + return FromCharset( "ISO_8859-1", psz_instring, i_length ); + return vlc_from_EIT( psz_instring, i_length ); } static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) @@ -2801,7 +2805,12 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) 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, +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + p_sdt->i_extension, +#else + p_sdt->i_ts_id, +#endif + p_sdt->i_version, p_sdt->b_current_next, p_sdt->i_network_id ); p_sys->b_broken_charset = false; @@ -2820,9 +2829,6 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) p_srv->b_eit_present, p_srv->i_running_status, p_srv->b_free_ca ); - if( p_sys->i_current_program != -1 && p_sys->i_current_program != p_srv->i_service_id ) - continue; - p_meta = vlc_meta_New(); for( p_dr = p_srv->p_first_descriptor; p_dr; p_dr = p_dr->p_next ) { @@ -2868,7 +2874,7 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt ) { 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 ) ) + !strncmp( (char *)pD->i_service_provider_name, ppsz_broken_providers[i], i_length ) ) p_sys->b_broken_charset = true; } @@ -2924,7 +2930,6 @@ static int64_t vlc_timegm( int i_year, int i_month, int i_mday, int i_hour, int { 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 || @@ -2934,7 +2939,7 @@ static int64_t vlc_timegm( int i_year, int i_month, int i_mday, int i_hour, int /* 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++ ) + for( int i = 70; i < i_year; i++ ) i_day += LEAP(1900+i); if( i_month > 1 ) i_day += LEAP(1900+i_year); @@ -2979,7 +2984,6 @@ static int EITConvertDuration( uint32_t i_duration ) } #undef CVT_FROM_BCD -#ifdef TS_USE_TDT static void TDTCallBack( demux_t *p_demux, dvbpsi_tot_t *p_tdt ) { demux_sys_t *p_sys = p_demux->p_sys; @@ -2988,7 +2992,6 @@ static void TDTCallBack( demux_t *p_demux, dvbpsi_tot_t *p_tdt ) - mdate(); dvbpsi_DeleteTOT(p_tdt); } -#endif static void EITCallBack( demux_t *p_demux, @@ -2999,7 +3002,7 @@ static void EITCallBack( demux_t *p_demux, vlc_epg_t *p_epg; msg_Dbg( p_demux, "EITCallBack called" ); - if( !p_eit->b_current_next || ( p_sys->i_current_program != -1 && p_sys->i_current_program != p_eit->i_service_id ) ) + if( !p_eit->b_current_next ) { dvbpsi_DeleteEIT( p_eit ); return; @@ -3008,7 +3011,12 @@ static void EITCallBack( demux_t *p_demux, 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, +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + p_eit->i_extension, +#else + p_eit->i_service_id, +#endif + 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 ); @@ -3021,6 +3029,7 @@ static void EITCallBack( demux_t *p_demux, char *psz_extra = strdup(""); int64_t i_start; int i_duration; + int i_min_age = 0; i_start = EITConvertStartTime( p_evt->i_start_time ); i_duration = EITConvertDuration( p_evt->i_duration ); @@ -3099,6 +3108,24 @@ static void EITCallBack( demux_t *p_demux, } } } + else if( p_dr->i_tag == 0x55 ) + { + dvbpsi_parental_rating_dr_t *pR = dvbpsi_DecodeParentalRatingDr( p_dr ); + if ( pR ) + { + for ( int i = 0; i < pR->i_ratings_number; i++ ) + { + const dvbpsi_parental_rating_t *p_rating = & pR->p_parental_rating[ i ]; + if ( p_rating->i_rating > 0x00 && p_rating->i_rating <= 0x0F ) + { + if ( p_rating->i_rating + 3 > i_min_age ) + i_min_age = p_rating->i_rating + 3; + msg_Dbg( p_demux, "..* event parental control set to %d years", + i_min_age ); + } + } + } + } else { msg_Dbg( p_demux, " - tag=0x%x(%d)", p_dr->i_tag, p_dr->i_tag ); @@ -3108,7 +3135,7 @@ static void EITCallBack( demux_t *p_demux, /* */ if( i_start > 0 ) vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text, - *psz_extra ? psz_extra : NULL ); + *psz_extra ? psz_extra : NULL, i_min_age ); /* Update "now playing" field */ if( p_evt->i_running_status == 0x04 && i_start > 0 ) @@ -3123,7 +3150,13 @@ static void EITCallBack( demux_t *p_demux, { if( b_current_following && ( p_sys->i_current_program == -1 || - p_sys->i_current_program == p_eit->i_service_id ) ) + p_sys->i_current_program == +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + p_eit->i_extension +#else + p_eit->i_service_id +#endif + ) ) { p_sys->i_dvb_length = 0; p_sys->i_dvb_start = 0; @@ -3134,7 +3167,13 @@ static void EITCallBack( demux_t *p_demux, p_sys->i_dvb_length = CLOCK_FREQ * p_epg->p_current->i_duration; } } - es_out_Control( p_demux->out, ES_OUT_SET_GROUP_EPG, p_eit->i_service_id, p_epg ); + es_out_Control( p_demux->out, ES_OUT_SET_GROUP_EPG, +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + p_eit->i_extension, +#else + p_eit->i_service_id, +#endif + p_epg ); } vlc_epg_Delete( p_epg ); @@ -3149,9 +3188,15 @@ static void EITCallBackSchedule( demux_t *p_demux, dvbpsi_eit_t *p_eit ) EITCallBack( p_demux, p_eit, false ); } +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) +static void PSINewTableCallBack( dvbpsi_t *h, uint8_t i_table_id, + uint16_t i_extension, demux_t *p_demux ) +#else static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h, uint8_t i_table_id, uint16_t i_extension ) +#endif { + assert( h ); #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 ); @@ -3160,9 +3205,13 @@ static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h, { msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", i_table_id, i_table_id, i_extension, i_extension ); - +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + if( !dvbpsi_sdt_attach( h, i_table_id, i_extension, (dvbpsi_sdt_callback)SDTCallBack, p_demux ) ) + msg_Err( p_demux, "PSINewTableCallback: failed attaching SDTCallback" ); +#else dvbpsi_AttachSDT( h, i_table_id, i_extension, (dvbpsi_sdt_callback)SDTCallBack, p_demux ); +#endif } else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 && ( i_table_id == 0x4e || /* Current/Following */ @@ -3174,21 +3223,27 @@ static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h, dvbpsi_eit_callback cb = i_table_id == 0x4e ? (dvbpsi_eit_callback)EITCallBackCurrentFollowing : (dvbpsi_eit_callback)EITCallBackSchedule; +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + if( !dvbpsi_eit_attach( h, i_table_id, i_extension, cb, p_demux ) ) + msg_Err( p_demux, "PSINewTableCallback: failed attaching EITCallback" ); +#else dvbpsi_AttachEIT( h, i_table_id, i_extension, cb, p_demux ); +#endif } -#ifdef TS_USE_TDT else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 && i_table_id == 0x70 ) /* TDT */ { msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)", i_table_id, i_table_id, i_extension, i_extension ); +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + if( !dvbpsi_tot_attach( h, i_table_id, i_extension, (dvbpsi_tot_callback)TDTCallBack, p_demux ) ) + msg_Err( p_demux, "PSINewTableCallback: failed attaching TDTCallback" ); +#else dvbpsi_AttachTOT( h, i_table_id, i_extension, (dvbpsi_tot_callback)TDTCallBack, p_demux); - } #endif - + } } -#endif /***************************************************************************** * PMT callback and helpers @@ -3238,8 +3293,7 @@ static void PMTSetupEsISO14496( demux_t *p_demux, ts_pid_t *pid, { iod_descriptor_t *iod = prg->iod; - if( iod->es_descr[i].b_ok && - iod->es_descr[i].i_es_id == i_es_id ) + if( iod->es_descr[i].b_ok && iod->es_descr[i].i_es_id == i_es_id ) { pid->es->p_mpeg4desc = &iod->es_descr[i]; break; @@ -3319,14 +3373,12 @@ static void PMTSetupEsISO14496( demux_t *p_demux, ts_pid_t *pid, if( p_fmt->i_cat != UNKNOWN_ES ) { - p_fmt->i_extra = dcd->i_decoder_specific_info_len; + p_fmt->i_extra = dcd->i_extra; if( p_fmt->i_extra > 0 ) { p_fmt->p_extra = malloc( p_fmt->i_extra ); if( p_fmt->p_extra ) - memcpy( p_fmt->p_extra, - dcd->p_decoder_specific_info, - p_fmt->i_extra ); + memcpy( p_fmt->p_extra, dcd->p_extra, p_fmt->i_extra ); else p_fmt->i_extra = 0; } @@ -3349,9 +3401,9 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, ts_teletext_page_t p_page[2 * 64 + 20]; unsigned i_page = 0; - /* Gather pages informations */ + /* Gather pages information */ #if defined _DVBPSI_DR_56_H_ && \ - defined DVBPSI_VERSION && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5) + defined DVBPSI_VERSION && DVBPSI_VERSION_INT > DVBPSI_VERSION_WANTED(0,1,5) for( unsigned i_tag_idx = 0; i_tag_idx < 2; i_tag_idx++ ) { dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, i_tag_idx == 0 ? 0x46 : 0x56 ); @@ -3382,7 +3434,6 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, } #endif -#ifdef _DVBPSI_DR_59_H_ dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 ); if( p_dr ) { @@ -3414,7 +3465,6 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 ); } } -#endif /* */ es_format_Init( p_fmt, SPU_ES, VLC_CODEC_TELETEXT ); @@ -3465,19 +3515,20 @@ static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid, 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_data = NULL; + p_es->i_data_size = 0; + p_es->i_data_gathered = 0; + p_es->pp_last = &p_es->p_data; + p_es->data_type = TS_ES_DATA_PES; p_es->p_mpeg4desc = NULL; - p_es->b_gather = false; TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es ); } /* */ const ts_teletext_page_t *p = &p_page[i]; - p_es->fmt.i_priority = (p->i_type == 0x02 || p->i_type == 0x05) ? 0 : -1; + p_es->fmt.i_priority = (p->i_type == 0x02 || p->i_type == 0x05) ? + ES_PRIORITY_SELECTABLE_MIN : ES_PRIORITY_NOT_DEFAULTABLE; 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; @@ -3500,7 +3551,6 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 ); int i_page = 0; -#ifdef _DVBPSI_DR_59_H_ dvbpsi_subtitling_dr_t *p_sub = dvbpsi_DecodeSubtitlingDr( p_dr ); for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ ) { @@ -3509,7 +3559,6 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, ( i_type >= 0x20 && i_type <= 0x24 ) ) i_page++; } -#endif if( !p_demux->p_sys->b_split_es || i_page <= 0 ) { @@ -3529,7 +3578,6 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, } else { -#ifdef _DVBPSI_DR_59_H_ for( int i = 0; i < p_sub->i_subtitles_number; i++ ) { ts_es_t *p_es; @@ -3552,19 +3600,19 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, 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_data = NULL; + p_es->i_data_size = 0; + p_es->i_data_gathered = 0; + p_es->pp_last = &p_es->p_data; + p_es->data_type = TS_ES_DATA_PES; p_es->p_mpeg4desc = NULL; - p_es->b_gather = false; TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es ); } /* */ const dvbpsi_subtitle_t *p = &p_sub->p_subtitle[i]; - p_es->fmt.psz_language = strndup( p->i_iso6392_language_code, 3 ); + p_es->fmt.psz_language = strndup( (char *)p->i_iso6392_language_code, 3 ); switch( p->i_subtitling_type ) { case 0x10: /* unspec. */ @@ -3589,7 +3637,6 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, p_es->fmt.subs.dvb.i_id = ( p->i_composition_page_id << 0 ) | ( p->i_ancillary_page_id << 16 ); } -#endif } } static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid, @@ -3630,7 +3677,6 @@ static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid, /* Subtitle/Teletext/VBI fallbacks */ dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 ); -#ifdef _DVBPSI_DR_59_H_ dvbpsi_subtitling_dr_t *p_sub; if( p_dr && ( p_sub = dvbpsi_DecodeSubtitlingDr( p_dr ) ) ) { @@ -3665,10 +3711,7 @@ static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid, } } } -#else - if( p_fmt->i_cat == UNKNOWN_ES && p_dr ) - PMTSetupEsDvbSubtitle( p_demux, pid, p_es ); -#endif + if( p_fmt->i_cat == UNKNOWN_ES && ( PMTEsFindDescriptor( p_es, 0x45 ) || /* VBI Data descriptor */ PMTEsFindDescriptor( p_es, 0x46 ) || /* VBI Teletext descriptor */ @@ -3679,7 +3722,6 @@ static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid, } } -#ifdef _DVBPSI_DR_52_H_ /* FIXME is it useful ? */ if( PMTEsFindDescriptor( p_es, 0x52 ) ) { @@ -3688,7 +3730,6 @@ static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid, msg_Dbg( p_demux, " * Stream Component Identifier: %d", p_si->i_component_tag ); } -#endif } static void PMTSetupEs0xEA( demux_t *p_demux, ts_pid_t *pid, @@ -3766,10 +3807,8 @@ static void PMTSetupEs0xA0( demux_t *p_demux, ts_pid_t *pid, p_fmt->b_packetized = true; } -static void PMTSetupEsHDMV( demux_t *p_demux, ts_pid_t *pid, - const dvbpsi_pmt_es_t *p_es ) +static void PMTSetupEsHDMV( ts_pid_t *pid, const dvbpsi_pmt_es_t *p_es ) { - VLC_UNUSED(p_demux); es_format_t *p_fmt = &pid->es->fmt; /* Blu-Ray mapping */ @@ -3834,11 +3873,29 @@ static void PMTSetupEsRegistration( demux_t *p_demux, ts_pid_t *pid, { p_fmt->i_cat = p_regs[i].i_cat; p_fmt->i_codec = p_regs[i].i_codec; - break; + if (p_es->i_type == 0x87) + p_fmt->i_codec = VLC_CODEC_EAC3; + return; } } } +static char *GetAudioTypeDesc(demux_t *p_demux, int type) +{ + static const char *audio_type[] = { + NULL, + N_("clean effects"), + N_("hearing impaired"), + N_("visual impaired commentary"), + }; + + if (type < 0 || type > 3) + msg_Dbg( p_demux, "unknown audio type: %d", type); + else if (type > 0) + return strdup(audio_type[type]); + + return NULL; +} static void PMTParseEsIso639( demux_t *p_demux, ts_pid_t *pid, const dvbpsi_pmt_es_t *p_es ) { @@ -3859,34 +3916,15 @@ static void PMTParseEsIso639( demux_t *p_demux, ts_pid_t *pid, pid->es->fmt.psz_language = malloc( 4 ); if( pid->es->fmt.psz_language ) { - memcpy( pid->es->fmt.psz_language, - p_decoded->code[0].iso_639_code, 3 ); + memcpy( pid->es->fmt.psz_language, p_decoded->code[0].iso_639_code, 3 ); pid->es->fmt.psz_language[3] = 0; msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language); } - switch( p_decoded->code[0].i_audio_type ) - { - case 0: - 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; - } + int type = p_decoded->code[0].i_audio_type; + pid->es->fmt.psz_description = GetAudioTypeDesc(p_demux, type); + if (type == 0) + pid->es->fmt.i_priority = ES_PRIORITY_SELECTABLE_MIN + 1; // prioritize normal audio tracks + 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 = @@ -3896,40 +3934,15 @@ static void PMTParseEsIso639( demux_t *p_demux, ts_pid_t *pid, { for( int i = 0; i < pid->es->fmt.i_extra_languages; i++ ) { - msg_Dbg( p_demux, "bang" ); - pid->es->fmt.p_extra_languages[i].psz_language = - malloc(4); + pid->es->fmt.p_extra_languages[i].psz_language = malloc(4); if( pid->es->fmt.p_extra_languages[i].psz_language ) { memcpy( pid->es->fmt.p_extra_languages[i].psz_language, p_decoded->code[i+1].iso_639_code, 3 ); pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0'; } - switch( p_decoded->code[i].i_audio_type ) - { - case 0: - pid->es->fmt.p_extra_languages[i].psz_description = - NULL; - break; - case 1: - pid->es->fmt.p_extra_languages[i].psz_description = - strdup(_("clean effects")); - break; - case 2: - pid->es->fmt.p_extra_languages[i].psz_description = - strdup(_("hearing impaired")); - break; - case 3: - pid->es->fmt.p_extra_languages[i].psz_description = - strdup(_("visual impaired commentary")); - break; - default: - msg_Dbg( p_demux, "unknown audio type: %d", - p_decoded->code[i].i_audio_type); - pid->es->fmt.psz_description = NULL; - break; - } - + int type = p_decoded->code[i].i_audio_type; + pid->es->fmt.p_extra_languages[i].psz_description = GetAudioTypeDesc(p_demux, type); } } #else @@ -3943,38 +3956,28 @@ static void PMTParseEsIso639( demux_t *p_demux, ts_pid_t *pid, #endif } -static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) +static void PMTCallBack( void *data, dvbpsi_pmt_t *p_pmt ) { - demux_sys_t *p_sys = p_demux->p_sys; - dvbpsi_descriptor_t *p_dr; - dvbpsi_pmt_es_t *p_es; - - ts_pid_t *pmt = NULL; - ts_prg_psi_t *prg = NULL; + demux_t *p_demux = data; + demux_sys_t *p_sys = p_demux->p_sys; - ts_pid_t **pp_clean = NULL; - int i_clean = 0; - bool b_hdmv = false; + ts_pid_t *pmt = NULL; + ts_prg_psi_t *prg; msg_Dbg( p_demux, "PMTCallBack called" ); /* First find this PMT declared in PAT */ - for( int i = 0; i < p_sys->i_pmt; i++ ) - { - int i_prg; - for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ ) + for( int i = 0; !pmt && i < p_sys->i_pmt; i++ ) + for( int i_prg = 0; !pmt && i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ ) { const int i_pmt_number = p_sys->pmt[i]->psi->prg[i_prg]->i_number; - if( i_pmt_number != TS_USER_PMT_NUMBER && i_pmt_number == p_pmt->i_program_number ) + if( i_pmt_number != TS_USER_PMT_NUMBER && + i_pmt_number == p_pmt->i_program_number ) { pmt = p_sys->pmt[i]; prg = p_sys->pmt[i]->psi->prg[i_prg]; - break; } } - if( pmt ) - break; - } if( pmt == NULL ) { @@ -3983,6 +3986,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) return; } + if( prg->i_version != -1 && ( !p_pmt->b_current_next || prg->i_version == p_pmt->i_version ) ) { @@ -3990,6 +3994,8 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) return; } + ts_pid_t **pp_clean = NULL; + int i_clean = 0; /* Clean this program (remove all es) */ for( int i = 0; i < 8192; i++ ) { @@ -4014,38 +4020,25 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ValidateDVBMeta( p_demux, prg->i_pid_pcr ); if( ProgramIsSelected( p_demux, prg->i_number ) ) - { - /* Set demux filter */ - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, prg->i_pid_pcr, - true ); - } - else if ( p_sys->b_access_control ) - { - msg_Warn( p_demux, "skipping program (not selected)" ); - dvbpsi_DeletePMT(p_pmt); - return; - } + SetPIDFilter( p_demux, prg->i_pid_pcr, true ); /* Set demux filter */ /* Parse descriptor */ + bool b_hdmv = false; + dvbpsi_descriptor_t *p_dr; for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next ) - { - if( p_dr->i_tag == 0x1d ) + switch(p_dr->i_tag) { - /* We have found an IOD descriptor */ + case 0x1d: /* We have found an IOD descriptor */ msg_Dbg( p_demux, " * descriptor : IOD (0x1d)" ); - prg->iod = IODNew( p_dr->i_length, p_dr->p_data ); - } - else if( p_dr->i_tag == 0x9 ) - { - uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8) - | p_dr->p_data[1]; - msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", i_sysid ); - } - else if( p_dr->i_tag == 0x05 ) - { - /* Registration Descriptor */ + break; + + case 0x9: + msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", + (p_dr->p_data[0] << 8) | p_dr->p_data[1] ); + break; + + case 0x5: /* Registration Descriptor */ if( p_dr->i_length != 4 ) { msg_Warn( p_demux, "invalid Registration Descriptor" ); @@ -4053,19 +4046,16 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) else { msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data ); - if( !memcmp( p_dr->p_data, "HDMV", 4 ) ) - { - /* Blu-Ray */ - b_hdmv = true; - } + if( !memcmp( p_dr->p_data, "HDMV", 4 ) || !memcmp( p_dr->p_data, "HDPR", 4 ) ) + b_hdmv = true; /* Blu-Ray */ } - } - else - { + break; + + default: msg_Dbg( p_demux, " * descriptor : unknown (0x%x)", p_dr->i_tag ); } - } + dvbpsi_pmt_es_t *p_es; for( p_es = p_pmt->p_first_es; p_es != NULL; p_es = p_es->p_next ) { ts_pid_t tmp_pid, *old_pid = 0, *pid = &tmp_pid; @@ -4096,7 +4086,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) } PIDInit( pid, false, pmt->psi ); - PIDFillFormat( pid, p_es->i_type ); + PIDFillFormat( pid->es, p_es->i_type ); pid->i_owner_number = prg->i_number; pid->i_pid = p_es->i_pid; pid->b_seen = p_sys->pid[p_es->i_pid].b_seen; @@ -4108,7 +4098,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) } else if( p_es->i_type == 0x06 ) { - PMTSetupEs0x06( p_demux, pid, p_es ); + PMTSetupEs0x06( p_demux, pid, p_es ); } else if( p_es->i_type == 0xEA ) { @@ -4124,7 +4114,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) } else if( b_hdmv ) { - PMTSetupEsHDMV( p_demux, pid, p_es ); + PMTSetupEsHDMV( pid, p_es ); } else if( p_es->i_type >= 0x80 ) { @@ -4168,23 +4158,19 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) !strcmp( pid->es->fmt.psz_language, old_pid->es->fmt.psz_language ) ) ) ) { - pid->es->id = old_pid->es->id; - old_pid->es->id = NULL; + pid->i_cc = old_pid->i_cc; + ts_es_t *e = pid->es; + pid->es = old_pid->es; + old_pid->es = e; for( int 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; + e = pid->extra_es[i]; + pid->extra_es[i] = old_pid->extra_es[i]; + old_pid->extra_es[i] = e; } } else { - if( old_pid ) - { - PIDClean( p_demux, old_pid ); - TAB_REMOVE( i_clean, pp_clean, old_pid ); - old_pid = 0; - } - pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt ); for( int i = 0; i < pid->i_extra_es; i++ ) { @@ -4206,35 +4192,25 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) p_dr = PMTEsFindDescriptor( p_es, 0x09 ); if( p_dr && p_dr->i_length >= 2 ) { - uint16_t i_sysid = (p_dr->p_data[0] << 8) | p_dr->p_data[1]; msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", - i_sysid ); + (p_dr->p_data[0] << 8) | p_dr->p_data[1] ); } if( ProgramIsSelected( p_demux, prg->i_number ) && ( pid->es->id != NULL || p_sys->b_udp_out ) ) - { - /* Set demux filter */ - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, p_es->i_pid, - true ); - } + SetPIDFilter( p_demux, p_es->i_pid, true ); /* Set demux filter */ } /* Set CAM descrambling */ if( !ProgramIsSelected( p_demux, prg->i_number ) - || stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_CA, p_pmt ) != VLC_SUCCESS ) + || stream_Control( p_demux->s, STREAM_SET_PRIVATE_ID_CA, + p_pmt ) != VLC_SUCCESS ) dvbpsi_DeletePMT( p_pmt ); for( int i = 0; i < i_clean; i++ ) { if( ProgramIsSelected( p_demux, prg->i_number ) ) - { - stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, pp_clean[i]->i_pid, - false ); - } + SetPIDFilter( p_demux, pp_clean[i]->i_pid, false ); PIDClean( p_demux, pp_clean[i] ); } @@ -4242,8 +4218,9 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) free( pp_clean ); } -static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) +static void PATCallBack( void *data, dvbpsi_pat_t *p_pat ) { + demux_t *p_demux = data; demux_sys_t *p_sys = p_demux->p_sys; dvbpsi_pat_program_t *p_program; ts_pid_t *pat = &p_sys->pid[0]; @@ -4274,29 +4251,21 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) ts_pid_t *pmt = p_sys->pmt[i]; bool b_keep = false; - for( p_program = p_pat->p_first_program; p_program != NULL; + for( p_program = p_pat->p_first_program; !b_keep && p_program; p_program = p_program->p_next ) { - if( p_program->i_pid == pmt->i_pid ) - { - for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) - { - if( p_program->i_number == - pmt->psi->prg[i_prg]->i_number ) - { - b_keep = true; - break; - } - } - if( b_keep ) - break; - } - } + if( p_program->i_pid != pmt->i_pid ) + continue; - if( !b_keep ) - { - TAB_APPEND( i_pmt_rm, pmt_rm, pmt ); + for( int i_prg = 0; !b_keep && i_prg < pmt->psi->i_prg; i_prg++ ) + if( p_program->i_number == pmt->psi->prg[i_prg]->i_number ) + b_keep = true; } + + if( b_keep ) + continue; + + TAB_APPEND( i_pmt_rm, pmt_rm, pmt ); } /* Delete all ES attached to thoses PMT */ @@ -4315,13 +4284,8 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) if( pid->p_owner->prg[i_prg]->i_pid_pmt != pmt_rm[j]->i_pid ) continue; - if( p_sys->b_access_control && pid->es->id ) - { - if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, i, - false ) ) - p_sys->b_access_control = false; - } + if( pid->es->id ) + SetPIDFilter( p_demux, i, false ); PIDClean( p_demux, pid ); break; @@ -4332,22 +4296,17 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) /* Delete PMT pid */ for( int i = 0; i < i_pmt_rm; i++ ) { - if( p_sys->b_access_control ) - { - if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, - pmt_rm[i]->i_pid, false ) ) - p_sys->b_access_control = false; - } + ts_pid_t *pid = pmt_rm[i]; + SetPIDFilter( p_demux, pid->i_pid, false ); - for( int i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ ) + for( int i_prg = 0; i_prg < pid->psi->i_prg; i_prg++ ) { - const int i_number = pmt_rm[i]->psi->prg[i_prg]->i_number; + const int i_number = pid->psi->prg[i_prg]->i_number; es_out_Control( p_demux->out, ES_OUT_DEL_GROUP, i_number ); } - PIDClean( p_demux, &p_sys->pid[pmt_rm[i]->i_pid] ); - TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] ); + PIDClean( p_demux, &p_sys->pid[pid->i_pid] ); + TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pid ); } free( pmt_rm ); @@ -4359,57 +4318,55 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) { msg_Dbg( p_demux, " * number=%d pid=%d", p_program->i_number, p_program->i_pid ); - if( p_program->i_number != 0 ) + if( p_program->i_number == 0 ) + continue; + + ts_pid_t *pmt = &p_sys->pid[p_program->i_pid]; + + ValidateDVBMeta( p_demux, p_program->i_pid ); + + if( pmt->b_valid ) { - ts_pid_t *pmt = &p_sys->pid[p_program->i_pid]; bool b_add = true; + for( int i_prg = 0; b_add && i_prg < pmt->psi->i_prg; i_prg++ ) + if( pmt->psi->prg[i_prg]->i_number == p_program->i_number ) + b_add = false; - ValidateDVBMeta( p_demux, p_program->i_pid ); + if( !b_add ) + continue; + } + else + { + TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt ); + } - if( pmt->b_valid ) - { - int i_prg; - for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ ) - { - if( pmt->psi->prg[i_prg]->i_number == p_program->i_number ) - { - b_add = false; - break; - } - } - } - else - { - TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt ); - } + PIDInit( pmt, true, pat->psi ); + ts_prg_psi_t *prg = pmt->psi->prg[pmt->psi->i_prg-1]; +#if (DVBPSI_VERSION_INT >= DVBPSI_VERSION_WANTED(1,0,0)) + prg->handle = dvbpsi_new( &dvbpsi_messages, DVBPSI_MSG_DEBUG ); + if( !prg->handle ) + { + dvbpsi_DeletePAT( p_pat ); + return; + } + prg->handle->p_sys = (void *) VLC_OBJECT(p_demux); + if( !dvbpsi_pmt_attach( prg->handle, p_program->i_number, PMTCallBack, p_demux ) ) + msg_Err( p_demux, "PATCallback failed attaching PMTCallback to program %d", + p_program->i_number ); +#else + prg->handle = dvbpsi_AttachPMT( p_program->i_number, PMTCallBack, p_demux ); +#endif + prg->i_number = p_program->i_number; + prg->i_pid_pmt = p_program->i_pid; - if( b_add ) - { - PIDInit( pmt, true, pat->psi ); - pmt->psi->prg[pmt->psi->i_prg-1]->handle = - dvbpsi_AttachPMT( p_program->i_number, - (dvbpsi_pmt_callback)PMTCallBack, - p_demux ); - pmt->psi->prg[pmt->psi->i_prg-1]->i_number = - p_program->i_number; - pmt->psi->prg[pmt->psi->i_prg-1]->i_pid_pmt = - p_program->i_pid; - - /* Now select PID at access level */ - if( p_sys->b_access_control ) - { - if( ProgramIsSelected( p_demux, p_program->i_number ) ) - { - if( p_sys->i_current_program == 0 ) - p_sys->i_current_program = p_program->i_number; + /* Now select PID at access level */ + if( ProgramIsSelected( p_demux, p_program->i_number ) ) + { + if( p_sys->i_current_program == 0 ) + p_sys->i_current_program = p_program->i_number; - if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, - ACCESS_SET_PRIVATE_ID_STATE, - p_program->i_pid, true ) ) - p_sys->b_access_control = false; - } - } - } + if( SetPIDFilter( p_demux, p_program->i_pid, true ) ) + p_sys->b_access_control = false; } } pat->psi->i_pat_version = p_pat->i_version;