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

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