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

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