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

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