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

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