git.sesse.net Git - vlc/blob - modules/demux/ts.c

   1 /*****************************************************************************
   2  * ts.c: Transport Stream input module for VLC.
   3  *****************************************************************************
   4  * Copyright (C) 2004-2005 the VideoLAN team
   5  * $Id$
   6  *
   7  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
   8  *          Jean-Paul Saman <jpsaman #_at_# m2x.nl>
   9  *
  10  * This program is free software; you can redistribute it and/or modify
  11  * it under the terms of the GNU General Public License as published by
  12  * the Free Software Foundation; either version 2 of the License, or
  13  * (at your option) any later version.
  14  *
  15  * This program is distributed in the hope that it will be useful,
  16  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  17  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  18  * GNU General Public License for more details.
  19  *
  20  * You should have received a copy of the GNU General Public License
  21  * along with this program; if not, write to the Free Software
  22  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  23  *****************************************************************************/
  24
  25 /*****************************************************************************
  26  * Preamble
  27  *****************************************************************************/
  28
  29 #ifdef HAVE_CONFIG_H
  30 # include "config.h"
  31 #endif
  32
  33 #include <vlc_common.h>
  34 #include <vlc_plugin.h>
  35
  36 #include <assert.h>
  37
  38 #include <vlc_access.h> /* DVB-specific things */
  39 #include <vlc_demux.h>
  40 #include <vlc_meta.h>
  41 #include <vlc_epg.h>
  42
  43 #include <vlc_iso_lang.h>
  44 #include <vlc_network.h>
  45 #include <vlc_charset.h>
  46 #include <vlc_fs.h>
  47
  48 #include "../mux/mpeg/csa.h"
  49
  50 /* Include dvbpsi headers */
  51 #ifdef HAVE_DVBPSI_DR_H
  52 #   include <dvbpsi/dvbpsi.h>
  53 #   include <dvbpsi/demux.h>
  54 #   include <dvbpsi/descriptor.h>
  55 #   include <dvbpsi/pat.h>
  56 #   include <dvbpsi/pmt.h>
  57 #   include <dvbpsi/sdt.h>
  58 #   include <dvbpsi/dr.h>
  59 #   include <dvbpsi/psi.h>
  60 #else
  61 #   include "dvbpsi.h"
  62 #   include "demux.h"
  63 #   include "descriptor.h"
  64 #   include "tables/pat.h"
  65 #   include "tables/pmt.h"
  66 #   include "tables/sdt.h"
  67 #   include "descriptors/dr.h"
  68 #   include "psi.h"
  69 #endif
  70
  71 /* EIT support */
  72 #ifdef _DVBPSI_DR_4D_H_
  73 #   define TS_USE_DVB_SI 1
  74 #   ifdef HAVE_DVBPSI_DR_H
  75 #       include <dvbpsi/eit.h>
  76 #   else
  77 #       include "tables/eit.h"
  78 #   endif
  79 #endif
  80
  81 /* TDT support */
  82 #ifdef _DVBPSI_DR_58_H_
  83 #   define TS_USE_TDT 1
  84 #   ifdef HAVE_DVBPSI_DR_H
  85 #       include <dvbpsi/tot.h>
  86 #   else
  87 #       include "tables/tot.h"
  88 #   endif
  89 #else
  90 #   include <time.h>
  91 #endif
  92
  93 #undef TS_DEBUG
  94
  95 /*****************************************************************************
  96  * Module descriptor
  97  *****************************************************************************/
  98 static int  Open  ( vlc_object_t * );
  99 static void Close ( vlc_object_t * );
 100
 101 /* TODO
 102  * - Rename "extra pmt" to "user pmt"
 103  * - Update extra pmt description
 104  *      pmt_pid[:pmt_number][=pid_description[,pid_description]]
 105  *      where pid_description could take 3 forms:
 106  *          1. pid:pcr (to force the pcr pid)
 107  *          2. pid:stream_type
 108  *          3. pid:type=fourcc where type=(video|audio|spu)
 109  */
 110 #define PMT_TEXT N_("Extra PMT")
 111 #define PMT_LONGTEXT N_( \
 112   "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." )
 113
 114 #define PID_TEXT N_("Set id of ES to PID")
 115 #define PID_LONGTEXT N_("Set the internal ID of each elementary stream" \
 116                        " handled by VLC to the same value as the PID in" \
 117                        " the TS stream, instead of 1, 2, 3, etc. Useful to" \
 118                        " do \'#duplicate{..., select=\"es=<pid>\"}\'.")
 119
 120 #define TSOUT_TEXT N_("Fast udp streaming")
 121 #define TSOUT_LONGTEXT N_( \
 122   "Sends TS to specific ip:port by udp (you must know what you are doing).")
 123
 124 #define MTUOUT_TEXT N_("MTU for out mode")
 125 #define MTUOUT_LONGTEXT N_("MTU for out mode.")
 126
 127 #define CSA_TEXT N_("CSA ck")
 128 #define CSA_LONGTEXT N_("Control word for the CSA encryption algorithm")
 129
 130 #define CSA2_TEXT N_("Second CSA Key")
 131 #define CSA2_LONGTEXT N_("The even CSA encryption key. This must be a " \
 132   "16 char string (8 hexadecimal bytes).")
 133
 134 #define SILENT_TEXT N_("Silent mode")
 135 #define SILENT_LONGTEXT N_("Do not complain on encrypted PES.")
 136
 137 #define CAPMT_SYSID_TEXT N_("CAPMT System ID")
 138 #define CAPMT_SYSID_LONGTEXT N_("Only forward descriptors from this SysID to the CAM.")
 139
 140 #define CPKT_TEXT N_("Packet size in bytes to decrypt")
 141 #define CPKT_LONGTEXT N_("Specify the size of the TS packet to decrypt. " \
 142     "The decryption routines subtract the TS-header from the value before " \
 143     "decrypting. " )
 144
 145 #define TSDUMP_TEXT N_("Filename of dump")
 146 #define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in.")
 147
 148 #define APPEND_TEXT N_("Append")
 149 #define APPEND_LONGTEXT N_( \
 150     "If the file exists and this option is selected, the existing file " \
 151     "will not be overwritten." )
 152
 153 #define DUMPSIZE_TEXT N_("Dump buffer size")
 154 #define DUMPSIZE_LONGTEXT N_( \
 155     "Tweak the buffer size for reading and writing an integer number of packets." \
 156     "Specify the size of the buffer here and not the number of packets." )
 157
 158 #define SPLIT_ES_TEXT N_("Separate sub-streams")
 159 #define SPLIT_ES_LONGTEXT N_( \
 160     "Separate teletex/dvbs pages into independent ES. " \
 161     "It can be useful to turn off this option when using stream output." )
 162
 163 vlc_module_begin ()
 164     set_description( N_("MPEG Transport Stream demuxer") )
 165     set_shortname ( "MPEG-TS" )
 166     set_category( CAT_INPUT )
 167     set_subcategory( SUBCAT_INPUT_DEMUX )
 168
 169     add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, true )
 170     add_bool( "ts-es-id-pid", true, NULL, PID_TEXT, PID_LONGTEXT, true )
 171     add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true )
 172     add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT,
 173                  MTUOUT_LONGTEXT, true )
 174     add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true )
 175     add_string( "ts-csa2-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true )
 176     add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true )
 177     add_bool( "ts-silent", false, NULL, SILENT_TEXT, SILENT_LONGTEXT, true )
 178
 179     add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, false )
 180     add_bool( "ts-dump-append", false, NULL, APPEND_TEXT, APPEND_LONGTEXT, false )
 181     add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT,
 182                  DUMPSIZE_LONGTEXT, true )
 183     add_bool( "ts-split-es", true, NULL, SPLIT_ES_TEXT, SPLIT_ES_LONGTEXT, false )
 184
 185     set_capability( "demux", 10 )
 186     set_callbacks( Open, Close )
 187     add_shortcut( "ts" )
 188 vlc_module_end ()
 189
 190 /*****************************************************************************
 191  * Local prototypes
 192  *****************************************************************************/
 193 static const char *const ppsz_teletext_type[] = {
 194  "",
 195  N_("Teletext"),
 196  N_("Teletext subtitles"),
 197  N_("Teletext: additional information"),
 198  N_("Teletext: program schedule"),
 199  N_("Teletext subtitles: hearing impaired")
 200 };
 201
 202 typedef struct
 203 {
 204     uint8_t                 i_objectTypeIndication;
 205     uint8_t                 i_streamType;
 206     bool                    b_upStream;
 207     uint32_t                i_bufferSizeDB;
 208     uint32_t                i_maxBitrate;
 209     uint32_t                i_avgBitrate;
 210
 211     int                     i_decoder_specific_info_len;
 212     uint8_t                 *p_decoder_specific_info;
 213
 214 } decoder_config_descriptor_t;
 215
 216 typedef struct
 217 {
 218     bool                    b_useAccessUnitStartFlag;
 219     bool                    b_useAccessUnitEndFlag;
 220     bool                    b_useRandomAccessPointFlag;
 221     bool                    b_useRandomAccessUnitsOnlyFlag;
 222     bool                    b_usePaddingFlag;
 223     bool                    b_useTimeStampsFlags;
 224     bool                    b_useIdleFlag;
 225     bool                    b_durationFlag;
 226     uint32_t                i_timeStampResolution;
 227     uint32_t                i_OCRResolution;
 228     uint8_t                 i_timeStampLength;
 229     uint8_t                 i_OCRLength;
 230     uint8_t                 i_AU_Length;
 231     uint8_t                 i_instantBitrateLength;
 232     uint8_t                 i_degradationPriorityLength;
 233     uint8_t                 i_AU_seqNumLength;
 234     uint8_t                 i_packetSeqNumLength;
 235
 236     uint32_t                i_timeScale;
 237     uint16_t                i_accessUnitDuration;
 238     uint16_t                i_compositionUnitDuration;
 239
 240     uint64_t                i_startDecodingTimeStamp;
 241     uint64_t                i_startCompositionTimeStamp;
 242
 243 } sl_config_descriptor_t;
 244
 245 typedef struct
 246 {
 247     bool                    b_ok;
 248     uint16_t                i_es_id;
 249
 250     bool                    b_streamDependenceFlag;
 251     bool                    b_OCRStreamFlag;
 252     uint8_t                 i_streamPriority;
 253
 254     char                    *psz_url;
 255
 256     uint16_t                i_dependOn_es_id;
 257     uint16_t                i_OCR_es_id;
 258
 259     decoder_config_descriptor_t    dec_descr;
 260     sl_config_descriptor_t         sl_descr;
 261
 262 } es_mpeg4_descriptor_t;
 263
 264 typedef struct
 265 {
 266     uint8_t                 i_iod_label, i_iod_label_scope;
 267
 268     /* IOD */
 269     uint16_t                i_od_id;
 270     char                    *psz_url;
 271
 272     uint8_t                 i_ODProfileLevelIndication;
 273     uint8_t                 i_sceneProfileLevelIndication;
 274     uint8_t                 i_audioProfileLevelIndication;
 275     uint8_t                 i_visualProfileLevelIndication;
 276     uint8_t                 i_graphicsProfileLevelIndication;
 277
 278     es_mpeg4_descriptor_t   es_descr[255];
 279
 280 } iod_descriptor_t;
 281
 282 typedef struct
 283 {
 284     dvbpsi_handle   handle;
 285
 286     int             i_version;
 287     int             i_number;
 288     int             i_pid_pcr;
 289     int             i_pid_pmt;
 290     /* IOD stuff (mpeg4) */
 291     iod_descriptor_t *iod;
 292
 293 } ts_prg_psi_t;
 294
 295 typedef struct
 296 {
 297     /* for special PAT/SDT case */
 298     dvbpsi_handle   handle; /* PAT/SDT/EIT */
 299     int             i_pat_version;
 300     int             i_sdt_version;
 301
 302     /* For PMT */
 303     int             i_prg;
 304     ts_prg_psi_t    **prg;
 305
 306 } ts_psi_t;
 307
 308 typedef struct
 309 {
 310     es_format_t  fmt;
 311     es_out_id_t *id;
 312     int         i_pes_size;
 313     int         i_pes_gathered;
 314     block_t     *p_pes;
 315     block_t     **pp_last;
 316
 317     es_mpeg4_descriptor_t *p_mpeg4desc;
 318     int         b_gather;
 319
 320 } ts_es_t;
 321
 322 typedef struct
 323 {
 324     int         i_pid;
 325
 326     bool        b_seen;
 327     bool        b_valid;
 328     int         i_cc;   /* countinuity counter */
 329     bool        b_scrambled;
 330
 331     /* PSI owner (ie PMT -> PAT, ES -> PMT */
 332     ts_psi_t   *p_owner;
 333     int         i_owner_number;
 334
 335     /* */
 336     ts_psi_t    *psi;
 337     ts_es_t     *es;
 338
 339     /* Some private streams encapsulate several ES (eg. DVB subtitles)*/
 340     ts_es_t     **extra_es;
 341     int         i_extra_es;
 342
 343 } ts_pid_t;
 344
 345 struct demux_sys_t
 346 {
 347     vlc_mutex_t     csa_lock;
 348
 349     /* TS packet size (188, 192, 204) */
 350     int         i_packet_size;
 351
 352     /* how many TS packet we read at once */
 353     int         i_ts_read;
 354
 355     /* All pid */
 356     ts_pid_t    pid[8192];
 357
 358     /* All PMT */
 359     bool        b_user_pmt;
 360     int         i_pmt;
 361     ts_pid_t    **pmt;
 362     int         i_pmt_es;
 363
 364     /* */
 365     bool        b_es_id_pid;
 366     csa_t       *csa;
 367     int         i_csa_pkt_size;
 368     bool        b_silent;
 369     bool        b_split_es;
 370
 371     bool        b_udp_out;
 372     int         fd; /* udp socket */
 373     uint8_t     *buffer;
 374
 375     /* */
 376     bool        b_access_control;
 377
 378     /* */
 379     bool        b_dvb_meta;
 380     int64_t     i_tdt_delta;
 381     int64_t     i_dvb_start;
 382     int64_t     i_dvb_length;
 383     bool        b_broken_charset; /* True if broken encoding is used in EPG/SDT */
 384
 385     /* */
 386     int         i_current_program;
 387     vlc_list_t  programs_list;
 388
 389     /* TS dump */
 390     char        *psz_file;  /* file to dump data in */
 391     FILE        *p_file;    /* filehandle */
 392     uint64_t    i_write;    /* bytes written */
 393     bool        b_file_out; /* dump mode enabled */
 394
 395     /* */
 396     bool        b_start_record;
 397 };
 398
 399 static int Demux    ( demux_t *p_demux );
 400 static int DemuxFile( demux_t *p_demux );
 401 static int Control( demux_t *p_demux, int i_query, va_list args );
 402
 403 static void PIDInit ( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner );
 404 static void PIDClean( demux_t *, ts_pid_t *pid );
 405 static int  PIDFillFormat( ts_pid_t *pid, int i_stream_type );
 406
 407 static void PATCallBack( demux_t *, dvbpsi_pat_t * );
 408 static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt );
 409 #ifdef TS_USE_DVB_SI
 410 static void PSINewTableCallBack( demux_t *, dvbpsi_handle,
 411                                  uint8_t  i_table_id, uint16_t i_extension );
 412 #endif
 413 static int ChangeKeyCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * );
 414
 415 static inline int PIDGet( block_t *p )
 416 {
 417     return ( (p->p_buffer[1]&0x1f)<<8 )|p->p_buffer[2];
 418 }
 419
 420 static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk );
 421
 422 static void PCRHandle( demux_t *p_demux, ts_pid_t *, block_t * );
 423
 424 static iod_descriptor_t *IODNew( int , uint8_t * );
 425 static void              IODFree( iod_descriptor_t * );
 426
 427 #define TS_USER_PMT_NUMBER (0)
 428 static int UserPmt( demux_t *p_demux, const char * );
 429
 430 #define TS_PACKET_SIZE_188 188
 431 #define TS_PACKET_SIZE_192 192
 432 #define TS_PACKET_SIZE_204 204
 433 #define TS_PACKET_SIZE_MAX 204
 434 #define TS_TOPFIELD_HEADER 1320
 435
 436 /*****************************************************************************
 437  * Open
 438  *****************************************************************************/
 439 static int Open( vlc_object_t *p_this )
 440 {
 441     demux_t     *p_demux = (demux_t*)p_this;
 442     demux_sys_t *p_sys;
 443
 444     const uint8_t *p_peek;
 445     int          i_sync, i_peek, i;
 446     int          i_packet_size;
 447
 448     ts_pid_t    *pat;
 449     const char  *psz_mode;
 450     bool         b_append;
 451     bool         b_topfield = false;
 452
 453     if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) <
 454         TS_PACKET_SIZE_MAX ) return VLC_EGENERIC;
 455
 456     if( memcmp( p_peek, "TFrc", 4 ) == 0 )
 457     {
 458         b_topfield = true;
 459         msg_Dbg( p_demux, "this is a topfield file" );
 460     }
 461
 462     /* Search first sync byte */
 463     for( i_sync = 0; i_sync < TS_PACKET_SIZE_MAX; i_sync++ )
 464     {
 465         if( p_peek[i_sync] == 0x47 ) break;
 466     }
 467     if( i_sync >= TS_PACKET_SIZE_MAX && !b_topfield )
 468     {
 469         if( !p_demux->b_force )
 470             return VLC_EGENERIC;
 471         msg_Warn( p_demux, "this does not look like a TS stream, continuing" );
 472     }
 473
 474     if( b_topfield )
 475     {
 476         /* Read the entire Topfield header */
 477         i_peek = TS_TOPFIELD_HEADER;
 478     }
 479     else
 480     {
 481         /* Check next 3 sync bytes */
 482         i_peek = TS_PACKET_SIZE_MAX * 3 + i_sync + 1;
 483     }
 484
 485     if( ( stream_Peek( p_demux->s, &p_peek, i_peek ) ) < i_peek )
 486     {
 487         msg_Err( p_demux, "cannot peek" );
 488         return VLC_EGENERIC;
 489     }
 490     if( p_peek[i_sync + TS_PACKET_SIZE_188] == 0x47 &&
 491         p_peek[i_sync + 2 * TS_PACKET_SIZE_188] == 0x47 &&
 492         p_peek[i_sync + 3 * TS_PACKET_SIZE_188] == 0x47 )
 493     {
 494         i_packet_size = TS_PACKET_SIZE_188;
 495     }
 496     else if( p_peek[i_sync + TS_PACKET_SIZE_192] == 0x47 &&
 497              p_peek[i_sync + 2 * TS_PACKET_SIZE_192] == 0x47 &&
 498              p_peek[i_sync + 3 * TS_PACKET_SIZE_192] == 0x47 )
 499     {
 500         i_packet_size = TS_PACKET_SIZE_192;
 501     }
 502     else if( p_peek[i_sync + TS_PACKET_SIZE_204] == 0x47 &&
 503              p_peek[i_sync + 2 * TS_PACKET_SIZE_204] == 0x47 &&
 504              p_peek[i_sync + 3 * TS_PACKET_SIZE_204] == 0x47 )
 505     {
 506         i_packet_size = TS_PACKET_SIZE_204;
 507     }
 508     else if( p_demux->b_force )
 509     {
 510         i_packet_size = TS_PACKET_SIZE_188;
 511     }
 512     else if( b_topfield )
 513     {
 514         i_packet_size = TS_PACKET_SIZE_188;
 515 #if 0
 516         /* I used the TF5000PVR 2004 Firmware .doc header documentation,
 517          * http://www.i-topfield.com/data/product/firmware/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc
 518          * but after the filename the offsets seem to be incorrect.  - DJ */
 519         int i_duration, i_name;
 520         char *psz_name = malloc(25);
 521         char *psz_event_name;
 522         char *psz_event_text = malloc(130);
 523         char *psz_ext_text = malloc(1025);
 524
 525         // 2 bytes version Uimsbf (4,5)
 526         // 2 bytes reserved (6,7)
 527         // 2 bytes duration in minutes Uimsbf (8,9(
 528         i_duration = (int) (p_peek[8] << 8) | p_peek[9];
 529         msg_Dbg( p_demux, "Topfield recording length: +/- %d minutes", i_duration);
 530         // 2 bytes service number in channel list (10, 11)
 531         // 2 bytes service type Bslbf 0=TV 1=Radio Bslb (12, 13)
 532         // 4 bytes of reserved + tuner info (14,15,16,17)
 533         // 2 bytes of Service ID  Bslbf (18,19)
 534         // 2 bytes of PMT PID  Uimsbf (20,21)
 535         // 2 bytes of PCR PID  Uimsbf (22,23)
 536         // 2 bytes of Video PID  Uimsbf (24,25)
 537         // 2 bytes of Audio PID  Uimsbf (26,27)
 538         // 24 bytes filename Bslbf
 539         memcpy( psz_name, &p_peek[28], 24 );
 540         psz_name[24] = '\0';
 541         msg_Dbg( p_demux, "recordingname=%s", psz_name );
 542         // 1 byte of sat index Uimsbf  (52)
 543         // 3 bytes (1 bit of polarity Bslbf +23 bits reserved)
 544         // 4 bytes of freq. Uimsbf (56,57,58,59)
 545         // 2 bytes of symbol rate Uimsbf (60,61)
 546         // 2 bytes of TS stream ID Uimsbf (62,63)
 547         // 4 bytes reserved
 548         // 2 bytes reserved
 549         // 2 bytes duration Uimsbf (70,71)
 550         //i_duration = (int) (p_peek[70] << 8) | p_peek[71];
 551         //msg_Dbg( p_demux, "Topfield 2nd duration field: +/- %d minutes", i_duration);
 552         // 4 bytes EventID Uimsbf (72-75)
 553         // 8 bytes of Start and End time info (76-83)
 554         // 1 byte reserved (84)
 555         // 1 byte event name length Uimsbf (89)
 556         i_name = (int)(p_peek[89]&~0x81);
 557         msg_Dbg( p_demux, "event name length = %d", i_name);
 558         psz_event_name = malloc( i_name+1 );
 559         // 1 byte parental rating (90)
 560         // 129 bytes of event text
 561         memcpy( psz_event_name, &p_peek[91], i_name );
 562         psz_event_name[i_name] = '\0';
 563         memcpy( psz_event_text, &p_peek[91+i_name], 129-i_name );
 564         psz_event_text[129-i_name] = '\0';
 565         msg_Dbg( p_demux, "event name=%s", psz_event_name );
 566         msg_Dbg( p_demux, "event text=%s", psz_event_text );
 567         // 12 bytes reserved (220)
 568         // 6 bytes reserved
 569         // 2 bytes Event Text Length Uimsbf
 570         // 4 bytes EventID Uimsbf
 571         // FIXME We just have 613 bytes. not enough for this entire text
 572         // 1024 bytes Extended Event Text Bslbf
 573         memcpy( psz_ext_text, p_peek+372, 1024 );
 574         psz_ext_text[1024] = '\0';
 575         msg_Dbg( p_demux, "extended event text=%s", psz_ext_text );
 576         // 52 bytes reserved Bslbf
 577 #endif
 578     }
 579     else
 580     {
 581         msg_Warn( p_demux, "TS module discarded (lost sync)" );
 582         return VLC_EGENERIC;
 583     }
 584
 585     p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
 586     if( !p_sys )
 587         return VLC_ENOMEM;
 588     memset( p_sys, 0, sizeof( demux_sys_t ) );
 589     p_sys->i_packet_size = i_packet_size;
 590     vlc_mutex_init( &p_sys->csa_lock );
 591
 592     /* Fill dump mode fields */
 593     p_sys->i_write = 0;
 594     p_sys->buffer = NULL;
 595     p_sys->p_file = NULL;
 596     p_sys->b_file_out = false;
 597     p_sys->psz_file = var_CreateGetString( p_demux, "ts-dump-file" );
 598     if( *p_sys->psz_file != '\0' )
 599     {
 600         p_sys->b_file_out = true;
 601
 602         b_append = var_CreateGetBool( p_demux, "ts-dump-append" );
 603         if ( b_append )
 604             psz_mode = "ab";
 605         else
 606             psz_mode = "wb";
 607
 608         if( !strcmp( p_sys->psz_file, "-" ) )
 609         {
 610             msg_Info( p_demux, "dumping raw stream to standard output" );
 611             p_sys->p_file = stdout;
 612         }
 613         else if( ( p_sys->p_file = vlc_fopen( p_sys->psz_file, psz_mode ) ) == NULL )
 614         {
 615             msg_Err( p_demux, "cannot create `%s' for writing", p_sys->psz_file );
 616             p_sys->b_file_out = false;
 617         }
 618
 619         if( p_sys->b_file_out )
 620         {
 621             /* Determine how many packets to read. */
 622             int bufsize = var_CreateGetInteger( p_demux, "ts-dump-size" );
 623             p_sys->i_ts_read = (int) (bufsize / p_sys->i_packet_size);
 624             if( p_sys->i_ts_read <= 0 )
 625             {
 626                 p_sys->i_ts_read = 1500 / p_sys->i_packet_size;
 627             }
 628             p_sys->buffer = xmalloc( p_sys->i_packet_size * p_sys->i_ts_read );
 629             msg_Info( p_demux, "%s raw stream to file `%s' reading packets %d",
 630                       b_append ? "appending" : "dumping", p_sys->psz_file,
 631                       p_sys->i_ts_read );
 632         }
 633     }
 634
 635     /* Fill p_demux field */
 636     if( p_sys->b_file_out )
 637         p_demux->pf_demux = DemuxFile;
 638     else
 639         p_demux->pf_demux = Demux;
 640     p_demux->pf_control = Control;
 641
 642     /* Init p_sys field */
 643     p_sys->b_dvb_meta = true;
 644     p_sys->b_access_control = true;
 645     p_sys->i_current_program = 0;
 646     p_sys->programs_list.i_count = 0;
 647     p_sys->programs_list.p_values = NULL;
 648     p_sys->i_tdt_delta = 0;
 649     p_sys->i_dvb_start = 0;
 650     p_sys->i_dvb_length = 0;
 651
 652     p_sys->b_broken_charset = false;
 653
 654     for( i = 0; i < 8192; i++ )
 655     {
 656         ts_pid_t *pid = &p_sys->pid[i];
 657
 658         pid->i_pid      = i;
 659         pid->b_seen     = false;
 660         pid->b_valid    = false;
 661     }
 662     /* PID 8191 is padding */
 663     p_sys->pid[8191].b_seen = true;
 664     p_sys->i_packet_size = i_packet_size;
 665     p_sys->b_udp_out = false;
 666     p_sys->fd = -1;
 667     p_sys->i_ts_read = 50;
 668     p_sys->csa = NULL;
 669     p_sys->b_start_record = false;
 670
 671     /* Init PAT handler */
 672     pat = &p_sys->pid[0];
 673     PIDInit( pat, true, NULL );
 674     pat->psi->handle = dvbpsi_AttachPAT( (dvbpsi_pat_callback)PATCallBack,
 675                                          p_demux );
 676 #ifdef TS_USE_DVB_SI
 677     if( p_sys->b_dvb_meta )
 678     {
 679         ts_pid_t *sdt = &p_sys->pid[0x11];
 680         ts_pid_t *eit = &p_sys->pid[0x12];
 681
 682         PIDInit( sdt, true, NULL );
 683         sdt->psi->handle =
 684             dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack,
 685                                 p_demux );
 686         PIDInit( eit, true, NULL );
 687         eit->psi->handle =
 688             dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack,
 689                                 p_demux );
 690 #ifdef TS_USE_TDT
 691         ts_pid_t *tdt = &p_sys->pid[0x14];
 692         PIDInit( tdt, true, NULL );
 693         tdt->psi->handle =
 694             dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack,
 695                                 p_demux );
 696 #endif
 697         if( p_sys->b_access_control )
 698         {
 699             if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
 700                                 ACCESS_SET_PRIVATE_ID_STATE, 0x11, true ) ||
 701 #ifdef TS_USE_TDT
 702                 stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
 703                                 ACCESS_SET_PRIVATE_ID_STATE, 0x14, true ) ||
 704 #endif
 705                 stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
 706                                 ACCESS_SET_PRIVATE_ID_STATE, 0x12, true ) )
 707                 p_sys->b_access_control = false;
 708         }
 709     }
 710 #endif
 711
 712     /* Init PMT array */
 713     TAB_INIT( p_sys->i_pmt, p_sys->pmt );
 714     p_sys->i_pmt_es = 0;
 715
 716     /* Read config */
 717     p_sys->b_es_id_pid = var_CreateGetBool( p_demux, "ts-es-id-pid" );
 718
 719     char* psz_string = var_CreateGetString( p_demux, "ts-out" );
 720     if( psz_string && *psz_string && !p_sys->b_file_out )
 721     {
 722         char *psz = strchr( psz_string, ':' );
 723         int   i_port = 0;
 724
 725         p_sys->b_udp_out = true;
 726
 727         if( psz )
 728         {
 729             *psz++ = '\0';
 730             i_port = atoi( psz );
 731         }
 732         if( i_port <= 0 ) i_port  = 1234;
 733         msg_Dbg( p_demux, "resend ts to '%s:%d'", psz_string, i_port );
 734
 735         p_sys->fd = net_ConnectUDP( VLC_OBJECT(p_demux), psz_string, i_port, -1 );
 736         if( p_sys->fd < 0 )
 737         {
 738             msg_Err( p_demux, "failed to open udp socket, send disabled" );
 739             p_sys->b_udp_out = false;
 740         }
 741         else
 742         {
 743             int i_mtu = var_CreateGetInteger( p_demux, "ts-out-mtu" );
 744             p_sys->i_ts_read = i_mtu / p_sys->i_packet_size;
 745             if( p_sys->i_ts_read <= 0 )
 746             {
 747                 p_sys->i_ts_read = 1500 / p_sys->i_packet_size;
 748             }
 749             p_sys->buffer = malloc( p_sys->i_packet_size * p_sys->i_ts_read );
 750         }
 751     }
 752     free( psz_string );
 753
 754     /* We handle description of an extra PMT */
 755     psz_string = var_CreateGetString( p_demux, "ts-extra-pmt" );
 756     p_sys->b_user_pmt = false;
 757     if( psz_string && *psz_string )
 758         UserPmt( p_demux, psz_string );
 759     free( psz_string );
 760
 761     psz_string = var_CreateGetStringCommand( p_demux, "ts-csa-ck" );
 762     if( psz_string && *psz_string )
 763     {
 764         int i_res;
 765         char* psz_csa2;
 766
 767         p_sys->csa = csa_New();
 768
 769         psz_csa2 = var_CreateGetStringCommand( p_demux, "ts-csa2-ck" );
 770         i_res = csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, psz_string, true );
 771         if( i_res == VLC_SUCCESS && psz_csa2 && *psz_csa2 )
 772         {
 773             if( csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, psz_csa2, false ) != VLC_SUCCESS )
 774             {
 775                 csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, psz_string, false );
 776             }
 777         }
 778         else if ( i_res == VLC_SUCCESS )
 779         {
 780             csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, psz_string, false );
 781         }
 782         else
 783         {
 784             csa_Delete( p_sys->csa );
 785             p_sys->csa = NULL;
 786         }
 787
 788         if( p_sys->csa )
 789         {
 790             var_AddCallback( p_demux, "ts-csa-ck", ChangeKeyCallback, (void *)1 );
 791             var_AddCallback( p_demux, "ts-csa2-ck", ChangeKeyCallback, NULL );
 792
 793             int i_pkt = var_CreateGetInteger( p_demux, "ts-csa-pkt" );
 794             if( i_pkt < 4 || i_pkt > 188 )
 795             {
 796                 msg_Err( p_demux, "wrong packet size %d specified.", i_pkt );
 797                 msg_Warn( p_demux, "using default packet size of 188 bytes" );
 798                 p_sys->i_csa_pkt_size = 188;
 799             }
 800             else
 801                 p_sys->i_csa_pkt_size = i_pkt;
 802             msg_Dbg( p_demux, "decrypting %d bytes of packet", p_sys->i_csa_pkt_size );
 803         }
 804         free( psz_csa2 );
 805     }
 806     free( psz_string );
 807
 808     p_sys->b_silent = var_CreateGetBool( p_demux, "ts-silent" );
 809     p_sys->b_split_es = var_InheritBool( p_demux, "ts-split-es" );
 810
 811     while( !p_sys->b_file_out && p_sys->i_pmt_es <= 0 &&
 812            vlc_object_alive( p_demux ) )
 813     {
 814         if( p_demux->pf_demux( p_demux ) != 1 )
 815             break;
 816     }
 817
 818
 819     return VLC_SUCCESS;
 820 }
 821
 822 /*****************************************************************************
 823  * Close
 824  *****************************************************************************/
 825 static void Close( vlc_object_t *p_this )
 826 {
 827     demux_t     *p_demux = (demux_t*)p_this;
 828     demux_sys_t *p_sys = p_demux->p_sys;
 829
 830     msg_Dbg( p_demux, "pid list:" );
 831     for( int i = 0; i < 8192; i++ )
 832     {
 833         ts_pid_t *pid = &p_sys->pid[i];
 834
 835         if( pid->b_valid && pid->psi )
 836         {
 837             switch( pid->i_pid )
 838             {
 839             case 0: /* PAT */
 840                 dvbpsi_DetachPAT( pid->psi->handle );
 841                 free( pid->psi );
 842                 break;
 843             case 1: /* CAT */
 844                 free( pid->psi );
 845                 break;
 846             default:
 847                 if( p_sys->b_dvb_meta && ( pid->i_pid == 0x11 || pid->i_pid == 0x12 || pid->i_pid == 0x14 ) )
 848                 {
 849                     /* SDT or EIT or TDT */
 850                     dvbpsi_DetachDemux( pid->psi->handle );
 851                     free( pid->psi );
 852                 }
 853                 else
 854                 {
 855                     PIDClean( p_demux, pid );
 856                 }
 857                 break;
 858             }
 859         }
 860         else if( pid->b_valid && pid->es )
 861         {
 862             PIDClean( p_demux, pid );
 863         }
 864
 865         if( pid->b_seen )
 866         {
 867             msg_Dbg( p_demux, "  - pid[%d] seen", pid->i_pid );
 868         }
 869
 870         if( p_sys->b_access_control && pid->i_pid > 0 )
 871         {
 872             /* too much */
 873             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
 874                             ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid,
 875                             false );
 876         }
 877     }
 878
 879     vlc_mutex_lock( &p_sys->csa_lock );
 880     if( p_sys->csa )
 881     {
 882         var_DelCallback( p_demux, "ts-csa-ck", ChangeKeyCallback, NULL );
 883         var_DelCallback( p_demux, "ts-csa2-ck", ChangeKeyCallback, NULL );
 884         csa_Delete( p_sys->csa );
 885     }
 886     vlc_mutex_unlock( &p_sys->csa_lock );
 887
 888     TAB_CLEAN( p_sys->i_pmt, p_sys->pmt );
 889
 890     free( p_sys->programs_list.p_values );
 891
 892     /* If in dump mode, then close the file */
 893     if( p_sys->b_file_out )
 894     {
 895         msg_Info( p_demux ,"closing %s (%"PRId64" KiB dumped)",
 896                   p_sys->psz_file, p_sys->i_write / 1024 );
 897
 898         if( p_sys->p_file != stdout )
 899         {
 900             fclose( p_sys->p_file );
 901         }
 902     }
 903     /* When streaming, close the port */
 904     if( p_sys->fd > -1 )
 905     {
 906         net_Close( p_sys->fd );
 907     }
 908
 909     free( p_sys->buffer );
 910     free( p_sys->psz_file );
 911
 912     vlc_mutex_destroy( &p_sys->csa_lock );
 913     free( p_sys );
 914 }
 915
 916 /*****************************************************************************
 917  * ChangeKeyCallback: called when changing the odd encryption key on the fly.
 918  *****************************************************************************/
 919 static int ChangeKeyCallback( vlc_object_t *p_this, char const *psz_cmd,
 920                            vlc_value_t oldval, vlc_value_t newval,
 921                            void *p_data )
 922 {
 923     VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
 924     demux_t     *p_demux = (demux_t*)p_this;
 925     demux_sys_t *p_sys = p_demux->p_sys;
 926     int         i_tmp = (intptr_t)p_data;
 927
 928     vlc_mutex_lock( &p_sys->csa_lock );
 929     if ( i_tmp )
 930         i_tmp = csa_SetCW( p_this, p_sys->csa, newval.psz_string, true );
 931     else
 932         i_tmp = csa_SetCW( p_this, p_sys->csa, newval.psz_string, false );
 933
 934     vlc_mutex_unlock( &p_sys->csa_lock );
 935     return i_tmp;
 936 }
 937
 938 /*****************************************************************************
 939  * DemuxFile:
 940  *****************************************************************************/
 941 static int DemuxFile( demux_t *p_demux )
 942 {
 943     demux_sys_t *p_sys = p_demux->p_sys;
 944     const int i_bufsize = p_sys->i_packet_size * p_sys->i_ts_read;
 945     uint8_t   *p_buffer = p_sys->buffer; /* Put first on sync byte */
 946     const int i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize );
 947
 948     if( i_data <= 0 && i_data < p_sys->i_packet_size )
 949     {
 950         msg_Dbg( p_demux, "error reading malformed packets" );
 951         return i_data;
 952     }
 953
 954     /* Test continuity counter */
 955     for( int i_pos = 0; i_pos < i_data;  )
 956     {
 957         if( p_sys->buffer[i_pos] != 0x47 )
 958         {
 959             msg_Warn( p_demux, "lost sync" );
 960             while( vlc_object_alive (p_demux) && (i_pos < i_data) )
 961             {
 962                 i_pos++;
 963                 if( p_sys->buffer[i_pos] == 0x47 )
 964                     break;
 965             }
 966             if( vlc_object_alive (p_demux) )
 967                 msg_Warn( p_demux, "sync found" );
 968         }
 969
 970         /* continuous when (one of this):
 971          * diff == 1
 972          * diff == 0 and payload == 0
 973          * diff == 0 and duplicate packet (playload != 0) <- should we
 974          *   test the content ?
 975          */
 976         const int i_cc  = p_buffer[i_pos+3]&0x0f;
 977         const bool b_payload = p_buffer[i_pos+3]&0x10;
 978         const bool b_adaptation = p_buffer[i_pos+3]&0x20;
 979
 980         /* Get the PID */
 981         ts_pid_t *p_pid = &p_sys->pid[ ((p_buffer[i_pos+1]&0x1f)<<8)|p_buffer[i_pos+2] ];
 982
 983         /* Detect discontinuity indicator in adaptation field */
 984         if( b_adaptation && p_buffer[i_pos + 4] > 0 )
 985         {
 986             if( p_buffer[i_pos+5]&0x80 )
 987                 msg_Warn( p_demux, "discontinuity indicator (pid=%d) ", p_pid->i_pid );
 988             if( p_buffer[i_pos+5]&0x40 )
 989                 msg_Warn( p_demux, "random access indicator (pid=%d) ", p_pid->i_pid );
 990         }
 991
 992         const int i_diff = ( i_cc - p_pid->i_cc )&0x0f;
 993         if( b_payload && i_diff == 1 )
 994         {
 995             p_pid->i_cc = ( p_pid->i_cc + 1 ) & 0xf;
 996         }
 997         else
 998         {
 999             if( p_pid->i_cc == 0xff )
1000             {
1001                 msg_Warn( p_demux, "first packet for pid=%d cc=0x%x",
1002                         p_pid->i_pid, i_cc );
1003                 p_pid->i_cc = i_cc;
1004             }
1005             else if( i_diff != 0 )
1006             {
1007                 /* FIXME what to do when discontinuity_indicator is set ? */
1008                 msg_Warn( p_demux, "transport error detected 0x%x instead of 0x%x",
1009                           i_cc, ( p_pid->i_cc + 1 )&0x0f );
1010
1011                 p_pid->i_cc = i_cc;
1012                 /* Mark transport error in the TS packet. */
1013                 p_buffer[i_pos+1] |= 0x80;
1014             }
1015         }
1016
1017         /* Test if user wants to decrypt it first */
1018         if( p_sys->csa )
1019         {
1020             vlc_mutex_lock( &p_sys->csa_lock );
1021             csa_Decrypt( p_demux->p_sys->csa, &p_buffer[i_pos], p_demux->p_sys->i_csa_pkt_size );
1022             vlc_mutex_unlock( &p_sys->csa_lock );
1023         }
1024
1025         i_pos += p_sys->i_packet_size;
1026     }
1027
1028     /* Then write */
1029     const int i_write = fwrite( p_sys->buffer, 1, i_data, p_sys->p_file );
1030     if( i_write < 0 )
1031     {
1032         msg_Err( p_demux, "failed to write data" );
1033         return -1;
1034     }
1035
1036     p_sys->i_write += i_write;
1037     return 1;
1038 }
1039
1040 /*****************************************************************************
1041  * Demux:
1042  *****************************************************************************/
1043 static int Demux( demux_t *p_demux )
1044 {
1045     demux_sys_t *p_sys = p_demux->p_sys;
1046     bool b_wait_es = p_sys->i_pmt_es <= 0;
1047
1048     /* We read at most 100 TS packet or until a frame is completed */
1049     for( int i_pkt = 0; i_pkt < p_sys->i_ts_read; i_pkt++ )
1050     {
1051         bool         b_frame = false;
1052         block_t     *p_pkt;
1053
1054         /* Get a new TS packet */
1055         if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) )
1056         {
1057             msg_Dbg( p_demux, "eof ?" );
1058             return 0;
1059         }
1060
1061         /* Check sync byte and re-sync if needed */
1062         if( p_pkt->p_buffer[0] != 0x47 )
1063         {
1064             msg_Warn( p_demux, "lost synchro" );
1065             block_Release( p_pkt );
1066
1067             while( vlc_object_alive (p_demux) )
1068             {
1069                 const uint8_t *p_peek;
1070                 int i_peek, i_skip = 0;
1071
1072                 i_peek = stream_Peek( p_demux->s, &p_peek,
1073                                       p_sys->i_packet_size * 10 );
1074                 if( i_peek < p_sys->i_packet_size + 1 )
1075                 {
1076                     msg_Dbg( p_demux, "eof ?" );
1077                     return 0;
1078                 }
1079
1080                 while( i_skip < i_peek - p_sys->i_packet_size )
1081                 {
1082                     if( p_peek[i_skip] == 0x47 &&
1083                         p_peek[i_skip + p_sys->i_packet_size] == 0x47 )
1084                     {
1085                         break;
1086                     }
1087                     i_skip++;
1088                 }
1089
1090                 msg_Dbg( p_demux, "skipping %d bytes of garbage", i_skip );
1091                 stream_Read( p_demux->s, NULL, i_skip );
1092
1093                 if( i_skip < i_peek - p_sys->i_packet_size )
1094                 {
1095                     break;
1096                 }
1097             }
1098
1099             if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) )
1100             {
1101                 msg_Dbg( p_demux, "eof ?" );
1102                 return 0;
1103             }
1104         }
1105
1106         if( p_sys->b_start_record )
1107         {
1108             /* Enable recording once synchronized */
1109             stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, true, "ts" );
1110             p_sys->b_start_record = false;
1111         }
1112
1113         if( p_sys->b_udp_out )
1114         {
1115             memcpy( &p_sys->buffer[i_pkt * p_sys->i_packet_size],
1116                     p_pkt->p_buffer, p_sys->i_packet_size );
1117         }
1118
1119         /* Parse the TS packet */
1120         ts_pid_t *p_pid = &p_sys->pid[PIDGet( p_pkt )];
1121
1122         if( p_pid->b_valid )
1123         {
1124             if( p_pid->psi )
1125             {
1126                 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 ) ) )
1127                 {
1128                     dvbpsi_PushPacket( p_pid->psi->handle, p_pkt->p_buffer );
1129                 }
1130                 else
1131                 {
1132                     for( int i_prg = 0; i_prg < p_pid->psi->i_prg; i_prg++ )
1133                     {
1134                         dvbpsi_PushPacket( p_pid->psi->prg[i_prg]->handle,
1135                                            p_pkt->p_buffer );
1136                     }
1137                 }
1138                 block_Release( p_pkt );
1139             }
1140             else if( !p_sys->b_udp_out )
1141             {
1142                 b_frame = GatherPES( p_demux, p_pid, p_pkt );
1143             }
1144             else
1145             {
1146                 PCRHandle( p_demux, p_pid, p_pkt );
1147                 block_Release( p_pkt );
1148             }
1149         }
1150         else
1151         {
1152             if( !p_pid->b_seen )
1153             {
1154                 msg_Dbg( p_demux, "pid[%d] unknown", p_pid->i_pid );
1155             }
1156             /* We have to handle PCR if present */
1157             PCRHandle( p_demux, p_pid, p_pkt );
1158             block_Release( p_pkt );
1159         }
1160         p_pid->b_seen = true;
1161
1162         if( b_frame || ( b_wait_es && p_sys->i_pmt_es > 0 ) )
1163             break;
1164     }
1165
1166     if( p_sys->b_udp_out )
1167     {
1168         /* Send the complete block */
1169         net_Write( p_demux, p_sys->fd, NULL, p_sys->buffer,
1170                    p_sys->i_ts_read * p_sys->i_packet_size );
1171     }
1172
1173     return 1;
1174 }
1175
1176 /*****************************************************************************
1177  * Control:
1178  *****************************************************************************/
1179 static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_length )
1180 {
1181     demux_sys_t *p_sys = p_demux->p_sys;
1182     if( pi_length )
1183         *pi_length = 0;
1184     if( pi_time )
1185         *pi_time = 0;
1186
1187     if( p_sys->i_dvb_length > 0 )
1188     {
1189 #ifdef TS_USE_TDT
1190         const int64_t t = mdate() + p_sys->i_tdt_delta;
1191 #else
1192         const int64_t t = CLOCK_FREQ * time ( NULL );
1193 #endif
1194
1195         if( p_sys->i_dvb_start <= t && t < p_sys->i_dvb_start + p_sys->i_dvb_length )
1196         {
1197             if( pi_length )
1198                 *pi_length = p_sys->i_dvb_length;
1199             if( pi_time )
1200                 *pi_time   = t - p_sys->i_dvb_start;
1201             return VLC_SUCCESS;
1202         }
1203     }
1204     return VLC_EGENERIC;
1205 }
1206
1207 static int Control( demux_t *p_demux, int i_query, va_list args )
1208 {
1209     demux_sys_t *p_sys = p_demux->p_sys;
1210     double f, *pf;
1211     bool b_bool, *pb_bool;
1212     int64_t i64;
1213     int64_t *pi64;
1214     int i_int;
1215
1216     if( p_sys->b_file_out )
1217         return demux_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
1218
1219     switch( i_query )
1220     {
1221     case DEMUX_GET_POSITION:
1222         pf = (double*) va_arg( args, double* );
1223         i64 = stream_Size( p_demux->s );
1224         if( i64 > 0 )
1225         {
1226             double f_current = stream_Tell( p_demux->s );
1227             *pf = f_current / (double)i64;
1228         }
1229         else
1230         {
1231             int64_t i_time, i_length;
1232             if( !DVBEventInformation( p_demux, &i_time, &i_length ) && i_length > 0 )
1233                 *pf = (double)i_time/(double)i_length;
1234             else
1235                 *pf = 0.0;
1236         }
1237         return VLC_SUCCESS;
1238     case DEMUX_SET_POSITION:
1239         f = (double) va_arg( args, double );
1240         i64 = stream_Size( p_demux->s );
1241
1242         if( stream_Seek( p_demux->s, (int64_t)(i64 * f) ) )
1243             return VLC_EGENERIC;
1244
1245         return VLC_SUCCESS;
1246 #if 0
1247
1248     case DEMUX_GET_TIME:
1249         pi64 = (int64_t*)va_arg( args, int64_t * );
1250         if( p_sys->i_time < 0 )
1251         {
1252             *pi64 = 0;
1253             return VLC_EGENERIC;
1254         }
1255         *pi64 = p_sys->i_time;
1256         return VLC_SUCCESS;
1257
1258     case DEMUX_GET_LENGTH:
1259         pi64 = (int64_t*)va_arg( args, int64_t * );
1260         if( p_sys->i_mux_rate > 0 )
1261         {
1262             *pi64 = INT64_C(1000000) * ( stream_Size( p_demux->s ) / 50 ) /
1263                     p_sys->i_mux_rate;
1264             return VLC_SUCCESS;
1265         }
1266         *pi64 = 0;
1267         return VLC_EGENERIC;
1268 #else
1269     case DEMUX_GET_TIME:
1270         pi64 = (int64_t*)va_arg( args, int64_t * );
1271         if( DVBEventInformation( p_demux, pi64, NULL ) )
1272             *pi64 = 0;
1273         return VLC_SUCCESS;
1274
1275     case DEMUX_GET_LENGTH:
1276         pi64 = (int64_t*)va_arg( args, int64_t * );
1277         if( DVBEventInformation( p_demux, NULL, pi64 ) )
1278             *pi64 = 0;
1279         return VLC_SUCCESS;
1280 #endif
1281     case DEMUX_SET_GROUP:
1282     {
1283         uint16_t i_vpid = 0, i_apid1 = 0, i_apid2 = 0, i_apid3 = 0;
1284         ts_prg_psi_t *p_prg;
1285         vlc_list_t *p_list;
1286
1287         i_int = (int)va_arg( args, int );
1288         p_list = (vlc_list_t *)va_arg( args, vlc_list_t * );
1289         msg_Dbg( p_demux, "DEMUX_SET_GROUP %d %p", i_int, p_list );
1290
1291         if( p_sys->b_access_control && i_int > 0 && i_int != p_sys->i_current_program )
1292         {
1293             int i_pmt_pid = -1;
1294
1295             /* Search pmt to be unselected */
1296             for( int i = 0; i < p_sys->i_pmt; i++ )
1297             {
1298                 ts_pid_t *pmt = p_sys->pmt[i];
1299
1300                 for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
1301                 {
1302                     if( pmt->psi->prg[i_prg]->i_number == p_sys->i_current_program )
1303                     {
1304                         i_pmt_pid = p_sys->pmt[i]->i_pid;
1305                         p_prg = p_sys->pmt[i]->psi->prg[i_prg];
1306                         break;
1307                     }
1308                 }
1309                 if( i_pmt_pid > 0 ) break;
1310             }
1311
1312             if( i_pmt_pid > 0 )
1313             {
1314                 stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1315                                 ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
1316                                 false );
1317                 if( p_prg->i_pid_pcr > 0 )
1318                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1319                                     ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr,
1320                                     false );
1321                 /* All ES */
1322                 for( int i = 2; i < 8192; i++ )
1323                 {
1324                     ts_pid_t *pid = &p_sys->pid[i];
1325
1326                     if( !pid->b_valid || pid->psi )
1327                         continue;
1328
1329                     for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
1330                     {
1331                         if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
1332                         {
1333                             /* We only remove es that aren't defined by extra pmt */
1334                             stream_Control( p_demux->s,
1335                                             STREAM_CONTROL_ACCESS,
1336                                             ACCESS_SET_PRIVATE_ID_STATE,
1337                                             i, false );
1338                             break;
1339                         }
1340                     }
1341                 }
1342             }
1343
1344             /* select new program */
1345             p_sys->i_current_program = i_int;
1346             i_pmt_pid = -1;
1347             for( int i = 0; i < p_sys->i_pmt; i++ )
1348             {
1349                 ts_pid_t *pmt = p_sys->pmt[i];
1350
1351                 for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
1352                 {
1353                     if( pmt->psi->prg[i_prg]->i_number == i_int )
1354                     {
1355                         i_pmt_pid = p_sys->pmt[i]->i_pid;
1356                         p_prg = p_sys->pmt[i]->psi->prg[i_prg];
1357                         break;
1358                     }
1359                 }
1360                 if( i_pmt_pid > 0 )
1361                     break;
1362             }
1363             if( i_pmt_pid > 0 )
1364             {
1365                 stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1366                                 ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
1367                                 true );
1368                 if( p_prg->i_pid_pcr > 0 )
1369                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1370                                     ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr,
1371                                     true );
1372
1373                 for( int i = 2; i < 8192; i++ )
1374                 {
1375                     ts_pid_t *pid = &p_sys->pid[i];
1376
1377                     if( !pid->b_valid || pid->psi )
1378                         continue;
1379
1380                     for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
1381                     {
1382                         if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
1383                         {
1384                             if ( pid->es->fmt.i_cat == VIDEO_ES && !i_vpid )
1385                                 i_vpid = i;
1386                             if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid1 )
1387                                 i_apid1 = i;
1388                             else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid2 )
1389                                 i_apid2 = i;
1390                             else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid3 )
1391                                 i_apid3 = i;
1392
1393                             stream_Control( p_demux->s,
1394                                             STREAM_CONTROL_ACCESS,
1395                                             ACCESS_SET_PRIVATE_ID_STATE,
1396                                             i, true );
1397                             break;
1398                         }
1399                     }
1400                 }
1401             }
1402         }
1403         else if( i_int <= 0 )
1404         {
1405             p_sys->i_current_program = -1;
1406             p_sys->programs_list.i_count = 0;
1407             if( p_list )
1408             {
1409                 vlc_list_t *p_dst = &p_sys->programs_list;
1410                 free( p_dst->p_values );
1411
1412                 p_dst->p_values = calloc( p_list->i_count,
1413                                           sizeof(*p_dst->p_values) );
1414                 if( p_dst->p_values )
1415                 {
1416                     p_dst->i_count = p_list->i_count;
1417                     for( int i = 0; i < p_list->i_count; i++ )
1418                         p_dst->p_values[i] = p_list->p_values[i];
1419                 }
1420             }
1421         }
1422         return VLC_SUCCESS;
1423     }
1424
1425     case DEMUX_CAN_RECORD:
1426         pb_bool = (bool*)va_arg( args, bool * );
1427         *pb_bool = true;
1428         return VLC_SUCCESS;
1429
1430     case DEMUX_SET_RECORD_STATE:
1431         b_bool = (bool)va_arg( args, int );
1432
1433         if( !b_bool )
1434             stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, false );
1435         p_sys->b_start_record = b_bool;
1436         return VLC_SUCCESS;
1437
1438     case DEMUX_GET_FPS:
1439     case DEMUX_SET_TIME:
1440     default:
1441         return VLC_EGENERIC;
1442     }
1443 }
1444
1445 /*****************************************************************************
1446  *
1447  *****************************************************************************/
1448 static int UserPmt( demux_t *p_demux, const char *psz_fmt )
1449 {
1450     demux_sys_t *p_sys = p_demux->p_sys;
1451     char *psz_dup = strdup( psz_fmt );
1452     char *psz = psz_dup;
1453     int  i_pid;
1454     int  i_number;
1455
1456     if( !psz_dup )
1457         return VLC_ENOMEM;
1458
1459     /* Parse PID */
1460     i_pid = strtol( psz, &psz, 0 );
1461     if( i_pid < 2 || i_pid >= 8192 )
1462         goto error;
1463
1464     /* Parse optional program number */
1465     i_number = 0;
1466     if( *psz == ':' )
1467         i_number = strtol( &psz[1], &psz, 0 );
1468
1469     /* */
1470     ts_pid_t *pmt = &p_sys->pid[i_pid];
1471     ts_prg_psi_t *prg;
1472
1473     msg_Dbg( p_demux, "user pmt specified (pid=%d,number=%d)", i_pid, i_number );
1474     PIDInit( pmt, true, NULL );
1475
1476     /* Dummy PMT */
1477     prg = malloc( sizeof( ts_prg_psi_t ) );
1478     if( !prg )
1479         goto error;
1480
1481     memset( prg, 0, sizeof( ts_prg_psi_t ) );
1482     prg->i_pid_pcr  = -1;
1483     prg->i_pid_pmt  = -1;
1484     prg->i_version  = -1;
1485     prg->i_number   = i_number != 0 ? i_number : TS_USER_PMT_NUMBER;
1486     prg->handle     = dvbpsi_AttachPMT( i_number != TS_USER_PMT_NUMBER ? i_number : 1, (dvbpsi_pmt_callback)PMTCallBack, p_demux );
1487     TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg );
1488
1489     psz = strchr( psz, '=' );
1490     if( psz )
1491         psz++;
1492     while( psz && *psz )
1493     {
1494         char *psz_next = strchr( psz, ',' );
1495         int i_pid;
1496
1497         if( psz_next )
1498             *psz_next++ = '\0';
1499
1500         i_pid = strtol( psz, &psz, 0 );
1501         if( *psz != ':' || i_pid < 2 || i_pid >= 8192 )
1502             goto next;
1503
1504         char *psz_opt = &psz[1];
1505         if( !strcmp( psz_opt, "pcr" ) )
1506         {
1507             prg->i_pid_pcr = i_pid;
1508         }
1509         else if( !p_sys->pid[i_pid].b_valid )
1510         {
1511             ts_pid_t *pid = &p_sys->pid[i_pid];
1512
1513             char *psz_arg = strchr( psz_opt, '=' );
1514             if( psz_arg )
1515                 *psz_arg++ = '\0';
1516
1517             PIDInit( pid, false, pmt->psi);
1518             if( prg->i_pid_pcr <= 0 )
1519                 prg->i_pid_pcr = i_pid;
1520
1521             if( psz_arg && strlen( psz_arg ) == 4 )
1522             {
1523                 const vlc_fourcc_t i_codec = VLC_FOURCC( psz_arg[0], psz_arg[1],
1524                                                          psz_arg[2], psz_arg[3] );
1525                 int i_cat = UNKNOWN_ES;
1526                 es_format_t *fmt = &pid->es->fmt;
1527
1528                 if( !strcmp( psz_opt, "video" ) )
1529                     i_cat = VIDEO_ES;
1530                 else if( !strcmp( psz_opt, "audio" ) )
1531                     i_cat = AUDIO_ES;
1532                 else if( !strcmp( psz_opt, "spu" ) )
1533                     i_cat = SPU_ES;
1534
1535                 es_format_Init( fmt, i_cat, i_codec );
1536                 fmt->b_packetized = false;
1537             }
1538             else
1539             {
1540                 const int i_stream_type = strtol( psz_opt, NULL, 0 );
1541                 PIDFillFormat( pid, i_stream_type );
1542             }
1543             pid->es->fmt.i_group = i_number;
1544             if( p_sys->b_es_id_pid )
1545                 pid->es->fmt.i_id = i_pid;
1546
1547             if( pid->es->fmt.i_cat != UNKNOWN_ES )
1548             {
1549                 msg_Dbg( p_demux, "  * es pid=%d fcc=%4.4s", i_pid,
1550                          (char*)&pid->es->fmt.i_codec );
1551                 pid->es->id = es_out_Add( p_demux->out,
1552                                           &pid->es->fmt );
1553                 p_sys->i_pmt_es++;
1554             }
1555         }
1556
1557     next:
1558         psz = psz_next;
1559     }
1560
1561     p_sys->b_user_pmt = true;
1562     TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt );
1563     free( psz_dup );
1564     return VLC_SUCCESS;
1565
1566 error:
1567     free( psz_dup );
1568     return VLC_EGENERIC;
1569 }
1570
1571 static void PIDInit( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner )
1572 {
1573     bool b_old_valid = pid->b_valid;
1574
1575     pid->b_valid    = true;
1576     pid->i_cc       = 0xff;
1577     pid->b_scrambled = false;
1578     pid->p_owner    = p_owner;
1579     pid->i_owner_number = 0;
1580
1581     TAB_INIT( pid->i_extra_es, pid->extra_es );
1582
1583     if( b_psi )
1584     {
1585         pid->es  = NULL;
1586
1587         if( !b_old_valid )
1588         {
1589             pid->psi = xmalloc( sizeof( ts_psi_t ) );
1590             if( pid->psi )
1591             {
1592                 pid->psi->handle = NULL;
1593                 TAB_INIT( pid->psi->i_prg, pid->psi->prg );
1594             }
1595         }
1596         assert( pid->psi );
1597
1598         pid->psi->i_pat_version  = -1;
1599         pid->psi->i_sdt_version  = -1;
1600         if( p_owner )
1601         {
1602             ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) );
1603             if( prg )
1604             {
1605                 /* PMT */
1606                 prg->i_version  = -1;
1607                 prg->i_number   = -1;
1608                 prg->i_pid_pcr  = -1;
1609                 prg->i_pid_pmt  = -1;
1610                 prg->iod        = NULL;
1611                 prg->handle     = NULL;
1612
1613                 TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg );
1614             }
1615         }
1616     }
1617     else
1618     {
1619         pid->psi = NULL;
1620         pid->es  = malloc( sizeof( ts_es_t ) );
1621         if( pid->es )
1622         {
1623             es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 );
1624             pid->es->id      = NULL;
1625             pid->es->p_pes   = NULL;
1626             pid->es->i_pes_size= 0;
1627             pid->es->i_pes_gathered= 0;
1628             pid->es->pp_last = &pid->es->p_pes;
1629             pid->es->p_mpeg4desc = NULL;
1630             pid->es->b_gather = false;
1631         }
1632     }
1633 }
1634
1635 static void PIDClean( demux_t *p_demux, ts_pid_t *pid )
1636 {
1637     demux_sys_t *p_sys = p_demux->p_sys;
1638     es_out_t *out = p_demux->out;
1639
1640     if( pid->psi )
1641     {
1642         if( pid->psi->handle )
1643             dvbpsi_DetachPMT( pid->psi->handle );
1644         for( int i = 0; i < pid->psi->i_prg; i++ )
1645         {
1646             if( pid->psi->prg[i]->iod )
1647                 IODFree( pid->psi->prg[i]->iod );
1648             if( pid->psi->prg[i]->handle )
1649                 dvbpsi_DetachPMT( pid->psi->prg[i]->handle );
1650             free( pid->psi->prg[i] );
1651         }
1652         free( pid->psi->prg );
1653         free( pid->psi );
1654     }
1655     else
1656     {
1657         if( pid->es->id )
1658         {
1659             es_out_Del( out, pid->es->id );
1660             p_sys->i_pmt_es--;
1661         }
1662
1663         if( pid->es->p_pes )
1664             block_ChainRelease( pid->es->p_pes );
1665
1666         es_format_Clean( &pid->es->fmt );
1667
1668         free( pid->es );
1669
1670         for( int i = 0; i < pid->i_extra_es; i++ )
1671         {
1672             if( pid->extra_es[i]->id )
1673             {
1674                 es_out_Del( out, pid->extra_es[i]->id );
1675                 p_sys->i_pmt_es--;
1676             }
1677
1678             if( pid->extra_es[i]->p_pes )
1679                 block_ChainRelease( pid->extra_es[i]->p_pes );
1680
1681             es_format_Clean( &pid->extra_es[i]->fmt );
1682
1683             free( pid->extra_es[i] );
1684         }
1685         if( pid->i_extra_es )
1686             free( pid->extra_es );
1687     }
1688
1689     pid->b_valid = false;
1690 }
1691
1692 /****************************************************************************
1693  * gathering stuff
1694  ****************************************************************************/
1695 static void ParsePES( demux_t *p_demux, ts_pid_t *pid )
1696 {
1697     block_t *p_pes = pid->es->p_pes;
1698     uint8_t header[34];
1699     unsigned i_pes_size = 0;
1700     unsigned i_skip = 0;
1701     mtime_t i_dts = -1;
1702     mtime_t i_pts = -1;
1703     mtime_t i_length = 0;
1704
1705     /* remove the pes from pid */
1706     pid->es->p_pes = NULL;
1707     pid->es->i_pes_size= 0;
1708     pid->es->i_pes_gathered= 0;
1709     pid->es->pp_last = &pid->es->p_pes;
1710
1711     /* FIXME find real max size */
1712     /* const int i_max = */ block_ChainExtract( p_pes, header, 34 );
1713
1714     if( header[0] != 0 || header[1] != 0 || header[2] != 1 )
1715     {
1716         if( !p_demux->p_sys->b_silent )
1717             msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x] (pid: %d)",
1718                       header[0], header[1],header[2],header[3], pid->i_pid );
1719         block_ChainRelease( p_pes );
1720         return;
1721     }
1722
1723     /* TODO check size */
1724     switch( header[3] )
1725     {
1726     case 0xBC:  /* Program stream map */
1727     case 0xBE:  /* Padding */
1728     case 0xBF:  /* Private stream 2 */
1729     case 0xF0:  /* ECM */
1730     case 0xF1:  /* EMM */
1731     case 0xFF:  /* Program stream directory */
1732     case 0xF2:  /* DSMCC stream */
1733     case 0xF8:  /* ITU-T H.222.1 type E stream */
1734         i_skip = 6;
1735         break;
1736     default:
1737         if( ( header[6]&0xC0 ) == 0x80 )
1738         {
1739             /* mpeg2 PES */
1740             i_skip = header[8] + 9;
1741
1742             if( header[7]&0x80 )    /* has pts */
1743             {
1744                 i_pts = ((mtime_t)(header[ 9]&0x0e ) << 29)|
1745                          (mtime_t)(header[10] << 22)|
1746                         ((mtime_t)(header[11]&0xfe) << 14)|
1747                          (mtime_t)(header[12] << 7)|
1748                          (mtime_t)(header[13] >> 1);
1749
1750                 if( header[7]&0x40 )    /* has dts */
1751                 {
1752                      i_dts = ((mtime_t)(header[14]&0x0e ) << 29)|
1753                              (mtime_t)(header[15] << 22)|
1754                             ((mtime_t)(header[16]&0xfe) << 14)|
1755                              (mtime_t)(header[17] << 7)|
1756                              (mtime_t)(header[18] >> 1);
1757                 }
1758             }
1759         }
1760         else
1761         {
1762             i_skip = 6;
1763             while( i_skip < 23 && header[i_skip] == 0xff )
1764             {
1765                 i_skip++;
1766             }
1767             if( i_skip == 23 )
1768             {
1769                 msg_Err( p_demux, "too much MPEG-1 stuffing" );
1770                 block_ChainRelease( p_pes );
1771                 return;
1772             }
1773             if( ( header[i_skip] & 0xC0 ) == 0x40 )
1774             {
1775                 i_skip += 2;
1776             }
1777
1778             if(  header[i_skip]&0x20 )
1779             {
1780                  i_pts = ((mtime_t)(header[i_skip]&0x0e ) << 29)|
1781                           (mtime_t)(header[i_skip+1] << 22)|
1782                          ((mtime_t)(header[i_skip+2]&0xfe) << 14)|
1783                           (mtime_t)(header[i_skip+3] << 7)|
1784                           (mtime_t)(header[i_skip+4] >> 1);
1785
1786                 if( header[i_skip]&0x10 )    /* has dts */
1787                 {
1788                      i_dts = ((mtime_t)(header[i_skip+5]&0x0e ) << 29)|
1789                               (mtime_t)(header[i_skip+6] << 22)|
1790                              ((mtime_t)(header[i_skip+7]&0xfe) << 14)|
1791                               (mtime_t)(header[i_skip+8] << 7)|
1792                               (mtime_t)(header[i_skip+9] >> 1);
1793                      i_skip += 10;
1794                 }
1795                 else
1796                 {
1797                     i_skip += 5;
1798                 }
1799             }
1800             else
1801             {
1802                 i_skip += 1;
1803             }
1804         }
1805         break;
1806     }
1807
1808     if( pid->es->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', 'b' ) ||
1809         pid->es->fmt.i_codec == VLC_FOURCC( 'd', 't', 's', 'b' ) )
1810     {
1811         i_skip += 4;
1812     }
1813     else if( pid->es->fmt.i_codec == VLC_FOURCC( 'l', 'p', 'c', 'b' ) ||
1814              pid->es->fmt.i_codec == VLC_FOURCC( 's', 'p', 'u', 'b' ) ||
1815              pid->es->fmt.i_codec == VLC_FOURCC( 's', 'd', 'd', 'b' ) )
1816     {
1817         i_skip += 1;
1818     }
1819     else if( pid->es->fmt.i_codec == VLC_CODEC_SUBT &&
1820              pid->es->p_mpeg4desc )
1821     {
1822         decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr;
1823
1824         if( dcd->i_decoder_specific_info_len > 2 &&
1825             dcd->p_decoder_specific_info[0] == 0x10 &&
1826             ( dcd->p_decoder_specific_info[1]&0x10 ) )
1827         {
1828             /* display length */
1829             if( p_pes->i_buffer + 2 <= i_skip )
1830                 i_length = GetWBE( &p_pes->p_buffer[i_skip] );
1831
1832             i_skip += 2;
1833         }
1834         if( p_pes->i_buffer + 2 <= i_skip )
1835             i_pes_size = GetWBE( &p_pes->p_buffer[i_skip] );
1836         /* */
1837         i_skip += 2;
1838     }
1839 #ifdef ZVBI_COMPILED
1840     else if( pid->es->fmt.i_codec == VLC_CODEC_TELETEXT )
1841         i_skip = 0; /*hack for zvbi support */
1842 #endif
1843     /* skip header */
1844     while( p_pes && i_skip > 0 )
1845     {
1846         if( p_pes->i_buffer <= i_skip )
1847         {
1848             block_t *p_next = p_pes->p_next;
1849
1850             i_skip -= p_pes->i_buffer;
1851             block_Release( p_pes );
1852             p_pes = p_next;
1853         }
1854         else
1855         {
1856             p_pes->i_buffer -= i_skip;
1857             p_pes->p_buffer += i_skip;
1858             break;
1859         }
1860     }
1861
1862     /* ISO/IEC 13818-1 2.7.5: if no pts and no dts, then dts == pts */
1863     if( i_pts >= 0 && i_dts < 0 )
1864         i_dts = i_pts;
1865
1866     if( p_pes )
1867     {
1868         block_t *p_block;
1869         int i;
1870
1871         if( i_dts >= 0 )
1872             p_pes->i_dts = VLC_TS_0 + i_dts * 100 / 9;
1873
1874         if( i_pts >= 0 )
1875             p_pes->i_pts = VLC_TS_0 + i_pts * 100 / 9;
1876
1877         p_pes->i_length = i_length * 100 / 9;
1878
1879         p_block = block_ChainGather( p_pes );
1880         if( pid->es->fmt.i_codec == VLC_CODEC_SUBT )
1881         {
1882             if( i_pes_size > 0 && p_block->i_buffer > i_pes_size )
1883             {
1884                 p_block->i_buffer = i_pes_size;
1885             }
1886             /* Append a \0 */
1887             p_block = block_Realloc( p_block, 0, p_block->i_buffer + 1 );
1888             p_block->p_buffer[p_block->i_buffer -1] = '\0';
1889         }
1890
1891         for( i = 0; i < pid->i_extra_es; i++ )
1892         {
1893             es_out_Send( p_demux->out, pid->extra_es[i]->id,
1894                          block_Duplicate( p_block ) );
1895         }
1896
1897         es_out_Send( p_demux->out, pid->es->id, p_block );
1898     }
1899     else
1900     {
1901         msg_Warn( p_demux, "empty pes" );
1902     }
1903 }
1904
1905 static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
1906 {
1907     demux_sys_t   *p_sys = p_demux->p_sys;
1908     const uint8_t *p = p_bk->p_buffer;
1909
1910     if( p_sys->i_pmt_es <= 0 )
1911         return;
1912
1913     if( ( p[3]&0x20 ) && /* adaptation */
1914         ( p[5]&0x10 ) &&
1915         ( p[4] >= 7 ) )
1916     {
1917         /* PCR is 33 bits */
1918         const mtime_t i_pcr = ( (mtime_t)p[6] << 25 ) |
1919                               ( (mtime_t)p[7] << 17 ) |
1920                               ( (mtime_t)p[8] << 9 ) |
1921                               ( (mtime_t)p[9] << 1 ) |
1922                               ( (mtime_t)p[10] >> 7 );
1923
1924         /* Search program and set the PCR */
1925         for( int i = 0; i < p_sys->i_pmt; i++ )
1926         {
1927             for( int i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
1928             {
1929                 if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr )
1930                 {
1931                     es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
1932                                     (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number,
1933                                     (int64_t)(VLC_TS_0 + i_pcr * 100 / 9) );
1934                 }
1935             }
1936         }
1937     }
1938 }
1939
1940 static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
1941 {
1942     const uint8_t *p = p_bk->p_buffer;
1943     const bool b_unit_start = p[1]&0x40;
1944     const bool b_scrambled  = p[3]&0x80;
1945     const bool b_adaptation = p[3]&0x20;
1946     const bool b_payload    = p[3]&0x10;
1947     const int  i_cc         = p[3]&0x0f; /* continuity counter */
1948     bool       b_discontinuity = false;  /* discontinuity */
1949
1950     /* transport_scrambling_control is ignored */
1951     int         i_skip = 0;
1952     bool        i_ret  = false;
1953
1954 #if 0
1955     msg_Dbg( p_demux, "pid=%d unit_start=%d adaptation=%d payload=%d "
1956              "cc=0x%x", pid->i_pid, b_unit_start, b_adaptation,
1957              b_payload, i_cc );
1958 #endif
1959
1960     /* For now, ignore additional error correction
1961      * TODO: handle Reed-Solomon 204,188 error correction */
1962     p_bk->i_buffer = TS_PACKET_SIZE_188;
1963
1964     if( p[1]&0x80 )
1965     {
1966         msg_Dbg( p_demux, "transport_error_indicator set (pid=%d)",
1967                  pid->i_pid );
1968         if( pid->es->p_pes ) //&& pid->es->fmt.i_cat == VIDEO_ES )
1969             pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
1970     }
1971
1972     if( p_demux->p_sys->csa )
1973     {
1974         vlc_mutex_lock( &p_demux->p_sys->csa_lock );
1975         csa_Decrypt( p_demux->p_sys->csa, p_bk->p_buffer, p_demux->p_sys->i_csa_pkt_size );
1976         vlc_mutex_unlock( &p_demux->p_sys->csa_lock );
1977     }
1978
1979     if( !b_adaptation )
1980     {
1981         /* We don't have any adaptation_field, so payload starts
1982          * immediately after the 4 byte TS header */
1983         i_skip = 4;
1984     }
1985     else
1986     {
1987         /* p[4] is adaptation_field_length minus one */
1988         i_skip = 5 + p[4];
1989         if( p[4] > 0 )
1990         {
1991             /* discontinuity indicator found in stream */
1992             b_discontinuity = (p[5]&0x80) ? true : false;
1993             if( b_discontinuity && pid->es->p_pes )
1994             {
1995                 msg_Warn( p_demux, "discontinuity indicator (pid=%d) ",
1996                             pid->i_pid );
1997                 /* pid->es->p_pes->i_flags |= BLOCK_FLAG_DISCONTINUITY; */
1998             }
1999 #if 0
2000             if( p[5]&0x40 )
2001                 msg_Dbg( p_demux, "random access indicator (pid=%d) ", pid->i_pid );
2002 #endif
2003         }
2004     }
2005
2006     /* Test continuity counter */
2007     /* continuous when (one of this):
2008         * diff == 1
2009         * diff == 0 and payload == 0
2010         * diff == 0 and duplicate packet (playload != 0) <- should we
2011         *   test the content ?
2012      */
2013     const int i_diff = ( i_cc - pid->i_cc )&0x0f;
2014     if( b_payload && i_diff == 1 )
2015     {
2016         pid->i_cc = ( pid->i_cc + 1 ) & 0xf;
2017     }
2018     else
2019     {
2020         if( pid->i_cc == 0xff )
2021         {
2022             msg_Warn( p_demux, "first packet for pid=%d cc=0x%x",
2023                       pid->i_pid, i_cc );
2024             pid->i_cc = i_cc;
2025         }
2026         else if( i_diff != 0 && !b_discontinuity )
2027         {
2028             msg_Warn( p_demux, "discontinuity received 0x%x instead of 0x%x (pid=%d)",
2029                       i_cc, ( pid->i_cc + 1 )&0x0f, pid->i_pid );
2030
2031             pid->i_cc = i_cc;
2032             if( pid->es->p_pes && pid->es->fmt.i_cat != VIDEO_ES )
2033             {
2034                 /* Small video artifacts are usually better than
2035                  * dropping full frames */
2036                 pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
2037             }
2038         }
2039     }
2040
2041     PCRHandle( p_demux, pid, p_bk );
2042
2043     if( i_skip >= 188 || pid->es->id == NULL || p_demux->p_sys->b_udp_out )
2044     {
2045         block_Release( p_bk );
2046         return i_ret;
2047     }
2048
2049     /* */
2050     if( !pid->b_scrambled != !b_scrambled )
2051     {
2052         msg_Warn( p_demux, "scrambled state changed on pid %d (%d->%d)",
2053                   pid->i_pid, pid->b_scrambled, b_scrambled );
2054
2055         pid->b_scrambled = b_scrambled;
2056
2057         for( int i = 0; i < pid->i_extra_es; i++ )
2058         {
2059             es_out_Control( p_demux->out, ES_OUT_SET_ES_SCRAMBLED_STATE,
2060                             pid->extra_es[i]->id, b_scrambled );
2061         }
2062         es_out_Control( p_demux->out, ES_OUT_SET_ES_SCRAMBLED_STATE,
2063                         pid->es->id, b_scrambled );
2064     }
2065
2066     /* We have to gather it */
2067     p_bk->p_buffer += i_skip;
2068     p_bk->i_buffer -= i_skip;
2069
2070     if( b_unit_start )
2071     {
2072         if( pid->es->p_pes )
2073         {
2074             ParsePES( p_demux, pid );
2075             i_ret = true;
2076         }
2077
2078         block_ChainLastAppend( &pid->es->pp_last, p_bk );
2079         if( p_bk->i_buffer > 6 )
2080         {
2081             pid->es->i_pes_size = GetWBE( &p_bk->p_buffer[4] );
2082             if( pid->es->i_pes_size > 0 )
2083             {
2084                 pid->es->i_pes_size += 6;
2085             }
2086         }
2087         pid->es->i_pes_gathered += p_bk->i_buffer;
2088         if( pid->es->i_pes_size > 0 &&
2089             pid->es->i_pes_gathered >= pid->es->i_pes_size )
2090         {
2091             ParsePES( p_demux, pid );
2092             i_ret = true;
2093         }
2094     }
2095     else
2096     {
2097         if( pid->es->p_pes == NULL )
2098         {
2099             /* msg_Dbg( p_demux, "broken packet" ); */
2100             block_Release( p_bk );
2101         }
2102         else
2103         {
2104             block_ChainLastAppend( &pid->es->pp_last, p_bk );
2105             pid->es->i_pes_gathered += p_bk->i_buffer;
2106             if( pid->es->i_pes_size > 0 &&
2107                 pid->es->i_pes_gathered >= pid->es->i_pes_size )
2108             {
2109                 ParsePES( p_demux, pid );
2110                 i_ret = true;
2111             }
2112         }
2113     }
2114
2115     return i_ret;
2116 }
2117
2118 static int PIDFillFormat( ts_pid_t *pid, int i_stream_type )
2119 {
2120     es_format_t *fmt = &pid->es->fmt;
2121
2122     switch( i_stream_type )
2123     {
2124     case 0x01:  /* MPEG-1 video */
2125     case 0x02:  /* MPEG-2 video */
2126     case 0x80:  /* MPEG-2 MOTO video */
2127         es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MPGV );
2128         break;
2129     case 0x03:  /* MPEG-1 audio */
2130     case 0x04:  /* MPEG-2 audio */
2131         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MPGA );
2132         break;
2133     case 0x11:  /* MPEG4 (audio) LATM */
2134     case 0x0f:  /* ISO/IEC 13818-7 Audio with ADTS transport syntax */
2135         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MP4A );
2136         break;
2137     case 0x10:  /* MPEG4 (video) */
2138         es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MP4V );
2139         pid->es->b_gather = true;
2140         break;
2141     case 0x1B:  /* H264 <- check transport syntax/needed descriptor */
2142         es_format_Init( fmt, VIDEO_ES, VLC_CODEC_H264 );
2143         break;
2144
2145     case 0x81:  /* A52 (audio) */
2146         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_A52 );
2147         break;
2148     case 0x82:  /* DVD_SPU (sub) */
2149         es_format_Init( fmt, SPU_ES, VLC_CODEC_SPU );
2150         break;
2151     case 0x83:  /* LPCM (audio) */
2152         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_DVD_LPCM );
2153         break;
2154     case 0x84:  /* SDDS (audio) */
2155         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_SDDS );
2156         break;
2157     case 0x85:  /* DTS (audio) */
2158         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_DTS );
2159         break;
2160     case 0x87: /* E-AC3 */
2161         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_EAC3 );
2162         break;
2163
2164     case 0x91:  /* A52 vls (audio) */
2165         es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', 'b' ) );
2166         break;
2167     case 0x92:  /* DVD_SPU vls (sub) */
2168         es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', 'b' ) );
2169         break;
2170
2171     case 0x94:  /* SDDS (audio) */
2172         es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 'b' ) );
2173         break;
2174
2175     case 0xa0:  /* MSCODEC vlc (video) (fixed later) */
2176         es_format_Init( fmt, UNKNOWN_ES, 0 );
2177         pid->es->b_gather = true;
2178         break;
2179
2180     case 0x06:  /* PES_PRIVATE  (fixed later) */
2181     case 0x12:  /* MPEG-4 generic (sub/scene/...) (fixed later) */
2182     case 0xEA:  /* Privately managed ES (VC-1) (fixed later */
2183     default:
2184         es_format_Init( fmt, UNKNOWN_ES, 0 );
2185         break;
2186     }
2187
2188     /* PES packets usually contain truncated frames */
2189     fmt->b_packetized = false;
2190
2191     return fmt->i_cat == UNKNOWN_ES ? VLC_EGENERIC : VLC_SUCCESS ;
2192 }
2193
2194 /*****************************************************************************
2195  * MP4 specific functions (IOD parser)
2196  *****************************************************************************/
2197 static int  IODDescriptorLength( int *pi_data, uint8_t **pp_data )
2198 {
2199     unsigned int i_b;
2200     unsigned int i_len = 0;
2201     do
2202     {
2203         i_b = **pp_data;
2204         (*pp_data)++;
2205         (*pi_data)--;
2206         i_len = ( i_len << 7 ) + ( i_b&0x7f );
2207
2208     } while( i_b&0x80 );
2209
2210     return( i_len );
2211 }
2212
2213 static int IODGetByte( int *pi_data, uint8_t **pp_data )
2214 {
2215     if( *pi_data > 0 )
2216     {
2217         const int i_b = **pp_data;
2218         (*pp_data)++;
2219         (*pi_data)--;
2220         return( i_b );
2221     }
2222     return( 0 );
2223 }
2224
2225 static int IODGetWord( int *pi_data, uint8_t **pp_data )
2226 {
2227     const int i1 = IODGetByte( pi_data, pp_data );
2228     const int i2 = IODGetByte( pi_data, pp_data );
2229     return( ( i1 << 8 ) | i2 );
2230 }
2231
2232 static int IODGet3Bytes( int *pi_data, uint8_t **pp_data )
2233 {
2234     const int i1 = IODGetByte( pi_data, pp_data );
2235     const int i2 = IODGetByte( pi_data, pp_data );
2236     const int i3 = IODGetByte( pi_data, pp_data );
2237
2238     return( ( i1 << 16 ) | ( i2 << 8) | i3 );
2239 }
2240
2241 static uint32_t IODGetDWord( int *pi_data, uint8_t **pp_data )
2242 {
2243     const uint32_t i1 = IODGetWord( pi_data, pp_data );
2244     const uint32_t i2 = IODGetWord( pi_data, pp_data );
2245     return( ( i1 << 16 ) | i2 );
2246 }
2247
2248 static char* IODGetURL( int *pi_data, uint8_t **pp_data )
2249 {
2250     char *url;
2251     int i_url_len, i;
2252
2253     i_url_len = IODGetByte( pi_data, pp_data );
2254     url = malloc( i_url_len + 1 );
2255     if( !url ) return NULL;
2256     for( i = 0; i < i_url_len; i++ )
2257     {
2258         url[i] = IODGetByte( pi_data, pp_data );
2259     }
2260     url[i_url_len] = '\0';
2261     return( url );
2262 }
2263
2264 static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
2265 {
2266     iod_descriptor_t *p_iod;
2267     int i;
2268     int i_es_index;
2269     uint8_t i_flags, i_iod_tag, byte1, byte2, byte3;
2270     bool  b_url;
2271     int   i_iod_length;
2272
2273     p_iod = malloc( sizeof( iod_descriptor_t ) );
2274     if( !p_iod ) return NULL;
2275     memset( p_iod, 0, sizeof( iod_descriptor_t ) );
2276
2277 #ifdef TS_DEBUG
2278     fprintf( stderr, "\n************ IOD ************" );
2279 #endif
2280     for( i = 0; i < 255; i++ )
2281     {
2282         p_iod->es_descr[i].b_ok = 0;
2283     }
2284     i_es_index = 0;
2285
2286     if( i_data < 3 )
2287     {
2288         return p_iod;
2289     }
2290
2291     byte1 = IODGetByte( &i_data, &p_data );
2292     byte2 = IODGetByte( &i_data, &p_data );
2293     byte3 = IODGetByte( &i_data, &p_data );
2294     if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor
2295     {
2296         p_iod->i_iod_label_scope = 0x11;
2297         p_iod->i_iod_label = byte1;
2298         i_iod_tag = byte2;
2299     }
2300     else  //correct implementation of the IOD_descriptor
2301     {
2302         p_iod->i_iod_label_scope = byte1;
2303         p_iod->i_iod_label = byte2;
2304         i_iod_tag = byte3;
2305     }
2306 #ifdef TS_DEBUG
2307     fprintf( stderr, "\n* iod_label:%d", p_iod->i_iod_label );
2308     fprintf( stderr, "\n* ===========" );
2309     fprintf( stderr, "\n* tag:0x%x", i_iod_tag );
2310 #endif
2311     if( i_iod_tag != 0x02 )
2312     {
2313 #ifdef TS_DEBUG
2314         fprintf( stderr, "\n ERR: tag %02x != 0x02", i_iod_tag );
2315 #endif
2316         return p_iod;
2317     }
2318
2319     i_iod_length = IODDescriptorLength( &i_data, &p_data );
2320 #ifdef TS_DEBUG
2321     fprintf( stderr, "\n* length:%d", i_iod_length );
2322 #endif
2323     if( i_iod_length > i_data )
2324     {
2325         i_iod_length = i_data;
2326     }
2327
2328     p_iod->i_od_id = ( IODGetByte( &i_data, &p_data ) << 2 );
2329     i_flags = IODGetByte( &i_data, &p_data );
2330     p_iod->i_od_id |= i_flags >> 6;
2331     b_url = ( i_flags >> 5  )&0x01;
2332 #ifdef TS_DEBUG
2333     fprintf( stderr, "\n* od_id:%d", p_iod->i_od_id );
2334     fprintf( stderr, "\n* url flag:%d", b_url );
2335     fprintf( stderr, "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 );
2336 #endif
2337     if( b_url )
2338     {
2339         p_iod->psz_url = IODGetURL( &i_data, &p_data );
2340 #ifdef TS_DEBUG
2341         fprintf( stderr, "\n* url string:%s", p_iod->psz_url );
2342         fprintf( stderr, "\n*****************************\n" );
2343 #endif
2344         return p_iod;
2345     }
2346     else
2347     {
2348         p_iod->psz_url = NULL;
2349     }
2350
2351     p_iod->i_ODProfileLevelIndication = IODGetByte( &i_data, &p_data );
2352     p_iod->i_sceneProfileLevelIndication = IODGetByte( &i_data, &p_data );
2353     p_iod->i_audioProfileLevelIndication = IODGetByte( &i_data, &p_data );
2354     p_iod->i_visualProfileLevelIndication = IODGetByte( &i_data, &p_data );
2355     p_iod->i_graphicsProfileLevelIndication = IODGetByte( &i_data, &p_data );
2356 #ifdef TS_DEBUG
2357     fprintf( stderr, "\n* ODProfileLevelIndication:%d", p_iod->i_ODProfileLevelIndication );
2358     fprintf( stderr, "\n* sceneProfileLevelIndication:%d", p_iod->i_sceneProfileLevelIndication );
2359     fprintf( stderr, "\n* audioProfileLevelIndication:%d", p_iod->i_audioProfileLevelIndication );
2360     fprintf( stderr, "\n* visualProfileLevelIndication:%d", p_iod->i_visualProfileLevelIndication );
2361     fprintf( stderr, "\n* graphicsProfileLevelIndication:%d", p_iod->i_graphicsProfileLevelIndication );
2362 #endif
2363
2364     while( i_data > 0 && i_es_index < 255)
2365     {
2366         int i_tag, i_length;
2367         int     i_data_sav;
2368         uint8_t *p_data_sav;
2369
2370         i_tag = IODGetByte( &i_data, &p_data );
2371         i_length = IODDescriptorLength( &i_data, &p_data );
2372
2373         i_data_sav = i_data;
2374         p_data_sav = p_data;
2375
2376         i_data = i_length;
2377
2378         switch( i_tag )
2379         {
2380         case 0x03:
2381             {
2382 #define es_descr    p_iod->es_descr[i_es_index]
2383                 int i_decoderConfigDescr_length;
2384 #ifdef TS_DEBUG
2385                 fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length );
2386 #endif
2387                 es_descr.b_ok = 1;
2388
2389                 es_descr.i_es_id = IODGetWord( &i_data, &p_data );
2390                 i_flags = IODGetByte( &i_data, &p_data );
2391                 es_descr.b_streamDependenceFlag = ( i_flags >> 7 )&0x01;
2392                 b_url = ( i_flags >> 6 )&0x01;
2393                 es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01;
2394                 es_descr.i_streamPriority = i_flags & 0x1f;
2395 #ifdef TS_DEBUG
2396                 fprintf( stderr, "\n*   * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag );
2397                 fprintf( stderr, "\n*   * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag );
2398                 fprintf( stderr, "\n*   * streamPriority:%d", es_descr.i_streamPriority );
2399 #endif
2400                 if( es_descr.b_streamDependenceFlag )
2401                 {
2402                     es_descr.i_dependOn_es_id = IODGetWord( &i_data, &p_data );
2403 #ifdef TS_DEBUG
2404                     fprintf( stderr, "\n*   * dependOn_es_id:%d", es_descr.i_dependOn_es_id );
2405 #endif
2406                 }
2407
2408                 if( b_url )
2409                 {
2410                     es_descr.psz_url = IODGetURL( &i_data, &p_data );
2411 #ifdef TS_DEBUG
2412                     fprintf( stderr, "\n* url string:%s", es_descr.psz_url );
2413 #endif
2414                 }
2415                 else
2416                 {
2417                     es_descr.psz_url = NULL;
2418                 }
2419
2420                 if( es_descr.b_OCRStreamFlag )
2421                 {
2422                     es_descr.i_OCR_es_id = IODGetWord( &i_data, &p_data );
2423 #ifdef TS_DEBUG
2424                     fprintf( stderr, "\n*   * OCR_es_id:%d", es_descr.i_OCR_es_id );
2425 #endif
2426                 }
2427
2428                 if( IODGetByte( &i_data, &p_data ) != 0x04 )
2429                 {
2430 #ifdef TS_DEBUG
2431                     fprintf( stderr, "\n* ERR missing DecoderConfigDescr" );
2432 #endif
2433                     es_descr.b_ok = 0;
2434                     break;
2435                 }
2436                 i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
2437 #ifdef TS_DEBUG
2438                 fprintf( stderr, "\n*   - DecoderConfigDesc length:%d", i_decoderConfigDescr_length );
2439 #endif
2440 #define dec_descr   es_descr.dec_descr
2441                 dec_descr.i_objectTypeIndication = IODGetByte( &i_data, &p_data );
2442                 i_flags = IODGetByte( &i_data, &p_data );
2443                 dec_descr.i_streamType = i_flags >> 2;
2444                 dec_descr.b_upStream = ( i_flags >> 1 )&0x01;
2445                 dec_descr.i_bufferSizeDB = IODGet3Bytes( &i_data, &p_data );
2446                 dec_descr.i_maxBitrate = IODGetDWord( &i_data, &p_data );
2447                 dec_descr.i_avgBitrate = IODGetDWord( &i_data, &p_data );
2448 #ifdef TS_DEBUG
2449                 fprintf( stderr, "\n*     * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication  );
2450                 fprintf( stderr, "\n*     * streamType:0x%x", dec_descr.i_streamType );
2451                 fprintf( stderr, "\n*     * upStream:%d", dec_descr.b_upStream );
2452                 fprintf( stderr, "\n*     * bufferSizeDB:%d", dec_descr.i_bufferSizeDB );
2453                 fprintf( stderr, "\n*     * maxBitrate:%d", dec_descr.i_maxBitrate );
2454                 fprintf( stderr, "\n*     * avgBitrate:%d", dec_descr.i_avgBitrate );
2455 #endif
2456                 if( i_decoderConfigDescr_length > 13 && IODGetByte( &i_data, &p_data ) == 0x05 )
2457                 {
2458                     int i;
2459                     dec_descr.i_decoder_specific_info_len =
2460                         IODDescriptorLength( &i_data, &p_data );
2461                     if( dec_descr.i_decoder_specific_info_len > 0 )
2462                     {
2463                         dec_descr.p_decoder_specific_info =
2464                             malloc( dec_descr.i_decoder_specific_info_len );
2465                     }
2466                     for( i = 0; i < dec_descr.i_decoder_specific_info_len; i++ )
2467                     {
2468                         dec_descr.p_decoder_specific_info[i] = IODGetByte( &i_data, &p_data );
2469                     }
2470                 }
2471                 else
2472                 {
2473                     dec_descr.i_decoder_specific_info_len = 0;
2474                     dec_descr.p_decoder_specific_info = NULL;
2475                 }
2476             }
2477 #undef  dec_descr
2478 #define sl_descr    es_descr.sl_descr
2479             {
2480                 int i_SLConfigDescr_length;
2481                 int i_predefined;
2482
2483                 if( IODGetByte( &i_data, &p_data ) != 0x06 )
2484                 {
2485 #ifdef TS_DEBUG
2486                     fprintf( stderr, "\n* ERR missing SLConfigDescr" );
2487 #endif
2488                     es_descr.b_ok = 0;
2489                     break;
2490                 }
2491                 i_SLConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
2492 #ifdef TS_DEBUG
2493                 fprintf( stderr, "\n*   - SLConfigDescr length:%d", i_SLConfigDescr_length );
2494 #endif
2495                 i_predefined = IODGetByte( &i_data, &p_data );
2496 #ifdef TS_DEBUG
2497                 fprintf( stderr, "\n*     * i_predefined:0x%x", i_predefined  );
2498 #endif
2499                 switch( i_predefined )
2500                 {
2501                 case 0x01:
2502                     {
2503                         sl_descr.b_useAccessUnitStartFlag   = 0;
2504                         sl_descr.b_useAccessUnitEndFlag     = 0;
2505                         sl_descr.b_useRandomAccessPointFlag = 0;
2506                         //sl_descr.b_useRandomAccessUnitsOnlyFlag = 0;
2507                         sl_descr.b_usePaddingFlag           = 0;
2508                         sl_descr.b_useTimeStampsFlags       = 0;
2509                         sl_descr.b_useIdleFlag              = 0;
2510                         sl_descr.b_durationFlag     = 0;    // FIXME FIXME
2511                         sl_descr.i_timeStampResolution      = 1000;
2512                         sl_descr.i_OCRResolution    = 0;    // FIXME FIXME
2513                         sl_descr.i_timeStampLength          = 32;
2514                         sl_descr.i_OCRLength        = 0;    // FIXME FIXME
2515                         sl_descr.i_AU_Length                = 0;
2516                         sl_descr.i_instantBitrateLength= 0; // FIXME FIXME
2517                         sl_descr.i_degradationPriorityLength= 0;
2518                         sl_descr.i_AU_seqNumLength          = 0;
2519                         sl_descr.i_packetSeqNumLength       = 0;
2520                         if( sl_descr.b_durationFlag )
2521                         {
2522                             sl_descr.i_timeScale            = 0;    // FIXME FIXME
2523                             sl_descr.i_accessUnitDuration   = 0;    // FIXME FIXME
2524                             sl_descr.i_compositionUnitDuration= 0;    // FIXME FIXME
2525                         }
2526                         if( !sl_descr.b_useTimeStampsFlags )
2527                         {
2528                             sl_descr.i_startDecodingTimeStamp   = 0;    // FIXME FIXME
2529                             sl_descr.i_startCompositionTimeStamp= 0;    // FIXME FIXME
2530                         }
2531                     }
2532                     break;
2533                 default:
2534 #ifdef TS_DEBUG
2535                     fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" );
2536 #endif
2537                     es_descr.b_ok = 0;
2538                     break;
2539                 }
2540             }
2541             break;
2542 #undef  sl_descr
2543 #undef  es_descr
2544         default:
2545 #ifdef TS_DEBUG
2546             fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length );
2547 #endif
2548             break;
2549         }
2550
2551         p_data = p_data_sav + i_length;
2552         i_data = i_data_sav - i_length;
2553         i_es_index++;
2554     }
2555 #ifdef TS_DEBUG
2556     fprintf( stderr, "\n*****************************\n" );
2557 #endif
2558     return p_iod;
2559 }
2560
2561 static void IODFree( iod_descriptor_t *p_iod )
2562 {
2563     int i;
2564
2565     if( p_iod->psz_url )
2566     {
2567         free( p_iod->psz_url );
2568         p_iod->psz_url = NULL;
2569         free( p_iod );
2570         return;
2571     }
2572
2573     for( i = 0; i < 255; i++ )
2574     {
2575 #define es_descr p_iod->es_descr[i]
2576         if( es_descr.b_ok )
2577         {
2578             if( es_descr.psz_url )
2579             {
2580                 free( es_descr.psz_url );
2581                 es_descr.psz_url = NULL;
2582             }
2583             else
2584             {
2585                 free( es_descr.dec_descr.p_decoder_specific_info );
2586                 es_descr.dec_descr.p_decoder_specific_info = NULL;
2587                 es_descr.dec_descr.i_decoder_specific_info_len = 0;
2588             }
2589         }
2590         es_descr.b_ok = 0;
2591 #undef  es_descr
2592     }
2593     free( p_iod );
2594 }
2595
2596 /****************************************************************************
2597  ****************************************************************************
2598  ** libdvbpsi callbacks
2599  ****************************************************************************
2600  ****************************************************************************/
2601 static bool ProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm )
2602 {
2603     demux_sys_t          *p_sys = p_demux->p_sys;
2604
2605     if( !p_sys->b_access_control )
2606         return false;
2607     if( ( p_sys->i_current_program == -1 && p_sys->programs_list.i_count == 0 ) ||
2608         p_sys->i_current_program == 0 )
2609         return true;
2610     if( p_sys->i_current_program == i_pgrm )
2611         return true;
2612
2613     if( p_sys->programs_list.i_count != 0 )
2614     {
2615         for( int i = 0; i < p_sys->programs_list.i_count; i++ )
2616         {
2617             if( i_pgrm == p_sys->programs_list.p_values[i].i_int )
2618                 return true;
2619         }
2620     }
2621     return false;
2622 }
2623
2624 static void ValidateDVBMeta( demux_t *p_demux, int i_pid )
2625 {
2626     demux_sys_t *p_sys = p_demux->p_sys;
2627
2628     if( !p_sys->b_dvb_meta || ( i_pid != 0x11 && i_pid != 0x12 && i_pid != 0x14 ) )
2629         return;
2630
2631     msg_Warn( p_demux, "Switching to non DVB mode" );
2632
2633     /* This doesn't look like a DVB stream so don't try
2634      * parsing the SDT/EDT/TDT */
2635
2636     for( int i = 0x11; i <= 0x14; i++ )
2637     {
2638         if( i == 0x13 ) continue;
2639         ts_pid_t *p_pid = &p_sys->pid[i];
2640         if( p_pid->psi )
2641         {
2642             dvbpsi_DetachDemux( p_pid->psi->handle );
2643             free( p_pid->psi );
2644             p_pid->psi = NULL;
2645             p_pid->b_valid = false;
2646         }
2647         if( p_sys->b_access_control )
2648             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
2649                             ACCESS_SET_PRIVATE_ID_STATE, i, false );
2650
2651     }
2652     p_sys->b_dvb_meta = false;
2653 }
2654
2655
2656 #ifdef TS_USE_DVB_SI
2657 /* FIXME same than dvbsi_to_utf8 from dvb access */
2658 static char *EITConvertToUTF8( const unsigned char *psz_instring,
2659                                size_t i_length,
2660                                bool b_broken )
2661 {
2662     const char *psz_encoding;
2663     char *psz_outstring;
2664     char psz_encbuf[sizeof( "ISO_8859-123" )];
2665     size_t i_in, i_out, offset = 1;
2666     vlc_iconv_t iconv_handle;
2667
2668     if( i_length < 1 ) return NULL;
2669     if( psz_instring[0] >= 0x20 )
2670     {
2671         /* According to ETSI EN 300 468 Annex A, this should be ISO6937,
2672          * but some broadcasters use different charset... */
2673         if( b_broken )
2674            psz_encoding = "ISO_8859-1";
2675         else
2676            psz_encoding = "ISO_6937";
2677
2678         offset = 0;
2679     }
2680     else switch( psz_instring[0] )
2681     {
2682     case 0x01:
2683         psz_encoding = "ISO_8859-5";
2684         break;
2685     case 0x02:
2686         psz_encoding = "ISO_8859-6";
2687         break;
2688     case 0x03:
2689         psz_encoding = "ISO_8859-7";
2690         break;
2691     case 0x04:
2692         psz_encoding = "ISO_8859-8";
2693         break;
2694     case 0x05:
2695         psz_encoding = "ISO_8859-9";
2696         break;
2697     case 0x06:
2698         psz_encoding = "ISO_8859-10";
2699         break;
2700     case 0x07:
2701         psz_encoding = "ISO_8859-11";
2702         break;
2703     case 0x08:
2704         psz_encoding = "ISO_8859-12";
2705         break;
2706     case 0x09:
2707         psz_encoding = "ISO_8859-13";
2708         break;
2709     case 0x0a:
2710         psz_encoding = "ISO_8859-14";
2711         break;
2712     case 0x0b:
2713         psz_encoding = "ISO_8859-15";
2714         break;
2715     case 0x10:
2716 #warning Is Latin-10 (psz_instring[2] == 16) really illegal?
2717         if( i_length < 3 || psz_instring[1] != 0x00 || psz_instring[2] > 15
2718          || psz_instring[2] == 0 )
2719         {
2720             psz_encoding = "UTF-8";
2721             offset = 0;
2722         }
2723         else
2724         {
2725             sprintf( psz_encbuf, "ISO_8859-%u", psz_instring[2] );
2726             psz_encoding = psz_encbuf;
2727             offset = 3;
2728         }
2729         break;
2730     case 0x11:
2731 #warning Is there a BOM or do we use a fixed endianess?
2732         psz_encoding = "UTF-16";
2733         break;
2734     case 0x12:
2735         psz_encoding = "KSC5601-1987";
2736         break;
2737     case 0x13:
2738         psz_encoding = "GB2312"; /* GB-2312-1980 */
2739         break;
2740     case 0x14:
2741         psz_encoding = "BIG-5";
2742         break;
2743     case 0x15:
2744         psz_encoding = "UTF-8";
2745         break;
2746     default:
2747         /* invalid */
2748         psz_encoding = "UTF-8";
2749         offset = 0;
2750     }
2751
2752     i_in = i_length - offset;
2753     i_out = i_in * 6 + 1;
2754
2755     psz_outstring = malloc( i_out );
2756     if( !psz_outstring )
2757     {
2758         return NULL;
2759     }
2760
2761     iconv_handle = vlc_iconv_open( "UTF-8", psz_encoding );
2762     if( iconv_handle == (vlc_iconv_t)(-1) )
2763     {
2764          /* Invalid character set (e.g. ISO_8859-12) */
2765          memcpy( psz_outstring, &psz_instring[offset], i_in );
2766          psz_outstring[i_in] = '\0';
2767          EnsureUTF8( psz_outstring );
2768     }
2769     else
2770     {
2771         const char *psz_in = (const char *)&psz_instring[offset];
2772         char *psz_out = psz_outstring;
2773
2774         while( vlc_iconv( iconv_handle, &psz_in, &i_in,
2775                           &psz_out, &i_out ) == (size_t)(-1) )
2776         {
2777             /* skip naughty byte. This may fail terribly for multibyte stuff,
2778              * but what can we do anyway? */
2779             psz_in++;
2780             i_in--;
2781             vlc_iconv( iconv_handle, NULL, NULL, NULL, NULL ); /* reset */
2782         }
2783         vlc_iconv_close( iconv_handle );
2784
2785         *psz_out = '\0';
2786
2787         /* Convert EIT-coded CR/LFs */
2788         unsigned char *pbuf = (unsigned char *)psz_outstring;
2789         for( ; pbuf < (unsigned char *)psz_out ; pbuf++)
2790         {
2791             if( pbuf[0] == 0xc2 && pbuf[1] == 0x8a )
2792             {
2793                 pbuf[0] = ' ';
2794                 pbuf[1] = '\n';
2795             }
2796         }
2797
2798
2799     }
2800     return psz_outstring;
2801 }
2802
2803 static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
2804 {
2805     demux_sys_t          *p_sys = p_demux->p_sys;
2806     ts_pid_t             *sdt = &p_sys->pid[0x11];
2807     dvbpsi_sdt_service_t *p_srv;
2808
2809     msg_Dbg( p_demux, "SDTCallBack called" );
2810
2811     if( sdt->psi->i_sdt_version != -1 &&
2812         ( !p_sdt->b_current_next ||
2813           p_sdt->i_version == sdt->psi->i_sdt_version ) )
2814     {
2815         dvbpsi_DeleteSDT( p_sdt );
2816         return;
2817     }
2818
2819     msg_Dbg( p_demux, "new SDT ts_id=%d version=%d current_next=%d "
2820              "network_id=%d",
2821              p_sdt->i_ts_id, p_sdt->i_version, p_sdt->b_current_next,
2822              p_sdt->i_network_id );
2823
2824     p_sys->b_broken_charset = false;
2825
2826     for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next )
2827     {
2828         vlc_meta_t          *p_meta;
2829         dvbpsi_descriptor_t *p_dr;
2830
2831         const char *psz_type = NULL;
2832         const char *psz_status = NULL;
2833
2834         msg_Dbg( p_demux, "  * service id=%d eit schedule=%d present=%d "
2835                  "running=%d free_ca=%d",
2836                  p_srv->i_service_id, p_srv->b_eit_schedule,
2837                  p_srv->b_eit_present, p_srv->i_running_status,
2838                  p_srv->b_free_ca );
2839
2840         if( p_sys->i_current_program != -1 && p_sys->i_current_program != p_srv->i_service_id )
2841             continue;
2842
2843         p_meta = vlc_meta_New();
2844         for( p_dr = p_srv->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
2845         {
2846             if( p_dr->i_tag == 0x48 )
2847             {
2848                 static const char *ppsz_type[17] = {
2849                     "Reserved",
2850                     "Digital television service",
2851                     "Digital radio sound service",
2852                     "Teletext service",
2853                     "NVOD reference service",
2854                     "NVOD time-shifted service",
2855                     "Mosaic service",
2856                     "PAL coded signal",
2857                     "SECAM coded signal",
2858                     "D/D2-MAC",
2859                     "FM Radio",
2860                     "NTSC coded signal",
2861                     "Data broadcast service",
2862                     "Reserved for Common Interface Usage",
2863                     "RCS Map (see EN 301 790 [35])",
2864                     "RCS FLS (see EN 301 790 [35])",
2865                     "DVB MHP service"
2866                 };
2867                 dvbpsi_service_dr_t *pD = dvbpsi_DecodeServiceDr( p_dr );
2868                 char *str1 = NULL;
2869                 char *str2 = NULL;
2870
2871                 /* Workarounds for broadcasters with broken EPG */
2872
2873                 if( p_sdt->i_network_id == 133 )
2874                     p_sys->b_broken_charset = true;  /* SKY DE & BetaDigital use ISO8859-1 */
2875
2876                 /* List of providers using ISO8859-1 */
2877                 static const char ppsz_broken_providers[][8] = {
2878                     "CSAT",     /* CanalSat FR */
2879                     "GR1",      /* France televisions */
2880                     "MULTI4",   /* NT1 */
2881                     "MR5",      /* France 2/M6 HD */
2882                     ""
2883                 };
2884                 for( int i = 0; *ppsz_broken_providers[i]; i++ )
2885                 {
2886                     const size_t i_length = strlen(ppsz_broken_providers[i]);
2887                     if( pD->i_service_provider_name_length == i_length &&
2888                         !strncmp( pD->i_service_provider_name, ppsz_broken_providers[i], i_length ) )
2889                         p_sys->b_broken_charset = true;
2890                 }
2891
2892                 /* FIXME: Digital+ ES also uses ISO8859-1 */
2893
2894                 str1 = EITConvertToUTF8(pD->i_service_provider_name,
2895                                         pD->i_service_provider_name_length,
2896                                         p_sys->b_broken_charset );
2897                 str2 = EITConvertToUTF8(pD->i_service_name,
2898                                         pD->i_service_name_length,
2899                                         p_sys->b_broken_charset );
2900
2901                 msg_Dbg( p_demux, "    - type=%d provider=%s name=%s",
2902                          pD->i_service_type, str1, str2 );
2903
2904                 vlc_meta_SetTitle( p_meta, str2 );
2905                 vlc_meta_SetPublisher( p_meta, str1 );
2906                 if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 )
2907                     psz_type = ppsz_type[pD->i_service_type];
2908                 free( str1 );
2909                 free( str2 );
2910             }
2911         }
2912
2913         if( p_srv->i_running_status >= 0x01 && p_srv->i_running_status <= 0x04 )
2914         {
2915             static const char *ppsz_status[5] = {
2916                 "Unknown",
2917                 "Not running",
2918                 "Starts in a few seconds",
2919                 "Pausing",
2920                 "Running"
2921             };
2922             psz_status = ppsz_status[p_srv->i_running_status];
2923         }
2924
2925         if( psz_type )
2926             vlc_meta_AddExtra( p_meta, "Type", psz_type );
2927         if( psz_status )
2928             vlc_meta_AddExtra( p_meta, "Status", psz_status );
2929
2930         es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META,
2931                         p_srv->i_service_id, p_meta );
2932         vlc_meta_Delete( p_meta );
2933     }
2934
2935     sdt->psi->i_sdt_version = p_sdt->i_version;
2936     dvbpsi_DeleteSDT( p_sdt );
2937 }
2938
2939 /* i_year: year - 1900  i_month: 0-11  i_mday: 1-31 i_hour: 0-23 i_minute: 0-59 i_second: 0-59 */
2940 static int64_t vlc_timegm( int i_year, int i_month, int i_mday, int i_hour, int i_minute, int i_second )
2941 {
2942     static const int pn_day[12+1] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
2943     int64_t i_day;
2944     int i;
2945
2946     if( i_year < 70 ||
2947         i_month < 0 || i_month > 11 || i_mday < 1 || i_mday > 31 ||
2948         i_hour < 0 || i_hour > 23 || i_minute < 0 || i_minute > 59 || i_second < 0 || i_second > 59 )
2949         return -1;
2950
2951     /* Count the number of days */
2952     i_day = 365 * (i_year-70) + pn_day[i_month] + i_mday - 1;
2953 #define LEAP(y) ( ((y)%4) == 0 && (((y)%100) != 0 || ((y)%400) == 0) ? 1 : 0)
2954     for( i = 70; i < i_year; i++ )
2955         i_day += LEAP(1900+i);
2956     if( i_month > 1 )
2957         i_day += LEAP(1900+i_year);
2958 #undef LEAP
2959     /**/
2960     return ((24*i_day + i_hour)*60 + i_minute)*60 + i_second;
2961 }
2962
2963 static void EITDecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d )
2964 {
2965     const int yp = (int)( ( (double)i_mjd - 15078.2)/365.25 );
2966     const int mp = (int)( ((double)i_mjd - 14956.1 - (int)(yp * 365.25)) / 30.6001 );
2967     const int c = ( mp == 14 || mp == 15 ) ? 1 : 0;
2968
2969     *p_y = 1900 + yp + c*1;
2970     *p_m = mp - 1 - c*12;
2971     *p_d = i_mjd - 14956 - (int)(yp*365.25) - (int)(mp*30.6001);
2972 }
2973 #define CVT_FROM_BCD(v) ((((v) >> 4)&0xf)*10 + ((v)&0xf))
2974 static int64_t EITConvertStartTime( uint64_t i_date )
2975 {
2976     const int i_mjd = i_date >> 24;
2977     const int i_hour   = CVT_FROM_BCD(i_date >> 16);
2978     const int i_minute = CVT_FROM_BCD(i_date >>  8);
2979     const int i_second = CVT_FROM_BCD(i_date      );
2980     int i_year;
2981     int i_month;
2982     int i_day;
2983
2984     /* if all 40 bits are 1, the start is unknown */
2985     if( i_date == UINT64_C(0xffffffffff) )
2986         return -1;
2987
2988     EITDecodeMjd( i_mjd, &i_year, &i_month, &i_day );
2989     return vlc_timegm( i_year - 1900, i_month - 1, i_day, i_hour, i_minute, i_second );
2990 }
2991 static int EITConvertDuration( uint32_t i_duration )
2992 {
2993     return CVT_FROM_BCD(i_duration >> 16) * 3600 +
2994            CVT_FROM_BCD(i_duration >> 8 ) * 60 +
2995            CVT_FROM_BCD(i_duration      );
2996 }
2997 #undef CVT_FROM_BCD
2998
2999 #ifdef TS_USE_TDT
3000 static void TDTCallBack( demux_t *p_demux, dvbpsi_tot_t *p_tdt )
3001 {
3002     demux_sys_t        *p_sys = p_demux->p_sys;
3003
3004     p_sys->i_tdt_delta = CLOCK_FREQ * EITConvertStartTime( p_tdt->i_utc_time )
3005                          - mdate();
3006     dvbpsi_DeleteTOT(p_tdt);
3007 }
3008 #endif
3009
3010
3011 static void EITCallBack( demux_t *p_demux,
3012                          dvbpsi_eit_t *p_eit, bool b_current_following )
3013 {
3014     demux_sys_t        *p_sys = p_demux->p_sys;
3015     dvbpsi_eit_event_t *p_evt;
3016     vlc_epg_t *p_epg;
3017
3018     msg_Dbg( p_demux, "EITCallBack called" );
3019     if( !p_eit->b_current_next || ( p_sys->i_current_program != -1 && p_sys->i_current_program != p_eit->i_service_id ) )
3020     {
3021         dvbpsi_DeleteEIT( p_eit );
3022         return;
3023     }
3024
3025     msg_Dbg( p_demux, "new EIT service_id=%d version=%d current_next=%d "
3026              "ts_id=%d network_id=%d segment_last_section_number=%d "
3027              "last_table_id=%d",
3028              p_eit->i_service_id, p_eit->i_version, p_eit->b_current_next,
3029              p_eit->i_ts_id, p_eit->i_network_id,
3030              p_eit->i_segment_last_section_number, p_eit->i_last_table_id );
3031
3032     p_epg = vlc_epg_New( NULL );
3033     for( p_evt = p_eit->p_first_event; p_evt; p_evt = p_evt->p_next )
3034     {
3035         dvbpsi_descriptor_t *p_dr;
3036         char                *psz_name = NULL;
3037         char                *psz_text = NULL;
3038         char                *psz_extra = strdup("");
3039         int64_t i_start;
3040         int i_duration;
3041
3042         i_start = EITConvertStartTime( p_evt->i_start_time );
3043         i_duration = EITConvertDuration( p_evt->i_duration );
3044
3045         msg_Dbg( p_demux, "  * event id=%d start_time:%d duration=%d "
3046                           "running=%d free_ca=%d",
3047                  p_evt->i_event_id, (int)i_start, (int)i_duration,
3048                  p_evt->i_running_status, p_evt->b_free_ca );
3049
3050         for( p_dr = p_evt->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
3051         {
3052             if( p_dr->i_tag == 0x4d )
3053             {
3054                 dvbpsi_short_event_dr_t *pE = dvbpsi_DecodeShortEventDr( p_dr );
3055
3056                 /* Only take first description, as we don't handle language-info
3057                    for epg atm*/
3058                 if( pE && psz_name == NULL)
3059                 {
3060                     psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length,
3061                                                  p_sys->b_broken_charset );
3062                     psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length,
3063                                                  p_sys->b_broken_charset );
3064                     msg_Dbg( p_demux, "    - short event lang=%3.3s '%s' : '%s'",
3065                              pE->i_iso_639_code, psz_name, psz_text );
3066                 }
3067             }
3068             else if( p_dr->i_tag == 0x4e )
3069             {
3070                 dvbpsi_extended_event_dr_t *pE = dvbpsi_DecodeExtendedEventDr( p_dr );
3071                 if( pE )
3072                 {
3073                     msg_Dbg( p_demux, "    - extended event lang=%3.3s [%d/%d]",
3074                              pE->i_iso_639_code,
3075                              pE->i_descriptor_number, pE->i_last_descriptor_number );
3076
3077                     if( pE->i_text_length > 0 )
3078                     {
3079                         char *psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length,
3080                                                            p_sys->b_broken_charset );
3081                         if( psz_text )
3082                         {
3083                             msg_Dbg( p_demux, "       - text='%s'", psz_text );
3084
3085                             psz_extra = xrealloc( psz_extra,
3086                                    strlen(psz_extra) + strlen(psz_text) + 1 );
3087                             strcat( psz_extra, psz_text );
3088                             free( psz_text );
3089                         }
3090                     }
3091
3092                     for( int i = 0; i < pE->i_entry_count; i++ )
3093                     {
3094                         char *psz_dsc = EITConvertToUTF8( pE->i_item_description[i],
3095                                                           pE->i_item_description_length[i],
3096                                                           p_sys->b_broken_charset );
3097                         char *psz_itm = EITConvertToUTF8( pE->i_item[i], pE->i_item_length[i],
3098                                                           p_sys->b_broken_charset );
3099
3100                         if( psz_dsc && psz_itm )
3101                         {
3102                             msg_Dbg( p_demux, "       - desc='%s' item='%s'", psz_dsc, psz_itm );
3103 #if 0
3104                             psz_extra = xrealloc( psz_extra,
3105                                          strlen(psz_extra) + strlen(psz_dsc) +
3106                                          strlen(psz_itm) + 3 + 1 );
3107                             strcat( psz_extra, "(" );
3108                             strcat( psz_extra, psz_dsc );
3109                             strcat( psz_extra, " " );
3110                             strcat( psz_extra, psz_itm );
3111                             strcat( psz_extra, ")" );
3112 #endif
3113                         }
3114                         free( psz_dsc );
3115                         free( psz_itm );
3116                     }
3117                 }
3118             }
3119             else
3120             {
3121                 msg_Dbg( p_demux, "    - tag=0x%x(%d)", p_dr->i_tag, p_dr->i_tag );
3122             }
3123         }
3124
3125         /* */
3126         if( i_start > 0 )
3127             vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text,
3128                               *psz_extra ? psz_extra : NULL );
3129
3130         /* Update "now playing" field */
3131         if( p_evt->i_running_status == 0x04 && i_start > 0 )
3132             vlc_epg_SetCurrent( p_epg, i_start );
3133
3134         free( psz_name );
3135         free( psz_text );
3136
3137         free( psz_extra );
3138     }
3139     if( p_epg->i_event > 0 )
3140     {
3141         if( b_current_following &&
3142             (  p_sys->i_current_program == -1 ||
3143                p_sys->i_current_program == p_eit->i_service_id ) )
3144         {
3145             p_sys->i_dvb_length = 0;
3146             p_sys->i_dvb_start = 0;
3147
3148             if( p_epg->p_current )
3149             {
3150                 p_sys->i_dvb_start = CLOCK_FREQ * p_epg->p_current->i_start;
3151                 p_sys->i_dvb_length = CLOCK_FREQ * p_epg->p_current->i_duration;
3152             }
3153         }
3154         es_out_Control( p_demux->out, ES_OUT_SET_GROUP_EPG, p_eit->i_service_id, p_epg );
3155     }
3156     vlc_epg_Delete( p_epg );
3157
3158     dvbpsi_DeleteEIT( p_eit );
3159 }
3160 static void EITCallBackCurrentFollowing( demux_t *p_demux, dvbpsi_eit_t *p_eit )
3161 {
3162     EITCallBack( p_demux, p_eit, true );
3163 }
3164 static void EITCallBackSchedule( demux_t *p_demux, dvbpsi_eit_t *p_eit )
3165 {
3166     EITCallBack( p_demux, p_eit, false );
3167 }
3168
3169 static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h,
3170                                  uint8_t  i_table_id, uint16_t i_extension )
3171 {
3172 #if 0
3173     msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
3174              i_table_id, i_table_id, i_extension, i_extension );
3175 #endif
3176     if( p_demux->p_sys->pid[0].psi->i_pat_version != -1 && i_table_id == 0x42 )
3177     {
3178         msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
3179                  i_table_id, i_table_id, i_extension, i_extension );
3180
3181         dvbpsi_AttachSDT( h, i_table_id, i_extension,
3182                           (dvbpsi_sdt_callback)SDTCallBack, p_demux );
3183     }
3184     else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 &&
3185              ( i_table_id == 0x4e || /* Current/Following */
3186                (i_table_id >= 0x50 && i_table_id <= 0x5f) ) ) /* Schedule */
3187     {
3188         msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
3189                  i_table_id, i_table_id, i_extension, i_extension );
3190
3191         dvbpsi_eit_callback cb = i_table_id == 0x4e ?
3192                                     (dvbpsi_eit_callback)EITCallBackCurrentFollowing :
3193                                     (dvbpsi_eit_callback)EITCallBackSchedule;
3194         dvbpsi_AttachEIT( h, i_table_id, i_extension, cb, p_demux );
3195     }
3196 #ifdef TS_USE_TDT
3197     else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 &&
3198               i_table_id == 0x70 )  /* TDT */
3199     {
3200          msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
3201                  i_table_id, i_table_id, i_extension, i_extension );
3202          dvbpsi_AttachTOT( h, i_table_id, i_extension,
3203                            (dvbpsi_tot_callback)TDTCallBack, p_demux);
3204     }
3205 #endif
3206
3207 }
3208 #endif
3209
3210 /*****************************************************************************
3211  * PMT callback and helpers
3212  *****************************************************************************/
3213 static dvbpsi_descriptor_t *PMTEsFindDescriptor( const dvbpsi_pmt_es_t *p_es,
3214                                                  int i_tag )
3215 {
3216     dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;;
3217     while( p_dr && ( p_dr->i_tag != i_tag ) )
3218         p_dr = p_dr->p_next;
3219     return p_dr;
3220 }
3221 static bool PMTEsHasRegistration( demux_t *p_demux,
3222                                   const dvbpsi_pmt_es_t *p_es,
3223                                   const char *psz_tag )
3224 {
3225     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x05 );
3226     if( !p_dr )
3227         return false;
3228
3229     if( p_dr->i_length < 4 )
3230     {
3231         msg_Warn( p_demux, "invalid Registration Descriptor" );
3232         return false;
3233     }
3234
3235     assert( strlen(psz_tag) == 4 );
3236     return !memcmp( p_dr->p_data, psz_tag, 4 );
3237 }
3238 static void PMTSetupEsISO14496( demux_t *p_demux, ts_pid_t *pid,
3239                                 const ts_prg_psi_t *prg, const dvbpsi_pmt_es_t *p_es )
3240 {
3241     es_format_t *p_fmt = &pid->es->fmt;
3242
3243     /* MPEG-4 stream: search SL_DESCRIPTOR */
3244     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x1f );
3245
3246     if( p_dr && p_dr->i_length == 2 )
3247     {
3248         const int i_es_id = ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1];
3249
3250         msg_Warn( p_demux, "found SL_descriptor es_id=%d", i_es_id );
3251
3252         pid->es->p_mpeg4desc = NULL;
3253
3254         for( int i = 0; i < 255; i++ )
3255         {
3256             iod_descriptor_t *iod = prg->iod;
3257
3258             if( iod->es_descr[i].b_ok &&
3259                 iod->es_descr[i].i_es_id == i_es_id )
3260             {
3261                 pid->es->p_mpeg4desc = &iod->es_descr[i];
3262                 break;
3263             }
3264         }
3265     }
3266     if( !pid->es->p_mpeg4desc )
3267     {
3268         msg_Err( p_demux, "MPEG-4 descriptor not found" );
3269         return;
3270     }
3271
3272     const decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr;
3273     if( dcd->i_streamType == 0x04 )    /* VisualStream */
3274     {
3275         p_fmt->i_cat = VIDEO_ES;
3276         switch( dcd->i_objectTypeIndication )
3277         {
3278         case 0x0B: /* mpeg4 sub */
3279             p_fmt->i_cat = SPU_ES;
3280             p_fmt->i_codec = VLC_CODEC_SUBT;
3281             break;
3282
3283         case 0x20: /* mpeg4 */
3284             p_fmt->i_codec = VLC_CODEC_MP4V;
3285             break;
3286         case 0x21: /* h264 */
3287             p_fmt->i_codec = VLC_CODEC_H264;
3288             break;
3289         case 0x60:
3290         case 0x61:
3291         case 0x62:
3292         case 0x63:
3293         case 0x64:
3294         case 0x65: /* mpeg2 */
3295             p_fmt->i_codec = VLC_CODEC_MPGV;
3296             break;
3297         case 0x6a: /* mpeg1 */
3298             p_fmt->i_codec = VLC_CODEC_MPGV;
3299             break;
3300         case 0x6c: /* mpeg1 */
3301             p_fmt->i_codec = VLC_CODEC_JPEG;
3302             break;
3303         default:
3304             p_fmt->i_cat = UNKNOWN_ES;
3305             break;
3306         }
3307     }
3308     else if( dcd->i_streamType == 0x05 )    /* AudioStream */
3309     {
3310         p_fmt->i_cat = AUDIO_ES;
3311         switch( dcd->i_objectTypeIndication )
3312         {
3313         case 0x40: /* mpeg4 */
3314             p_fmt->i_codec = VLC_CODEC_MP4A;
3315             break;
3316         case 0x66:
3317         case 0x67:
3318         case 0x68: /* mpeg2 aac */
3319             p_fmt->i_codec = VLC_CODEC_MP4A;
3320             break;
3321         case 0x69: /* mpeg2 */
3322             p_fmt->i_codec = VLC_CODEC_MPGA;
3323             break;
3324         case 0x6b: /* mpeg1 */
3325             p_fmt->i_codec = VLC_CODEC_MPGA;
3326             break;
3327         default:
3328             p_fmt->i_cat = UNKNOWN_ES;
3329             break;
3330         }
3331     }
3332     else
3333     {
3334         p_fmt->i_cat = UNKNOWN_ES;
3335     }
3336
3337     if( p_fmt->i_cat != UNKNOWN_ES )
3338     {
3339         p_fmt->i_extra = dcd->i_decoder_specific_info_len;
3340         if( p_fmt->i_extra > 0 )
3341         {
3342             p_fmt->p_extra = malloc( p_fmt->i_extra );
3343             if( p_fmt->p_extra )
3344                 memcpy( p_fmt->p_extra,
3345                         dcd->p_decoder_specific_info,
3346                         p_fmt->i_extra );
3347             else
3348                 p_fmt->i_extra = 0;
3349         }
3350     }
3351 }
3352
3353 typedef struct
3354 {
3355     int  i_type;
3356     int  i_magazine;
3357     int  i_page;
3358     char p_iso639[3];
3359 } ts_teletext_page_t;
3360
3361 static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid,
3362                                 const dvbpsi_pmt_es_t *p_es )
3363 {
3364     es_format_t *p_fmt = &pid->es->fmt;
3365
3366     ts_teletext_page_t p_page[2 * 64 + 20];
3367     unsigned i_page = 0;
3368
3369     /* Gather pages informations */
3370 #if defined _DVBPSI_DR_56_H_ && \
3371     defined DVBPSI_VERSION && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5)
3372     for( unsigned i_tag_idx = 0; i_tag_idx < 2; i_tag_idx++ )
3373     {
3374         dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, i_tag_idx == 0 ? 0x46 : 0x56 );
3375         if( !p_dr )
3376             continue;
3377
3378         dvbpsi_teletext_dr_t *p_sub = dvbpsi_DecodeTeletextDr( p_dr );
3379         if( !p_sub )
3380             continue;
3381
3382         for( int i = 0; i < p_sub->i_pages_number; i++ )
3383         {
3384             const dvbpsi_teletextpage_t *p_src = &p_sub->p_pages[i];
3385
3386             if( p_src->i_teletext_type >= 0x06 )
3387                 continue;
3388
3389             assert( i_page < sizeof(p_page)/sizeof(*p_page) );
3390
3391             ts_teletext_page_t *p_dst = &p_page[i_page++];
3392
3393             p_dst->i_type = p_src->i_teletext_type;
3394             p_dst->i_magazine = p_src->i_teletext_magazine_number
3395                 ? p_src->i_teletext_magazine_number : 8;
3396             p_dst->i_page = p_src->i_teletext_page_number;
3397             memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 );
3398         }
3399     }
3400 #endif
3401
3402 #ifdef _DVBPSI_DR_59_H_
3403     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
3404     if( p_dr )
3405     {
3406         dvbpsi_subtitling_dr_t *p_sub = dvbpsi_DecodeSubtitlingDr( p_dr );
3407         for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ )
3408         {
3409             dvbpsi_subtitle_t *p_src = &p_sub->p_subtitle[i];
3410
3411             if( p_src->i_subtitling_type < 0x01 || p_src->i_subtitling_type > 0x03 )
3412                 continue;
3413
3414             assert( i_page < sizeof(p_page)/sizeof(*p_page) );
3415
3416             ts_teletext_page_t *p_dst = &p_page[i_page++];
3417
3418             switch( p_src->i_subtitling_type )
3419             {
3420             case 0x01:
3421                 p_dst->i_type = 0x02;
3422                 break;
3423             default:
3424                 p_dst->i_type = 0x03;
3425                 break;
3426             }
3427             /* FIXME check if it is the right split */
3428             p_dst->i_magazine = (p_src->i_composition_page_id >> 8)
3429                 ? (p_src->i_composition_page_id >> 8) : 8;
3430             p_dst->i_page = p_src->i_composition_page_id & 0xff;
3431             memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 );
3432         }
3433     }
3434 #endif
3435
3436     /* */
3437     es_format_Init( p_fmt, SPU_ES, VLC_CODEC_TELETEXT );
3438
3439     if( !p_demux->p_sys->b_split_es || i_page <= 0 )
3440     {
3441         p_fmt->subs.teletext.i_magazine = -1;
3442         p_fmt->subs.teletext.i_page = 0;
3443         p_fmt->psz_description = strdup( vlc_gettext(ppsz_teletext_type[1]) );
3444
3445         dvbpsi_descriptor_t *p_dr;
3446         p_dr = PMTEsFindDescriptor( p_es, 0x46 );
3447         if( !p_dr )
3448             p_dr = PMTEsFindDescriptor( p_es, 0x56 );
3449
3450         if( !p_demux->p_sys->b_split_es && p_dr && p_dr->i_length > 0 )
3451         {
3452             /* Descriptor pass-through */
3453             p_fmt->p_extra = malloc( p_dr->i_length );
3454             if( p_fmt->p_extra )
3455             {
3456                 p_fmt->i_extra = p_dr->i_length;
3457                 memcpy( p_fmt->p_extra, p_dr->p_data, p_dr->i_length );
3458             }
3459         }
3460     }
3461     else
3462     {
3463         for( unsigned i = 0; i < i_page; i++ )
3464         {
3465             ts_es_t *p_es;
3466
3467             /* */
3468             if( i == 0 )
3469             {
3470                 p_es = pid->es;
3471             }
3472             else
3473             {
3474                 p_es = malloc( sizeof(*p_es) );
3475                 if( !p_es )
3476                     break;
3477
3478                 es_format_Copy( &p_es->fmt, &pid->es->fmt );
3479                 free( p_es->fmt.psz_language );
3480                 free( p_es->fmt.psz_description );
3481                 p_es->fmt.psz_language = NULL;
3482                 p_es->fmt.psz_description = NULL;
3483
3484                 p_es->id      = NULL;
3485                 p_es->p_pes   = NULL;
3486                 p_es->i_pes_size = 0;
3487                 p_es->i_pes_gathered = 0;
3488                 p_es->pp_last = &p_es->p_pes;
3489                 p_es->p_mpeg4desc = NULL;
3490                 p_es->b_gather = false;
3491
3492                 TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es );
3493             }
3494
3495             /* */
3496             const ts_teletext_page_t *p = &p_page[i];
3497             p_es->fmt.i_priority = (p->i_type == 0x02 || p->i_type == 0x05) ? 0 : -1;
3498             p_es->fmt.psz_language = strndup( p->p_iso639, 3 );
3499             p_es->fmt.psz_description = strdup(vlc_gettext(ppsz_teletext_type[p->i_type]));
3500             p_es->fmt.subs.teletext.i_magazine = p->i_magazine;
3501             p_es->fmt.subs.teletext.i_page = p->i_page;
3502
3503             msg_Dbg( p_demux,
3504                          "    * ttxt type=%s lan=%s page=%d%02x",
3505                          p_es->fmt.psz_description,
3506                          p_es->fmt.psz_language,
3507                          p->i_magazine, p->i_page );
3508         }
3509     }
3510 }
3511 static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid,
3512                                    const dvbpsi_pmt_es_t *p_es )
3513 {
3514     es_format_t *p_fmt = &pid->es->fmt;
3515
3516     es_format_Init( p_fmt, SPU_ES, VLC_CODEC_DVBS );
3517
3518     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
3519     int i_page = 0;
3520 #ifdef _DVBPSI_DR_59_H_
3521     dvbpsi_subtitling_dr_t *p_sub = dvbpsi_DecodeSubtitlingDr( p_dr );
3522     for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ )
3523     {
3524         const int i_type = p_sub->p_subtitle[i].i_subtitling_type;
3525         if( ( i_type >= 0x10 && i_type <= 0x14 ) ||
3526             ( i_type >= 0x20 && i_type <= 0x24 ) )
3527             i_page++;
3528     }
3529 #endif
3530
3531     if( !p_demux->p_sys->b_split_es  || i_page <= 0 )
3532     {
3533         p_fmt->subs.dvb.i_id = -1;
3534         p_fmt->psz_description = strdup( _("DVB subtitles") );
3535
3536         if( !p_demux->p_sys->b_split_es && p_dr && p_dr->i_length > 0 )
3537         {
3538             /* Descriptor pass-through */
3539             p_fmt->p_extra = malloc( p_dr->i_length );
3540             if( p_fmt->p_extra )
3541             {
3542                 p_fmt->i_extra = p_dr->i_length;
3543                 memcpy( p_fmt->p_extra, p_dr->p_data, p_dr->i_length );
3544             }
3545         }
3546     }
3547     else
3548     {
3549 #ifdef _DVBPSI_DR_59_H_
3550         for( int i = 0; i < p_sub->i_subtitles_number; i++ )
3551         {
3552             ts_es_t *p_es;
3553
3554             /* */
3555             if( i == 0 )
3556             {
3557                 p_es = pid->es;
3558             }
3559             else
3560             {
3561                 p_es = malloc( sizeof(*p_es) );
3562                 if( !p_es )
3563                     break;
3564
3565                 es_format_Copy( &p_es->fmt, &pid->es->fmt );
3566                 free( p_es->fmt.psz_language );
3567                 free( p_es->fmt.psz_description );
3568                 p_es->fmt.psz_language = NULL;
3569                 p_es->fmt.psz_description = NULL;
3570
3571                 p_es->id      = NULL;
3572                 p_es->p_pes   = NULL;
3573                 p_es->i_pes_size = 0;
3574                 p_es->i_pes_gathered = 0;
3575                 p_es->pp_last = &p_es->p_pes;
3576                 p_es->p_mpeg4desc = NULL;
3577                 p_es->b_gather = false;
3578
3579                 TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es );
3580             }
3581
3582             /* */
3583             const dvbpsi_subtitle_t *p = &p_sub->p_subtitle[i];
3584             p_es->fmt.psz_language = strndup( p->i_iso6392_language_code, 3 );
3585             switch( p->i_subtitling_type )
3586             {
3587             case 0x10: /* unspec. */
3588             case 0x11: /* 4:3 */
3589             case 0x12: /* 16:9 */
3590             case 0x13: /* 2.21:1 */
3591             case 0x14: /* HD monitor */
3592                 p_es->fmt.psz_description = strdup( _("DVB subtitles") );
3593                 break;
3594             case 0x20: /* Hearing impaired unspec. */
3595             case 0x21: /* h.i. 4:3 */
3596             case 0x22: /* h.i. 16:9 */
3597             case 0x23: /* h.i. 2.21:1 */
3598             case 0x24: /* h.i. HD monitor */
3599                 p_es->fmt.psz_description = strdup( _("DVB subtitles: hearing impaired") );
3600                 break;
3601             default:
3602                 break;
3603             }
3604
3605             /* Hack, FIXME */
3606             p_es->fmt.subs.dvb.i_id = ( p->i_composition_page_id <<  0 ) |
3607                                       ( p->i_ancillary_page_id   << 16 );
3608         }
3609 #endif
3610     }
3611 }
3612 static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid,
3613                             const dvbpsi_pmt_es_t *p_es )
3614 {
3615     es_format_t *p_fmt = &pid->es->fmt;
3616
3617     if( PMTEsHasRegistration( p_demux, p_es, "AC-3" ) ||
3618         PMTEsFindDescriptor( p_es, 0x6a ) ||
3619         PMTEsFindDescriptor( p_es, 0x81 ) )
3620     {
3621         p_fmt->i_cat = AUDIO_ES;
3622         p_fmt->i_codec = VLC_CODEC_A52;
3623     }
3624     else if( PMTEsFindDescriptor( p_es, 0x7a ) )
3625     {
3626         /* DVB with stream_type 0x06 (ETS EN 300 468) */
3627         p_fmt->i_cat = AUDIO_ES;
3628         p_fmt->i_codec = VLC_CODEC_EAC3;
3629     }
3630     else if( PMTEsHasRegistration( p_demux, p_es, "DTS1" ) ||
3631              PMTEsHasRegistration( p_demux, p_es, "DTS2" ) ||
3632              PMTEsHasRegistration( p_demux, p_es, "DTS3" ) ||
3633              PMTEsFindDescriptor( p_es, 0x73 ) )
3634     {
3635         /*registration descriptor(ETSI TS 101 154 Annex F)*/
3636         p_fmt->i_cat = AUDIO_ES;
3637         p_fmt->i_codec = VLC_CODEC_DTS;
3638     }
3639     else if( PMTEsHasRegistration( p_demux, p_es, "BSSD" ) )
3640     {
3641         p_fmt->i_cat = AUDIO_ES;
3642         p_fmt->b_packetized = true;
3643         p_fmt->i_codec = VLC_CODEC_302M;
3644     }
3645     else
3646     {
3647         /* Subtitle/Teletext/VBI fallbacks */
3648         dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
3649
3650 #ifdef _DVBPSI_DR_59_H_
3651         dvbpsi_subtitling_dr_t *p_sub;
3652         if( p_dr && ( p_sub = dvbpsi_DecodeSubtitlingDr( p_dr ) ) )
3653         {
3654             for( int i = 0; i < p_sub->i_subtitles_number; i++ )
3655             {
3656                 if( p_fmt->i_cat != UNKNOWN_ES )
3657                     break;
3658
3659                 switch( p_sub->p_subtitle[i].i_subtitling_type )
3660                 {
3661                 case 0x01: /* EBU Teletext subtitles */
3662                 case 0x02: /* Associated EBU Teletext */
3663                 case 0x03: /* VBI data */
3664                     PMTSetupEsTeletext( p_demux, pid, p_es );
3665                     break;
3666                 case 0x10: /* DVB Subtitle (normal) with no monitor AR critical */
3667                 case 0x11: /*                 ...   on 4:3 AR monitor */
3668                 case 0x12: /*                 ...   on 16:9 AR monitor */
3669                 case 0x13: /*                 ...   on 2.21:1 AR monitor */
3670                 case 0x14: /*                 ...   for display on a high definition monitor */
3671                 case 0x20: /* DVB Subtitle (impaired) with no monitor AR critical */
3672                 case 0x21: /*                 ...   on 4:3 AR monitor */
3673                 case 0x22: /*                 ...   on 16:9 AR monitor */
3674                 case 0x23: /*                 ...   on 2.21:1 AR monitor */
3675                 case 0x24: /*                 ...   for display on a high definition monitor */
3676                     PMTSetupEsDvbSubtitle( p_demux, pid, p_es );
3677                     break;
3678                 default:
3679                     msg_Err( p_demux, "Unrecognized DVB subtitle type (0x%x)",
3680                              p_sub->p_subtitle[i].i_subtitling_type );
3681                     break;
3682                 }
3683             }
3684         }
3685 #else
3686         if( p_fmt->i_cat == UNKNOWN_ES && p_dr )
3687             PMTSetupEsDvbSubtitle( p_demux, pid, p_es );
3688 #endif
3689         if( p_fmt->i_cat == UNKNOWN_ES &&
3690             ( PMTEsFindDescriptor( p_es, 0x45 ) ||  /* VBI Data descriptor */
3691               PMTEsFindDescriptor( p_es, 0x46 ) ||  /* VBI Teletext descriptor */
3692               PMTEsFindDescriptor( p_es, 0x56 ) ) ) /* EBU Teletext descriptor */
3693         {
3694             /* Teletext/VBI */
3695             PMTSetupEsTeletext( p_demux, pid, p_es );
3696         }
3697     }
3698
3699 #ifdef _DVBPSI_DR_52_H_
3700     /* FIXME is it useful ? */
3701     if( PMTEsFindDescriptor( p_es, 0x52 ) )
3702     {
3703         dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x52 );
3704         dvbpsi_stream_identifier_dr_t *p_si = dvbpsi_DecodeStreamIdentifierDr( p_dr );
3705
3706         msg_Dbg( p_demux, "    * Stream Component Identifier: %d", p_si->i_component_tag );
3707     }
3708 #endif
3709 }
3710
3711 static void PMTSetupEs0xEA( demux_t *p_demux, ts_pid_t *pid,
3712                            const dvbpsi_pmt_es_t *p_es )
3713 {
3714     /* Registration Descriptor */
3715     if( !PMTEsHasRegistration( p_demux, p_es, "VC-1" ) )
3716     {
3717         msg_Err( p_demux, "Registration descriptor not found or invalid" );
3718         return;
3719     }
3720
3721     es_format_t *p_fmt = &pid->es->fmt;
3722
3723     /* registration descriptor for VC-1 (SMPTE rp227) */
3724     p_fmt->i_cat = VIDEO_ES;
3725     p_fmt->i_codec = VLC_CODEC_VC1;
3726
3727     /* XXX With Simple and Main profile the SEQUENCE
3728      * header is modified: video width and height are
3729      * inserted just after the start code as 2 int16_t
3730      * The packetizer will take care of that. */
3731 }
3732
3733 static void PMTSetupEs0xD1( demux_t *p_demux, ts_pid_t *pid,
3734                            const dvbpsi_pmt_es_t *p_es )
3735 {
3736     /* Registration Descriptor */
3737     if( !PMTEsHasRegistration( p_demux, p_es, "drac" ) )
3738     {
3739         msg_Err( p_demux, "Registration descriptor not found or invalid" );
3740         return;
3741     }
3742
3743     es_format_t *p_fmt = &pid->es->fmt;
3744
3745     /* registration descriptor for Dirac
3746      * (backwards compatable with VC-2 (SMPTE Sxxxx:2008)) */
3747     p_fmt->i_cat = VIDEO_ES;
3748     p_fmt->i_codec = VLC_CODEC_DIRAC;
3749 }
3750
3751 static void PMTSetupEs0xA0( demux_t *p_demux, ts_pid_t *pid,
3752                            const dvbpsi_pmt_es_t *p_es )
3753 {
3754     /* MSCODEC sent by vlc */
3755     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0xa0 );
3756     if( !p_dr || p_dr->i_length < 10 )
3757     {
3758         msg_Warn( p_demux,
3759                   "private MSCODEC (vlc) without bih private descriptor" );
3760         return;
3761     }
3762
3763     es_format_t *p_fmt = &pid->es->fmt;
3764     p_fmt->i_cat = VIDEO_ES;
3765     p_fmt->i_codec = VLC_FOURCC( p_dr->p_data[0], p_dr->p_data[1],
3766                                  p_dr->p_data[2], p_dr->p_data[3] );
3767     p_fmt->video.i_width = GetWBE( &p_dr->p_data[4] );
3768     p_fmt->video.i_height = GetWBE( &p_dr->p_data[6] );
3769     p_fmt->i_extra = GetWBE( &p_dr->p_data[8] );
3770
3771     if( p_fmt->i_extra > 0 )
3772     {
3773         p_fmt->p_extra = malloc( p_fmt->i_extra );
3774         if( p_fmt->p_extra )
3775             memcpy( p_fmt->p_extra, &p_dr->p_data[10],
3776                     __MIN( p_fmt->i_extra, p_dr->i_length - 10 ) );
3777         else
3778             p_fmt->i_extra = 0;
3779     }
3780     /* For such stream we will gather them ourself and don't launch a
3781      * packetizer.
3782      * Yes it's ugly but it's the only way to have DIV3 working */
3783     p_fmt->b_packetized = true;
3784 }
3785
3786 static void PMTSetupEsHDMV( demux_t *p_demux, ts_pid_t *pid,
3787                            const dvbpsi_pmt_es_t *p_es )
3788 {
3789     VLC_UNUSED(p_demux);
3790     es_format_t *p_fmt = &pid->es->fmt;
3791
3792     /* Blu-Ray mapping */
3793     switch( p_es->i_type )
3794     {
3795     case 0x80:
3796         p_fmt->i_cat = AUDIO_ES;
3797         p_fmt->i_codec = VLC_CODEC_BD_LPCM;
3798         break;
3799     case 0x82:
3800     case 0x85: /* DTS-HD High resolution audio */
3801     case 0x86: /* DTS-HD Master audio */
3802     case 0xA2: /* Secondary DTS audio */
3803         p_fmt->i_cat = AUDIO_ES;
3804         p_fmt->i_codec = VLC_CODEC_DTS;
3805         break;
3806
3807     case 0x83: /* TrueHD AC3 */
3808         p_fmt->i_cat = AUDIO_ES;
3809         p_fmt->i_codec = VLC_CODEC_TRUEHD;
3810         break;
3811
3812     case 0x84: /* E-AC3 */
3813     case 0xA1: /* Secondary E-AC3 */
3814         p_fmt->i_cat = AUDIO_ES;
3815         p_fmt->i_codec = VLC_CODEC_EAC3;
3816         break;
3817     case 0x90: /* Presentation graphics */
3818         p_fmt->i_cat = SPU_ES;
3819         p_fmt->i_codec = VLC_CODEC_BD_PG;
3820         break;
3821     case 0x91: /* Interactive graphics */
3822     case 0x92: /* Subtitle */
3823     default:
3824         break;
3825     }
3826 }
3827
3828 static void PMTSetupEsRegistration( demux_t *p_demux, ts_pid_t *pid,
3829                                     const dvbpsi_pmt_es_t *p_es )
3830 {
3831     static const struct
3832     {
3833         char         psz_tag[5];
3834         int          i_cat;
3835         vlc_fourcc_t i_codec;
3836     } p_regs[] = {
3837         { "AC-3", AUDIO_ES, VLC_CODEC_A52   },
3838         { "DTS1", AUDIO_ES, VLC_CODEC_DTS   },
3839         { "DTS2", AUDIO_ES, VLC_CODEC_DTS   },
3840         { "DTS3", AUDIO_ES, VLC_CODEC_DTS   },
3841         { "BSSD", AUDIO_ES, VLC_CODEC_302M  },
3842         { "VC-1", VIDEO_ES, VLC_CODEC_VC1   },
3843         { "drac", VIDEO_ES, VLC_CODEC_DIRAC },
3844         { "", UNKNOWN_ES, 0 }
3845     };
3846     es_format_t *p_fmt = &pid->es->fmt;
3847
3848     for( int i = 0; p_regs[i].i_cat != UNKNOWN_ES; i++ )
3849     {
3850         if( PMTEsHasRegistration( p_demux, p_es, p_regs[i].psz_tag ) )
3851         {
3852             p_fmt->i_cat   = p_regs[i].i_cat;
3853             p_fmt->i_codec = p_regs[i].i_codec;
3854             break;
3855         }
3856     }
3857 }
3858
3859 static void PMTParseEsIso639( demux_t *p_demux, ts_pid_t *pid,
3860                               const dvbpsi_pmt_es_t *p_es )
3861 {
3862     /* get language descriptor */
3863     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x0a );
3864
3865     if( !p_dr )
3866         return;
3867
3868     dvbpsi_iso639_dr_t *p_decoded = dvbpsi_DecodeISO639Dr( p_dr );
3869     if( !p_decoded )
3870     {
3871         msg_Err( p_demux, "Failed to decode a ISO 639 descriptor" );
3872         return;
3873     }
3874
3875 #if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2)
3876     pid->es->fmt.psz_language = malloc( 4 );
3877     if( pid->es->fmt.psz_language )
3878     {
3879         memcpy( pid->es->fmt.psz_language,
3880                 p_decoded->code[0].iso_639_code, 3 );
3881         pid->es->fmt.psz_language[3] = 0;
3882         msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language);
3883     }
3884     switch( p_decoded->code[0].i_audio_type )
3885     {
3886     case 0:
3887         pid->es->fmt.psz_description = NULL;
3888         break;
3889     case 1:
3890         pid->es->fmt.psz_description =
3891             strdup(_("clean effects"));
3892         break;
3893     case 2:
3894         pid->es->fmt.psz_description =
3895             strdup(_("hearing impaired"));
3896         break;
3897     case 3:
3898         pid->es->fmt.psz_description =
3899             strdup(_("visual impaired commentary"));
3900         break;
3901     default:
3902         msg_Dbg( p_demux, "unknown audio type: %d",
3903                  p_decoded->code[0].i_audio_type);
3904         pid->es->fmt.psz_description = NULL;
3905         break;
3906     }
3907     pid->es->fmt.i_extra_languages = p_decoded->i_code_count-1;
3908     if( pid->es->fmt.i_extra_languages > 0 )
3909         pid->es->fmt.p_extra_languages =
3910             malloc( sizeof(*pid->es->fmt.p_extra_languages) *
3911                     pid->es->fmt.i_extra_languages );
3912     if( pid->es->fmt.p_extra_languages )
3913     {
3914         for( int i = 0; i < pid->es->fmt.i_extra_languages; i++ )
3915         {
3916             msg_Dbg( p_demux, "bang" );
3917             pid->es->fmt.p_extra_languages[i].psz_language =
3918                 malloc(4);
3919             if( pid->es->fmt.p_extra_languages[i].psz_language )
3920             {
3921                 memcpy( pid->es->fmt.p_extra_languages[i].psz_language,
3922                     p_decoded->code[i+1].iso_639_code, 3 );
3923                 pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0';
3924             }
3925             switch( p_decoded->code[i].i_audio_type )
3926             {
3927             case 0:
3928                 pid->es->fmt.p_extra_languages[i].psz_description =
3929                     NULL;
3930                 break;
3931             case 1:
3932                 pid->es->fmt.p_extra_languages[i].psz_description =
3933                     strdup(_("clean effects"));
3934                 break;
3935             case 2:
3936                 pid->es->fmt.p_extra_languages[i].psz_description =
3937                     strdup(_("hearing impaired"));
3938                 break;
3939             case 3:
3940                 pid->es->fmt.p_extra_languages[i].psz_description =
3941                     strdup(_("visual impaired commentary"));
3942                 break;
3943             default:
3944                 msg_Dbg( p_demux, "unknown audio type: %d",
3945                         p_decoded->code[i].i_audio_type);
3946                 pid->es->fmt.psz_description = NULL;
3947                 break;
3948             }
3949
3950         }
3951     }
3952 #else
3953     pid->es->fmt.psz_language = malloc( 4 );
3954     if( pid->es->fmt.psz_language )
3955     {
3956         memcpy( pid->es->fmt.psz_language,
3957                 p_decoded->i_iso_639_code, 3 );
3958         pid->es->fmt.psz_language[3] = 0;
3959     }
3960 #endif
3961 }
3962
3963 static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
3964 {
3965     demux_sys_t          *p_sys = p_demux->p_sys;
3966     dvbpsi_descriptor_t  *p_dr;
3967     dvbpsi_pmt_es_t      *p_es;
3968
3969     ts_pid_t             *pmt = NULL;
3970     ts_prg_psi_t         *prg = NULL;
3971
3972     ts_pid_t             **pp_clean = NULL;
3973     int                  i_clean = 0;
3974     bool                 b_hdmv = false;
3975
3976     msg_Dbg( p_demux, "PMTCallBack called" );
3977
3978     /* First find this PMT declared in PAT */
3979     for( int i = 0; i < p_sys->i_pmt; i++ )
3980     {
3981         int i_prg;
3982         for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
3983         {
3984             const int i_pmt_number = p_sys->pmt[i]->psi->prg[i_prg]->i_number;
3985             if( i_pmt_number != TS_USER_PMT_NUMBER && i_pmt_number == p_pmt->i_program_number )
3986             {
3987                 pmt = p_sys->pmt[i];
3988                 prg = p_sys->pmt[i]->psi->prg[i_prg];
3989                 break;
3990             }
3991         }
3992         if( pmt )
3993             break;
3994     }
3995
3996     if( pmt == NULL )
3997     {
3998         msg_Warn( p_demux, "unreferenced program (broken stream)" );
3999         dvbpsi_DeletePMT(p_pmt);
4000         return;
4001     }
4002
4003     if( prg->i_version != -1 &&
4004         ( !p_pmt->b_current_next || prg->i_version == p_pmt->i_version ) )
4005     {
4006         dvbpsi_DeletePMT( p_pmt );
4007         return;
4008     }
4009
4010     /* Clean this program (remove all es) */
4011     for( int i = 0; i < 8192; i++ )
4012     {
4013         ts_pid_t *pid = &p_sys->pid[i];
4014
4015         if( pid->b_valid && pid->p_owner == pmt->psi &&
4016             pid->i_owner_number == prg->i_number && pid->psi == NULL )
4017         {
4018             TAB_APPEND( i_clean, pp_clean, pid );
4019         }
4020     }
4021     if( prg->iod )
4022     {
4023         IODFree( prg->iod );
4024         prg->iod = NULL;
4025     }
4026
4027     msg_Dbg( p_demux, "new PMT program number=%d version=%d pid_pcr=%d",
4028              p_pmt->i_program_number, p_pmt->i_version, p_pmt->i_pcr_pid );
4029     prg->i_pid_pcr = p_pmt->i_pcr_pid;
4030     prg->i_version = p_pmt->i_version;
4031
4032     ValidateDVBMeta( p_demux, prg->i_pid_pcr );
4033     if( ProgramIsSelected( p_demux, prg->i_number ) )
4034     {
4035         /* Set demux filter */
4036         stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
4037                         ACCESS_SET_PRIVATE_ID_STATE, prg->i_pid_pcr,
4038                         true );
4039     }
4040     else if ( p_sys->b_access_control )
4041     {
4042         msg_Warn( p_demux, "skipping program (not selected)" );
4043         dvbpsi_DeletePMT(p_pmt);
4044         return;
4045     }
4046
4047     /* Parse descriptor */
4048     for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next )
4049     {
4050         if( p_dr->i_tag == 0x1d )
4051         {
4052             /* We have found an IOD descriptor */
4053             msg_Dbg( p_demux, " * descriptor : IOD (0x1d)" );
4054
4055             prg->iod = IODNew( p_dr->i_length, p_dr->p_data );
4056         }
4057         else if( p_dr->i_tag == 0x9 )
4058         {
4059             uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8)
4060                                 | p_dr->p_data[1];
4061             msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", i_sysid );
4062         }
4063         else if( p_dr->i_tag == 0x05 )
4064         {
4065             /* Registration Descriptor */
4066             if( p_dr->i_length != 4 )
4067             {
4068                 msg_Warn( p_demux, "invalid Registration Descriptor" );
4069             }
4070             else
4071             {
4072                 msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data );
4073                 if( !memcmp( p_dr->p_data, "HDMV", 4 ) )
4074                 {
4075                     /* Blu-Ray */
4076                     b_hdmv = true;
4077                 }
4078             }
4079         }
4080         else
4081         {
4082             msg_Dbg( p_demux, " * descriptor : unknown (0x%x)", p_dr->i_tag );
4083         }
4084     }
4085
4086     for( p_es = p_pmt->p_first_es; p_es != NULL; p_es = p_es->p_next )
4087     {
4088         ts_pid_t tmp_pid, *old_pid = 0, *pid = &tmp_pid;
4089
4090         /* Find out if the PID was already declared */
4091         for( int i = 0; i < i_clean; i++ )
4092         {
4093             if( pp_clean[i] == &p_sys->pid[p_es->i_pid] )
4094             {
4095                 old_pid = pp_clean[i];
4096                 break;
4097             }
4098         }
4099         ValidateDVBMeta( p_demux, p_es->i_pid );
4100
4101         if( !old_pid && p_sys->pid[p_es->i_pid].b_valid )
4102         {
4103             msg_Warn( p_demux, "pmt error: pid=%d already defined",
4104                       p_es->i_pid );
4105             continue;
4106         }
4107
4108         for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
4109              p_dr = p_dr->p_next )
4110         {
4111             msg_Dbg( p_demux, "  * es pid=%d type=%d dr->i_tag=0x%x",
4112                      p_es->i_pid, p_es->i_type, p_dr->i_tag );
4113         }
4114
4115         PIDInit( pid, false, pmt->psi );
4116         PIDFillFormat( pid, p_es->i_type );
4117         pid->i_owner_number = prg->i_number;
4118         pid->i_pid          = p_es->i_pid;
4119         pid->b_seen         = p_sys->pid[p_es->i_pid].b_seen;
4120
4121         if( p_es->i_type == 0x10 || p_es->i_type == 0x11 ||
4122             p_es->i_type == 0x12 || p_es->i_type == 0x0f )
4123         {
4124             PMTSetupEsISO14496( p_demux, pid, prg, p_es );
4125         }
4126         else if( p_es->i_type == 0x06 )
4127         {
4128             PMTSetupEs0x06(  p_demux, pid, p_es );
4129         }
4130         else if( p_es->i_type == 0xEA )
4131         {
4132             PMTSetupEs0xEA( p_demux, pid, p_es );
4133         }
4134         else if( p_es->i_type == 0xd1 )
4135         {
4136             PMTSetupEs0xD1( p_demux, pid, p_es );
4137         }
4138         else if( p_es->i_type == 0xa0 )
4139         {
4140             PMTSetupEs0xA0( p_demux, pid, p_es );
4141         }
4142         else if( b_hdmv )
4143         {
4144             PMTSetupEsHDMV( p_demux, pid, p_es );
4145         }
4146         else if( p_es->i_type >= 0x80 )
4147         {
4148             PMTSetupEsRegistration( p_demux, pid, p_es );
4149         }
4150
4151         if( pid->es->fmt.i_cat == AUDIO_ES ||
4152             ( pid->es->fmt.i_cat == SPU_ES &&
4153               pid->es->fmt.i_codec != VLC_CODEC_DVBS &&
4154               pid->es->fmt.i_codec != VLC_CODEC_TELETEXT ) )
4155         {
4156             PMTParseEsIso639( p_demux, pid, p_es );
4157         }
4158
4159         pid->es->fmt.i_group = p_pmt->i_program_number;
4160         for( int i = 0; i < pid->i_extra_es; i++ )
4161             pid->extra_es[i]->fmt.i_group = p_pmt->i_program_number;
4162
4163         if( pid->es->fmt.i_cat == UNKNOWN_ES )
4164         {
4165             msg_Dbg( p_demux, "  * es pid=%d type=%d *unknown*",
4166                      p_es->i_pid, p_es->i_type );
4167         }
4168         else if( !p_sys->b_udp_out )
4169         {
4170             msg_Dbg( p_demux, "  * es pid=%d type=%d fcc=%4.4s",
4171                      p_es->i_pid, p_es->i_type, (char*)&pid->es->fmt.i_codec );
4172
4173             if( p_sys->b_es_id_pid ) pid->es->fmt.i_id = p_es->i_pid;
4174
4175             /* Check if we can avoid restarting the ES */
4176             if( old_pid &&
4177                 pid->es->fmt.i_codec == old_pid->es->fmt.i_codec &&
4178                 pid->es->fmt.i_extra == old_pid->es->fmt.i_extra &&
4179                 pid->es->fmt.i_extra == 0 &&
4180                 pid->i_extra_es == old_pid->i_extra_es &&
4181                 ( ( !pid->es->fmt.psz_language &&
4182                     !old_pid->es->fmt.psz_language ) ||
4183                   ( pid->es->fmt.psz_language &&
4184                     old_pid->es->fmt.psz_language &&
4185                     !strcmp( pid->es->fmt.psz_language,
4186                              old_pid->es->fmt.psz_language ) ) ) )
4187             {
4188                 pid->es->id = old_pid->es->id;
4189                 old_pid->es->id = NULL;
4190                 for( int i = 0; i < pid->i_extra_es; i++ )
4191                 {
4192                     pid->extra_es[i]->id = old_pid->extra_es[i]->id;
4193                     old_pid->extra_es[i]->id = NULL;
4194                 }
4195             }
4196             else
4197             {
4198                 if( old_pid )
4199                 {
4200                     PIDClean( p_demux, old_pid );
4201                     TAB_REMOVE( i_clean, pp_clean, old_pid );
4202                     old_pid = 0;
4203                 }
4204
4205                 pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt );
4206                 for( int i = 0; i < pid->i_extra_es; i++ )
4207                 {
4208                     pid->extra_es[i]->id =
4209                         es_out_Add( p_demux->out, &pid->extra_es[i]->fmt );
4210                 }
4211                 p_sys->i_pmt_es += 1 + pid->i_extra_es;
4212             }
4213         }
4214
4215         /* Add ES to the list */
4216         if( old_pid )
4217         {
4218             PIDClean( p_demux, old_pid );
4219             TAB_REMOVE( i_clean, pp_clean, old_pid );
4220         }
4221         p_sys->pid[p_es->i_pid] = *pid;
4222
4223         p_dr = PMTEsFindDescriptor( p_es, 0x09 );
4224         if( p_dr && p_dr->i_length >= 2 )
4225         {
4226             uint16_t i_sysid = (p_dr->p_data[0] << 8) | p_dr->p_data[1];
4227             msg_Dbg( p_demux, "   * descriptor : CA (0x9) SysID 0x%x",
4228                      i_sysid );
4229         }
4230
4231         if( ProgramIsSelected( p_demux, prg->i_number ) &&
4232             ( pid->es->id != NULL || p_sys->b_udp_out ) )
4233         {
4234             /* Set demux filter */
4235             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
4236                             ACCESS_SET_PRIVATE_ID_STATE, p_es->i_pid,
4237                             true );
4238         }
4239     }
4240
4241     /* Set CAM descrambling */
4242     if( !ProgramIsSelected( p_demux, prg->i_number )
4243      || stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
4244                         ACCESS_SET_PRIVATE_ID_CA, p_pmt ) != VLC_SUCCESS )
4245         dvbpsi_DeletePMT( p_pmt );
4246
4247     for( int i = 0; i < i_clean; i++ )
4248     {
4249         if( ProgramIsSelected( p_demux, prg->i_number ) )
4250         {
4251             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
4252                             ACCESS_SET_PRIVATE_ID_STATE, pp_clean[i]->i_pid,
4253                             false );
4254         }
4255
4256         PIDClean( p_demux, pp_clean[i] );
4257     }
4258     if( i_clean )
4259         free( pp_clean );
4260 }
4261
4262 static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
4263 {
4264     demux_sys_t          *p_sys = p_demux->p_sys;
4265     dvbpsi_pat_program_t *p_program;
4266     ts_pid_t             *pat = &p_sys->pid[0];
4267
4268     msg_Dbg( p_demux, "PATCallBack called" );
4269
4270     if( ( pat->psi->i_pat_version != -1 &&
4271             ( !p_pat->b_current_next ||
4272               p_pat->i_version == pat->psi->i_pat_version ) ) ||
4273         p_sys->b_user_pmt )
4274     {
4275         dvbpsi_DeletePAT( p_pat );
4276         return;
4277     }
4278
4279     msg_Dbg( p_demux, "new PAT ts_id=%d version=%d current_next=%d",
4280              p_pat->i_ts_id, p_pat->i_version, p_pat->b_current_next );
4281
4282     /* Clean old */
4283     if( p_sys->i_pmt > 0 )
4284     {
4285         int      i_pmt_rm = 0;
4286         ts_pid_t **pmt_rm = NULL;
4287
4288         /* Search pmt to be deleted */
4289         for( int i = 0; i < p_sys->i_pmt; i++ )
4290         {
4291             ts_pid_t *pmt = p_sys->pmt[i];
4292             bool b_keep = false;
4293
4294             for( p_program = p_pat->p_first_program; p_program != NULL;
4295                  p_program = p_program->p_next )
4296             {
4297                 if( p_program->i_pid == pmt->i_pid )
4298                 {
4299                     for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
4300                     {
4301                         if( p_program->i_number ==
4302                             pmt->psi->prg[i_prg]->i_number )
4303                         {
4304                             b_keep = true;
4305                             break;
4306                         }
4307                     }
4308                     if( b_keep )
4309                         break;
4310                 }
4311             }
4312
4313             if( !b_keep )
4314             {
4315                 TAB_APPEND( i_pmt_rm, pmt_rm, pmt );
4316             }
4317         }
4318
4319         /* Delete all ES attached to thoses PMT */
4320         for( int i = 2; i < 8192; i++ )
4321         {
4322             ts_pid_t *pid = &p_sys->pid[i];
4323
4324             if( !pid->b_valid || pid->psi )
4325                 continue;
4326
4327             for( int j = 0; j < i_pmt_rm && pid->b_valid; j++ )
4328             {
4329                 for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
4330                 {
4331                     /* We only remove es that aren't defined by extra pmt */
4332                     if( pid->p_owner->prg[i_prg]->i_pid_pmt != pmt_rm[j]->i_pid )
4333                         continue;
4334
4335                     if( p_sys->b_access_control && pid->es->id )
4336                     {
4337                         if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
4338                                             ACCESS_SET_PRIVATE_ID_STATE, i,
4339                                             false ) )
4340                             p_sys->b_access_control = false;
4341                     }
4342
4343                     PIDClean( p_demux, pid );
4344                     break;
4345                 }
4346             }
4347         }
4348
4349         /* Delete PMT pid */
4350         for( int i = 0; i < i_pmt_rm; i++ )
4351         {
4352             if( p_sys->b_access_control )
4353             {
4354                 if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
4355                                     ACCESS_SET_PRIVATE_ID_STATE,
4356                                     pmt_rm[i]->i_pid, false ) )
4357                     p_sys->b_access_control = false;
4358             }
4359
4360             for( int i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ )
4361             {
4362                 const int i_number = pmt_rm[i]->psi->prg[i_prg]->i_number;
4363                 es_out_Control( p_demux->out, ES_OUT_DEL_GROUP, i_number );
4364             }
4365
4366             PIDClean( p_demux, &p_sys->pid[pmt_rm[i]->i_pid] );
4367             TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] );
4368         }
4369
4370         free( pmt_rm );
4371     }
4372
4373     /* now create programs */
4374     for( p_program = p_pat->p_first_program; p_program != NULL;
4375          p_program = p_program->p_next )
4376     {
4377         msg_Dbg( p_demux, "  * number=%d pid=%d", p_program->i_number,
4378                  p_program->i_pid );
4379         if( p_program->i_number != 0 )
4380         {
4381             ts_pid_t *pmt = &p_sys->pid[p_program->i_pid];
4382             bool b_add = true;
4383
4384             ValidateDVBMeta( p_demux, p_program->i_pid );
4385
4386             if( pmt->b_valid )
4387             {
4388                 int i_prg;
4389                 for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
4390                 {
4391                     if( pmt->psi->prg[i_prg]->i_number == p_program->i_number )
4392                     {
4393                         b_add = false;
4394                         break;
4395                     }
4396                 }
4397             }
4398             else
4399             {
4400                 TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt );
4401             }
4402
4403             if( b_add )
4404             {
4405                 PIDInit( pmt, true, pat->psi );
4406                 pmt->psi->prg[pmt->psi->i_prg-1]->handle =
4407                     dvbpsi_AttachPMT( p_program->i_number,
4408                                       (dvbpsi_pmt_callback)PMTCallBack,
4409                                       p_demux );
4410                 pmt->psi->prg[pmt->psi->i_prg-1]->i_number =
4411                     p_program->i_number;
4412                 pmt->psi->prg[pmt->psi->i_prg-1]->i_pid_pmt =
4413                     p_program->i_pid;
4414
4415                 /* Now select PID at access level */
4416                 if( p_sys->b_access_control )
4417                 {
4418                     if( ProgramIsSelected( p_demux, p_program->i_number ) )
4419                     {
4420                         if( p_sys->i_current_program == 0 )
4421                             p_sys->i_current_program = p_program->i_number;
4422
4423                         if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
4424                                             ACCESS_SET_PRIVATE_ID_STATE,
4425                                             p_program->i_pid, true ) )
4426                             p_sys->b_access_control = false;
4427                     }
4428                 }
4429             }
4430         }
4431     }
4432     pat->psi->i_pat_version = p_pat->i_version;
4433
4434     dvbpsi_DeletePAT( p_pat );
4435 }