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

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