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