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