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

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