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

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