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