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

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