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

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