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