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( 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
 699             msg_Dbg( p_demux, "extra pmt specified (pid=%d)", i_pid );
 700             PIDInit( pmt, VLC_TRUE, NULL );
 701             pmt->psi->i_prg = 1;
 702             pmt->psi->prg = malloc( sizeof(ts_prg_psi_t) );
 703             /* FIXME we should also ask for a number */
 704             pmt->psi->prg[0]->handle =
 705                 dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack,
 706                                   p_demux );
 707             pmt->psi->prg[0]->i_number = 0; /* special one */
 708
 709             psz = strchr( psz, '=' ) + 1;   /* can't failed */
 710             while( psz && *psz )
 711             {
 712                 char *psz_next = strchr( psz, ',' );
 713                 int i_pid, i_stream_type;
 714
 715                 if( psz_next )
 716                 {
 717                     *psz_next++ = '\0';
 718                 }
 719
 720                 i_pid = strtol( psz, &psz, 0 );
 721                 if( *psz == ':' )
 722                 {
 723                     i_stream_type = strtol( psz + 1, &psz, 0 );
 724                     if( i_pid >= 2 && i_pid < 8192 &&
 725                         !p_sys->pid[i_pid].b_valid )
 726                     {
 727                         ts_pid_t *pid = &p_sys->pid[i_pid];
 728
 729                         PIDInit( pid, VLC_FALSE, pmt->psi);
 730                         if( pmt->psi->prg[0]->i_pid_pcr <= 0 )
 731                         {
 732                             pmt->psi->prg[0]->i_pid_pcr = i_pid;
 733                         }
 734                         PIDFillFormat( pid, i_stream_type);
 735                         if( pid->es->fmt.i_cat != UNKNOWN_ES )
 736                         {
 737                             if( p_sys->b_es_id_pid )
 738                             {
 739                                 pid->es->fmt.i_id = i_pid;
 740                             }
 741                             msg_Dbg( p_demux, "  * es pid=%d type=%d "
 742                                      "fcc=%4.4s", i_pid, i_stream_type,
 743                                      (char*)&pid->es->fmt.i_codec );
 744                             pid->es->id = es_out_Add( p_demux->out,
 745                                                       &pid->es->fmt );
 746                         }
 747                     }
 748                 }
 749                 psz = psz_next;
 750             }
 751         }
 752     }
 753     if( val.psz_string )
 754     {
 755         free( val.psz_string );
 756     }
 757
 758     var_Create( p_demux, "ts-csa-ck", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
 759     var_Get( p_demux, "ts-csa-ck", &val );
 760     if( val.psz_string && *val.psz_string )
 761     {
 762         char *psz = val.psz_string;
 763         if( psz[0] == '0' && ( psz[1] == 'x' || psz[1] == 'X' ) )
 764         {
 765             psz += 2;
 766         }
 767         if( strlen( psz ) != 16 )
 768         {
 769             msg_Warn( p_demux, "invalid csa ck (it must be 16 chars long)" );
 770         }
 771         else
 772         {
 773 #ifndef UNDER_CE
 774             uint64_t i_ck = strtoull( psz, NULL, 16 );
 775 #else
 776             uint64_t i_ck = strtoll( psz, NULL, 16 );
 777 #endif
 778             uint8_t ck[8];
 779             int     i;
 780             for( i = 0; i < 8; i++ )
 781             {
 782                 ck[i] = ( i_ck >> ( 56 - 8*i) )&0xff;
 783             }
 784 #ifndef TS_NO_CSA_CK_MSG
 785             msg_Dbg( p_demux, "using CSA scrambling with "
 786                      "ck=%x:%x:%x:%x:%x:%x:%x:%x",
 787                      ck[0], ck[1], ck[2], ck[3], ck[4], ck[5], ck[6], ck[7] );
 788 #endif
 789             p_sys->csa = csa_New();
 790
 791             if( p_sys->csa )
 792             {
 793                 vlc_value_t pkt_val;
 794
 795                 csa_SetCW( p_sys->csa, ck, ck );
 796
 797                 var_Create( p_demux, "ts-csa-pkt", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 798                 var_Get( p_demux, "ts-csa-pkt", &pkt_val );
 799                 if( pkt_val.i_int < 4 || pkt_val.i_int > 188 )
 800                 {
 801                     msg_Err( p_demux, "wrong packet size %d specified.", pkt_val.i_int );
 802                     msg_Warn( p_demux, "using default packet size of 188 bytes" );
 803                     p_sys->i_csa_pkt_size = 188;
 804                 }
 805                 else p_sys->i_csa_pkt_size = pkt_val.i_int;
 806                 msg_Dbg( p_demux, "decrypting %d bytes of packet", p_sys->i_csa_pkt_size );
 807             }
 808         }
 809     }
 810     if( val.psz_string )
 811     {
 812         free( val.psz_string );
 813     }
 814
 815     var_Create( p_demux, "ts-silent", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
 816     var_Get( p_demux, "ts-silent", &val );
 817     p_sys->b_silent = val.b_bool;
 818
 819     return VLC_SUCCESS;
 820 }
 821
 822 /*****************************************************************************
 823  * Close
 824  *****************************************************************************/
 825 static void Close( vlc_object_t *p_this )
 826 {
 827     demux_t     *p_demux = (demux_t*)p_this;
 828     demux_sys_t *p_sys = p_demux->p_sys;
 829
 830     int          i;
 831
 832     msg_Dbg( p_demux, "pid list:" );
 833     for( i = 0; i < 8192; i++ )
 834     {
 835         ts_pid_t *pid = &p_sys->pid[i];
 836
 837         if( pid->b_valid && pid->psi )
 838         {
 839             switch( pid->i_pid )
 840             {
 841                 case 0: /* PAT */
 842                     dvbpsi_DetachPAT( pid->psi->handle );
 843                     free( pid->psi );
 844                     break;
 845                 case 1: /* CAT */
 846                     free( pid->psi );
 847                     break;
 848                 case 0x11: /* SDT */
 849                 case 0x12: /* EIT */
 850                     dvbpsi_DetachDemux( pid->psi->handle );
 851                     free( pid->psi );
 852                     break;
 853                 default:
 854                     PIDClean( p_demux->out, pid );
 855                     break;
 856             }
 857         }
 858         else if( pid->b_valid && pid->es )
 859         {
 860             PIDClean( p_demux->out, pid );
 861         }
 862
 863         if( pid->b_seen )
 864         {
 865             msg_Dbg( p_demux, "  - pid[%d] seen", pid->i_pid );
 866         }
 867
 868         if( p_sys->b_dvb_control && pid->i_pid > 0 )
 869         {
 870             /* too much */
 871             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid, VLC_FALSE );
 872         }
 873
 874     }
 875
 876     if( p_sys->b_udp_out )
 877     {
 878         net_Close( p_sys->fd );
 879         free( p_sys->buffer );
 880     }
 881     if( p_sys->csa )
 882     {
 883         csa_Delete( p_sys->csa );
 884     }
 885
 886     if( p_sys->i_pmt ) free( p_sys->pmt );
 887
 888     if ( p_sys->p_programs_list )
 889     {
 890         vlc_value_t val;
 891         val.p_list = p_sys->p_programs_list;
 892         var_Change( p_demux, "programs", VLC_VAR_FREELIST, &val, NULL );
 893     }
 894
 895     /* If in dump mode, then close the file */
 896     if( p_sys->b_file_out )
 897     {
 898         msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", p_sys->psz_file,
 899                   p_sys->i_write / 1024 );
 900
 901         if( p_sys->p_file != stdout )
 902         {
 903             fclose( p_sys->p_file );
 904             p_sys->p_file = NULL;
 905         }
 906
 907         free( p_sys->buffer );
 908     }
 909
 910     free( p_sys->psz_file );
 911     p_sys->psz_file = NULL;
 912
 913     free( p_sys );
 914 }
 915
 916 /*****************************************************************************
 917  * DemuxFile:
 918  *****************************************************************************/
 919 static int DemuxFile( demux_t *p_demux )
 920 {
 921     demux_sys_t *p_sys = p_demux->p_sys;
 922     uint8_t     *p_buffer = p_sys->buffer; /* Put first on sync byte */
 923     int i_diff= 0;
 924     int i_data= 0;
 925     int i_pos = 0;
 926     int i_bufsize = p_sys->i_packet_size * p_sys->i_ts_read;
 927
 928     i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize );
 929     if( (i_data <= 0) && (i_data < p_sys->i_packet_size) )
 930     {
 931         msg_Dbg( p_demux, "error reading malformed packets" );
 932         return i_data;
 933     }
 934
 935     /* Test continuity counter */
 936     while( i_pos < i_data )
 937     {
 938         ts_pid_t    *p_pid;   /* point to a PID structure */
 939         vlc_bool_t b_payload; /* indicates a packet with payload */
 940         vlc_bool_t b_adaptation; /* adaptation field */
 941         int i_cc  = 0;        /* continuity counter */
 942
 943         if( p_sys->buffer[i_pos] != 0x47 )
 944         {
 945             msg_Warn( p_demux, "lost sync" );
 946             while( !p_demux->b_die && (i_pos < i_data) )
 947             {
 948                 i_pos++;
 949                 if( p_sys->buffer[i_pos] == 0x47 )
 950                     break;
 951             }
 952             if( !p_demux->b_die )
 953                 msg_Warn( p_demux, "sync found" );
 954         }
 955
 956         /* continuous when (one of this):
 957          * diff == 1
 958          * diff == 0 and payload == 0
 959          * diff == 0 and duplicate packet (playload != 0) <- should we
 960          *   test the content ?
 961          */
 962         i_cc  = p_buffer[i_pos+3]&0x0f;
 963         b_payload = p_buffer[i_pos+3]&0x10;
 964         b_adaptation = p_buffer[i_pos+3]&0x20;
 965
 966         /* Get the PID */
 967         p_pid = &p_sys->pid[ ((p_buffer[i_pos+1]&0x1f)<<8)|p_buffer[i_pos+2] ];
 968
 969         /* Detect discontinuity indicator in adaptation field */
 970         if( b_adaptation )
 971         {
 972             if( p_buffer[i_pos+5]&0x80 )
 973                 msg_Warn( p_demux, "discontinuity indicator (pid=%d) ", p_pid->i_pid );
 974             if( p_buffer[i_pos+5]&0x40 )
 975                 msg_Warn( p_demux, "random access indicator (pid=%d) ", p_pid->i_pid );
 976         }
 977
 978         i_diff = ( i_cc - p_pid->i_cc )&0x0f;
 979         if( b_payload && i_diff == 1 )
 980         {
 981             p_pid->i_cc = ( p_pid->i_cc + 1 ) & 0xf;
 982         }
 983         else
 984         {
 985             if( p_pid->i_cc == 0xff )
 986             {
 987                 msg_Warn( p_demux, "first packet for pid=%d cc=0x%x",
 988                         p_pid->i_pid, i_cc );
 989                 p_pid->i_cc = i_cc;
 990             }
 991             else if( i_diff != 0 )
 992             {
 993                 /* FIXME what to do when discontinuity_indicator is set ? */
 994                 msg_Warn( p_demux, "transport error detected 0x%x instead of 0x%x",
 995                           i_cc, ( p_pid->i_cc + 1 )&0x0f );
 996
 997                 p_pid->i_cc = i_cc;
 998                 /* Mark transport error in the TS packet. */
 999                 p_buffer[i_pos+1] |= 0x80;
1000             }
1001         }
1002
1003         /* Test if user wants to decrypt it first */
1004         if( p_sys->csa )
1005             csa_Decrypt( p_demux->p_sys->csa, &p_buffer[i_pos], p_demux->p_sys->i_csa_pkt_size );
1006
1007         i_pos += p_sys->i_packet_size;
1008     }
1009
1010     /* Then write */
1011     i_data = fwrite( p_sys->buffer, 1, i_data, p_sys->p_file );
1012     if( i_data < 0 )
1013     {
1014         msg_Err( p_demux, "failed to write data" );
1015         return -1;
1016     }
1017 #if 0
1018     msg_Dbg( p_demux, "dumped %d bytes", i_data );
1019 #endif
1020
1021     p_sys->i_write += i_data;
1022     return 1;
1023 }
1024
1025 /*****************************************************************************
1026  * Demux:
1027  *****************************************************************************/
1028 static int Demux( demux_t *p_demux )
1029 {
1030     demux_sys_t *p_sys = p_demux->p_sys;
1031     int          i_pkt;
1032
1033     /* We read at most 100 TS packet or until a frame is completed */
1034     for( i_pkt = 0; i_pkt < p_sys->i_ts_read; i_pkt++ )
1035     {
1036         vlc_bool_t  b_frame = VLC_FALSE;
1037         block_t     *p_pkt;
1038         ts_pid_t    *p_pid;
1039
1040         /* Get a new TS packet */
1041         if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) )
1042         {
1043             msg_Dbg( p_demux, "eof ?" );
1044             return 0;
1045         }
1046
1047         /* Check sync byte and re-sync if needed */
1048         if( p_pkt->p_buffer[0] != 0x47 )
1049         {
1050             msg_Warn( p_demux, "lost synchro" );
1051             block_Release( p_pkt );
1052
1053             while( !p_demux->b_die )
1054             {
1055                 uint8_t *p_peek;
1056                 int i_peek, i_skip = 0;
1057
1058                 i_peek = stream_Peek( p_demux->s, &p_peek,
1059                                       p_sys->i_packet_size * 10 );
1060                 if( i_peek < p_sys->i_packet_size + 1 )
1061                 {
1062                     msg_Dbg( p_demux, "eof ?" );
1063                     return 0;
1064                 }
1065
1066                 while( i_skip < i_peek - p_sys->i_packet_size )
1067                 {
1068                     if( p_peek[i_skip] == 0x47 &&
1069                         p_peek[i_skip + p_sys->i_packet_size] == 0x47 )
1070                     {
1071                         break;
1072                     }
1073                     i_skip++;
1074                 }
1075
1076                 msg_Dbg( p_demux, "skipping %d bytes of garbage", i_skip );
1077                 stream_Read( p_demux->s, NULL, i_skip );
1078
1079                 if( i_skip < i_peek - p_sys->i_packet_size )
1080                 {
1081                     break;
1082                 }
1083             }
1084
1085             if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) )
1086             {
1087                 msg_Dbg( p_demux, "eof ?" );
1088                 return 0;
1089             }
1090         }
1091
1092         if( p_sys->b_udp_out )
1093         {
1094             memcpy( &p_sys->buffer[i_pkt * p_sys->i_packet_size],
1095                     p_pkt->p_buffer, p_sys->i_packet_size );
1096         }
1097
1098         /* Parse the TS packet */
1099         p_pid = &p_sys->pid[PIDGet( p_pkt )];
1100
1101         if( p_pid->b_valid )
1102         {
1103             if( p_pid->psi )
1104             {
1105                 if( p_pid->i_pid == 0 || p_pid->i_pid == 0x11 || p_pid->i_pid == 0x12 )
1106                 {
1107                     dvbpsi_PushPacket( p_pid->psi->handle, p_pkt->p_buffer );
1108                 }
1109                 else
1110                 {
1111                     int i_prg;
1112                     for( i_prg = 0; i_prg < p_pid->psi->i_prg; i_prg++ )
1113                     {
1114                         dvbpsi_PushPacket( p_pid->psi->prg[i_prg]->handle,
1115                                            p_pkt->p_buffer );
1116                     }
1117                 }
1118                 block_Release( p_pkt );
1119             }
1120             else if( !p_sys->b_udp_out )
1121             {
1122                 b_frame = GatherPES( p_demux, p_pid, p_pkt );
1123             }
1124             else
1125             {
1126                 PCRHandle( p_demux, p_pid, p_pkt );
1127                 block_Release( p_pkt );
1128             }
1129         }
1130         else
1131         {
1132             if( !p_pid->b_seen )
1133             {
1134                 msg_Dbg( p_demux, "pid[%d] unknown", p_pid->i_pid );
1135             }
1136             /* We have to handle PCR if present */
1137             PCRHandle( p_demux, p_pid, p_pkt );
1138             block_Release( p_pkt );
1139         }
1140         p_pid->b_seen = VLC_TRUE;
1141
1142         if( b_frame )
1143         {
1144             break;
1145         }
1146     }
1147
1148     if( p_sys->b_udp_out )
1149     {
1150         /* Send the complete block */
1151         net_Write( p_demux, p_sys->fd, NULL, p_sys->buffer,
1152                    p_sys->i_ts_read * p_sys->i_packet_size );
1153     }
1154
1155     return 1;
1156 }
1157
1158 /*****************************************************************************
1159  * Control:
1160  *****************************************************************************/
1161 static int Control( demux_t *p_demux, int i_query, va_list args )
1162 {
1163     demux_sys_t *p_sys = p_demux->p_sys;
1164     double f, *pf;
1165     int64_t i64;
1166     int64_t *pi64;
1167     int i_int;
1168
1169     if( p_sys->b_file_out )
1170         return demux2_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
1171
1172     switch( i_query )
1173     {
1174         case DEMUX_GET_POSITION:
1175             pf = (double*) va_arg( args, double* );
1176             i64 = stream_Size( p_demux->s );
1177             if( i64 > 0 )
1178             {
1179                 *pf = (double)stream_Tell( p_demux->s ) / (double)i64;
1180             }
1181             else
1182             {
1183                 *pf = 0.0;
1184             }
1185             return VLC_SUCCESS;
1186         case DEMUX_SET_POSITION:
1187             f = (double) va_arg( args, double );
1188             i64 = stream_Size( p_demux->s );
1189
1190             es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
1191             if( stream_Seek( p_demux->s, (int64_t)(i64 * f) ) )
1192             {
1193                 return VLC_EGENERIC;
1194             }
1195             return VLC_SUCCESS;
1196 #if 0
1197
1198         case DEMUX_GET_TIME:
1199             pi64 = (int64_t*)va_arg( args, int64_t * );
1200             if( p_sys->i_time < 0 )
1201             {
1202                 *pi64 = 0;
1203                 return VLC_EGENERIC;
1204             }
1205             *pi64 = p_sys->i_time;
1206             return VLC_SUCCESS;
1207
1208         case DEMUX_GET_LENGTH:
1209             pi64 = (int64_t*)va_arg( args, int64_t * );
1210             if( p_sys->i_mux_rate > 0 )
1211             {
1212                 *pi64 = I64C(1000000) * ( stream_Size( p_demux->s ) / 50 ) /
1213                         p_sys->i_mux_rate;
1214                 return VLC_SUCCESS;
1215             }
1216             *pi64 = 0;
1217             return VLC_EGENERIC;
1218 #else
1219         case DEMUX_GET_TIME:
1220         case DEMUX_GET_LENGTH:
1221             pi64 = (int64_t*)va_arg( args, int64_t * );
1222             *pi64 = 0;
1223             return VLC_SUCCESS;
1224 #endif
1225         case DEMUX_SET_GROUP:
1226         {
1227             uint16_t i_vpid = 0, i_apid1 = 0, i_apid2 = 0, i_apid3 = 0;
1228             ts_prg_psi_t *p_prg = NULL;
1229             vlc_list_t *p_list;
1230
1231             i_int = (int)va_arg( args, int );
1232             p_list = (vlc_list_t *)va_arg( args, vlc_list_t * );
1233             msg_Dbg( p_demux, "DEMUX_SET_GROUP %d %p", i_int, p_list );
1234
1235             if( p_sys->b_dvb_control && i_int > 0 && i_int != p_sys->i_dvb_program )
1236             {
1237                 int i_pmt_pid = -1;
1238                 int i;
1239
1240                 /* Search pmt to be unselected */
1241                 for( i = 0; i < p_sys->i_pmt; i++ )
1242                 {
1243                     ts_pid_t *pmt = p_sys->pmt[i];
1244                     int i_prg;
1245
1246                     for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
1247                     {
1248                         if( pmt->psi->prg[i_prg]->i_number == p_sys->i_dvb_program )
1249                         {
1250                             i_pmt_pid = p_sys->pmt[i]->i_pid;
1251                             break;
1252                         }
1253                     }
1254                     if( i_pmt_pid > 0 ) break;
1255                 }
1256
1257                 if( i_pmt_pid > 0 )
1258                 {
1259                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1260                                     ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
1261                                     VLC_FALSE );
1262                     /* All ES */
1263                     for( i = 2; i < 8192; i++ )
1264                     {
1265                         ts_pid_t *pid = &p_sys->pid[i];
1266                         int i_prg;
1267
1268                         if( !pid->b_valid || pid->psi ) continue;
1269
1270                         for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
1271                         {
1272                             if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
1273                             {
1274                                 /* We only remove es that aren't defined by extra pmt */
1275                                 stream_Control( p_demux->s,
1276                                                 STREAM_CONTROL_ACCESS,
1277                                                 ACCESS_SET_PRIVATE_ID_STATE,
1278                                                 i, VLC_FALSE );
1279                                 break;
1280                             }
1281                         }
1282                     }
1283                 }
1284
1285                 /* select new program */
1286                 p_sys->i_dvb_program = i_int;
1287                 i_pmt_pid = -1;
1288                 for( i = 0; i < p_sys->i_pmt; i++ )
1289                 {
1290                     ts_pid_t *pmt = p_sys->pmt[i];
1291                     int i_prg;
1292
1293                     for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
1294                     {
1295                         if( pmt->psi->prg[i_prg]->i_number == i_int )
1296                         {
1297                             i_pmt_pid = p_sys->pmt[i]->i_pid;
1298                             p_prg = p_sys->pmt[i]->psi->prg[i_prg];
1299                             break;
1300                         }
1301                     }
1302                     if( i_pmt_pid > 0 ) break;
1303                 }
1304                 if( i_pmt_pid > 0 )
1305                 {
1306                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1307                                     ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
1308                                     VLC_TRUE );
1309                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1310                                     ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr,
1311                                     VLC_TRUE );
1312
1313                     for( i = 2; i < 8192; i++ )
1314                     {
1315                         ts_pid_t *pid = &p_sys->pid[i];
1316                         int i_prg;
1317
1318                         if( !pid->b_valid || pid->psi ) continue;
1319
1320                         for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
1321                         {
1322                             if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
1323                             {
1324                                 if ( pid->es->fmt.i_cat == VIDEO_ES && !i_vpid )
1325                                     i_vpid = i;
1326                                 if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid1 )
1327                                     i_apid1 = i;
1328                                 else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid2 )
1329                                     i_apid2 = i;
1330                                 else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid3 )
1331                                     i_apid3 = i;
1332
1333                                 stream_Control( p_demux->s,
1334                                                 STREAM_CONTROL_ACCESS,
1335                                                 ACCESS_SET_PRIVATE_ID_STATE,
1336                                                 i, VLC_TRUE );
1337                                 break;
1338                             }
1339                         }
1340                     }
1341                 }
1342             }
1343             else
1344             {
1345                 p_sys->i_dvb_program = -1;
1346                 p_sys->p_programs_list = p_list;
1347             }
1348             return VLC_SUCCESS;
1349         }
1350
1351         case DEMUX_GET_FPS:
1352         case DEMUX_SET_TIME:
1353         default:
1354             return VLC_EGENERIC;
1355     }
1356 }
1357
1358 static void PIDInit( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner )
1359 {
1360     vlc_bool_t b_old_valid = pid->b_valid;
1361
1362     pid->b_valid    = VLC_TRUE;
1363     pid->i_cc       = 0xff;
1364     pid->p_owner    = p_owner;
1365     pid->i_owner_number = 0;
1366
1367     pid->extra_es   = NULL;
1368     pid->i_extra_es = 0;
1369
1370     if( b_psi )
1371     {
1372         pid->es  = NULL;
1373
1374         if( !b_old_valid )
1375         {
1376             pid->psi = malloc( sizeof( ts_psi_t ) );
1377             pid->psi->handle= NULL;
1378             pid->psi->i_prg = 0;
1379             pid->psi->prg   = NULL;
1380         }
1381         pid->psi->i_pat_version  = -1;
1382         pid->psi->i_sdt_version  = -1;
1383         if( p_owner )
1384         {
1385             ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) );
1386             /* PMT */
1387             prg->i_version  = -1;
1388             prg->i_number   = -1;
1389             prg->i_pid_pcr  = -1;
1390             prg->i_pid_pmt  = -1;
1391             prg->iod        = NULL;
1392             prg->handle     = NULL;
1393
1394             TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg );
1395         }
1396     }
1397     else
1398     {
1399         pid->psi = NULL;
1400         pid->es  = malloc( sizeof( ts_es_t ) );
1401
1402         es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 );
1403         pid->es->id      = NULL;
1404         pid->es->p_pes   = NULL;
1405         pid->es->i_pes_size= 0;
1406         pid->es->i_pes_gathered= 0;
1407         pid->es->pp_last = &pid->es->p_pes;
1408         pid->es->p_mpeg4desc = NULL;
1409         pid->es->b_gather = VLC_FALSE;
1410     }
1411 }
1412
1413 static void PIDClean( es_out_t *out, ts_pid_t *pid )
1414 {
1415     if( pid->psi )
1416     {
1417         int i;
1418
1419         if( pid->psi->handle ) dvbpsi_DetachPMT( pid->psi->handle );
1420         for( i = 0; i < pid->psi->i_prg; i++ )
1421         {
1422             if( pid->psi->prg[i]->iod )
1423                 IODFree( pid->psi->prg[i]->iod );
1424             if( pid->psi->prg[i]->handle )
1425                 dvbpsi_DetachPMT( pid->psi->prg[i]->handle );
1426             free( pid->psi->prg[i] );
1427         }
1428         if( pid->psi->prg ) free( pid->psi->prg );
1429         free( pid->psi );
1430     }
1431     else
1432     {
1433         int i;
1434
1435         if( pid->es->id )
1436             es_out_Del( out, pid->es->id );
1437
1438         if( pid->es->p_pes )
1439             block_ChainRelease( pid->es->p_pes );
1440
1441         es_format_Clean( &pid->es->fmt );
1442
1443         free( pid->es );
1444
1445         for( i = 0; i < pid->i_extra_es; i++ )
1446         {
1447             if( pid->extra_es[i]->id )
1448                 es_out_Del( out, pid->extra_es[i]->id );
1449
1450             if( pid->extra_es[i]->p_pes )
1451                 block_ChainRelease( pid->extra_es[i]->p_pes );
1452
1453             es_format_Clean( &pid->extra_es[i]->fmt );
1454
1455             free( pid->extra_es[i] );
1456         }
1457         if( pid->i_extra_es ) free( pid->extra_es );
1458     }
1459
1460     pid->b_valid = VLC_FALSE;
1461 }
1462
1463 /****************************************************************************
1464  * gathering stuff
1465  ****************************************************************************/
1466 static void ParsePES( demux_t *p_demux, ts_pid_t *pid )
1467 {
1468     block_t *p_pes = pid->es->p_pes;
1469     uint8_t header[30];
1470     int     i_pes_size = 0;
1471     int     i_skip = 0;
1472     mtime_t i_dts = -1;
1473     mtime_t i_pts = -1;
1474     mtime_t i_length = 0;
1475     int i_max;
1476
1477     /* remove the pes from pid */
1478     pid->es->p_pes = NULL;
1479     pid->es->i_pes_size= 0;
1480     pid->es->i_pes_gathered= 0;
1481     pid->es->pp_last = &pid->es->p_pes;
1482
1483     /* FIXME find real max size */
1484     i_max = block_ChainExtract( p_pes, header, 30 );
1485
1486
1487     if( header[0] != 0 || header[1] != 0 || header[2] != 1 )
1488     {
1489         if( !p_demux->p_sys->b_silent )
1490             msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x] (pid: %d)",
1491                       header[0], header[1],header[2],header[3], pid->i_pid );
1492         block_ChainRelease( p_pes );
1493         return;
1494     }
1495
1496     /* TODO check size */
1497     switch( header[3] )
1498     {
1499         case 0xBC:  /* Program stream map */
1500         case 0xBE:  /* Padding */
1501         case 0xBF:  /* Private stream 2 */
1502         case 0xB0:  /* ECM */
1503         case 0xB1:  /* EMM */
1504         case 0xFF:  /* Program stream directory */
1505         case 0xF2:  /* DSMCC stream */
1506         case 0xF8:  /* ITU-T H.222.1 type E stream */
1507             i_skip = 6;
1508             break;
1509         default:
1510             if( ( header[6]&0xC0 ) == 0x80 )
1511             {
1512                 /* mpeg2 PES */
1513                 i_skip = header[8] + 9;
1514
1515                 if( header[7]&0x80 )    /* has pts */
1516                 {
1517                     i_pts = ((mtime_t)(header[ 9]&0x0e ) << 29)|
1518                              (mtime_t)(header[10] << 22)|
1519                             ((mtime_t)(header[11]&0xfe) << 14)|
1520                              (mtime_t)(header[12] << 7)|
1521                              (mtime_t)(header[13] >> 1);
1522
1523                     if( header[7]&0x40 )    /* has dts */
1524                     {
1525                          i_dts = ((mtime_t)(header[14]&0x0e ) << 29)|
1526                                  (mtime_t)(header[15] << 22)|
1527                                 ((mtime_t)(header[16]&0xfe) << 14)|
1528                                  (mtime_t)(header[17] << 7)|
1529                                  (mtime_t)(header[18] >> 1);
1530                     }
1531                 }
1532             }
1533             else
1534             {
1535                 i_skip = 6;
1536                 while( i_skip < 23 && header[i_skip] == 0xff )
1537                 {
1538                     i_skip++;
1539                 }
1540                 if( i_skip == 23 )
1541                 {
1542                     msg_Err( p_demux, "too much MPEG-1 stuffing" );
1543                     block_ChainRelease( p_pes );
1544                     return;
1545                 }
1546                 if( ( header[i_skip] & 0xC0 ) == 0x40 )
1547                 {
1548                     i_skip += 2;
1549                 }
1550
1551                 if(  header[i_skip]&0x20 )
1552                 {
1553                      i_pts = ((mtime_t)(header[i_skip]&0x0e ) << 29)|
1554                               (mtime_t)(header[i_skip+1] << 22)|
1555                              ((mtime_t)(header[i_skip+2]&0xfe) << 14)|
1556                               (mtime_t)(header[i_skip+3] << 7)|
1557                               (mtime_t)(header[i_skip+4] >> 1);
1558
1559                     if( header[i_skip]&0x10 )    /* has dts */
1560                     {
1561                          i_dts = ((mtime_t)(header[i_skip+5]&0x0e ) << 29)|
1562                                   (mtime_t)(header[i_skip+6] << 22)|
1563                                  ((mtime_t)(header[i_skip+7]&0xfe) << 14)|
1564                                   (mtime_t)(header[i_skip+8] << 7)|
1565                                   (mtime_t)(header[i_skip+9] >> 1);
1566                          i_skip += 10;
1567                     }
1568                     else
1569                     {
1570                         i_skip += 5;
1571                     }
1572                 }
1573                 else
1574                 {
1575                     i_skip += 1;
1576                 }
1577             }
1578             break;
1579     }
1580
1581     if( pid->es->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', 'b' ) ||
1582         pid->es->fmt.i_codec == VLC_FOURCC( 'd', 't', 's', 'b' ) )
1583     {
1584         i_skip += 4;
1585     }
1586     else if( pid->es->fmt.i_codec == VLC_FOURCC( 'l', 'p', 'c', 'b' ) ||
1587              pid->es->fmt.i_codec == VLC_FOURCC( 's', 'p', 'u', 'b' ) ||
1588              pid->es->fmt.i_codec == VLC_FOURCC( 's', 'd', 'd', 'b' ) )
1589     {
1590         i_skip += 1;
1591     }
1592     else if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) &&
1593              pid->es->p_mpeg4desc )
1594     {
1595         decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr;
1596
1597         if( dcd->i_decoder_specific_info_len > 2 &&
1598             dcd->p_decoder_specific_info[0] == 0x10 &&
1599             ( dcd->p_decoder_specific_info[1]&0x10 ) )
1600         {
1601             /* display length */
1602             if( p_pes->i_buffer + 2 <= i_skip )
1603             {
1604                 i_length = GetWBE( &p_pes->p_buffer[i_skip] );
1605             }
1606
1607             i_skip += 2;
1608         }
1609         if( p_pes->i_buffer + 2 <= i_skip )
1610         {
1611             i_pes_size = GetWBE( &p_pes->p_buffer[i_skip] );
1612         }
1613         /* */
1614         i_skip += 2;
1615     }
1616
1617     /* skip header */
1618     while( p_pes && i_skip > 0 )
1619     {
1620         if( p_pes->i_buffer <= i_skip )
1621         {
1622             block_t *p_next = p_pes->p_next;
1623
1624             i_skip -= p_pes->i_buffer;
1625             block_Release( p_pes );
1626             p_pes = p_next;
1627         }
1628         else
1629         {
1630             p_pes->i_buffer -= i_skip;
1631             p_pes->p_buffer += i_skip;
1632             break;
1633         }
1634     }
1635
1636     /* ISO/IEC 13818-1 2.7.5: if no pts and no dts, then dts == pts */
1637     if( i_pts >= 0 && i_dts < 0 )
1638         i_dts = i_pts;
1639
1640     if( p_pes )
1641     {
1642         block_t *p_block;
1643         int i;
1644
1645         if( i_dts >= 0 )
1646         {
1647             p_pes->i_dts = i_dts * 100 / 9;
1648         }
1649         if( i_pts >= 0 )
1650         {
1651             p_pes->i_pts = i_pts * 100 / 9;
1652         }
1653         p_pes->i_length = i_length * 100 / 9;
1654
1655         p_block = block_ChainGather( p_pes );
1656         if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) )
1657         {
1658             if( i_pes_size > 0 && p_block->i_buffer > i_pes_size )
1659             {
1660                 p_block->i_buffer = i_pes_size;
1661             }
1662             /* Append a \0 */
1663             p_block = block_Realloc( p_block, 0, p_block->i_buffer + 1 );
1664             p_block->p_buffer[p_block->i_buffer -1] = '\0';
1665         }
1666
1667         for( i = 0; i < pid->i_extra_es; i++ )
1668         {
1669             es_out_Send( p_demux->out, pid->extra_es[i]->id,
1670                          block_Duplicate( p_block ) );
1671         }
1672
1673         es_out_Send( p_demux->out, pid->es->id, p_block );
1674     }
1675     else
1676     {
1677         msg_Warn( p_demux, "empty pes" );
1678     }
1679 }
1680
1681 static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
1682 {
1683     demux_sys_t   *p_sys = p_demux->p_sys;
1684     const uint8_t *p = p_bk->p_buffer;
1685
1686     if( ( p[3]&0x20 ) && /* adaptation */
1687         ( p[5]&0x10 ) &&
1688         ( p[4] >= 7 ) )
1689     {
1690         int i;
1691         mtime_t i_pcr;  /* 33 bits */
1692
1693         i_pcr = ( (mtime_t)p[6] << 25 ) |
1694                 ( (mtime_t)p[7] << 17 ) |
1695                 ( (mtime_t)p[8] << 9 ) |
1696                 ( (mtime_t)p[9] << 1 ) |
1697                 ( (mtime_t)p[10] >> 7 );
1698
1699         /* Search program and set the PCR */
1700         for( i = 0; i < p_sys->i_pmt; i++ )
1701         {
1702             int i_prg;
1703             for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
1704             {
1705                 if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr )
1706                 {
1707                     es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
1708                                     (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number,
1709                                     (int64_t)(i_pcr * 100 / 9) );
1710                 }
1711             }
1712         }
1713     }
1714 }
1715
1716 static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
1717 {
1718     const uint8_t    *p = p_bk->p_buffer;
1719     const vlc_bool_t b_unit_start = p[1]&0x40;
1720     const vlc_bool_t b_adaptation = p[3]&0x20;
1721     const vlc_bool_t b_payload    = p[3]&0x10;
1722     const int        i_cc         = p[3]&0x0f;   /* continuity counter */
1723     vlc_bool_t       b_discontinuity = VLC_FALSE;/* discontinuity */
1724
1725     /* transport_scrambling_control is ignored */
1726     int         i_skip = 0;
1727     vlc_bool_t  i_ret  = VLC_FALSE;
1728     int         i_diff;
1729
1730 #if 0
1731     msg_Dbg( p_demux, "pid=%d unit_start=%d adaptation=%d payload=%d "
1732              "cc=0x%x", pid->i_pid, b_unit_start, b_adaptation,
1733              b_payload, i_cc );
1734 #endif
1735
1736     /* For now, ignore additional error correction
1737      * TODO: handle Reed-Solomon 204,188 error correction */
1738     p_bk->i_buffer = TS_PACKET_SIZE_188;
1739
1740     if( p[1]&0x80 )
1741     {
1742         msg_Dbg( p_demux, "transport_error_indicator set (pid=%d)",
1743                  pid->i_pid );
1744         if( pid->es->p_pes ) //&& pid->es->fmt.i_cat == VIDEO_ES )
1745             pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
1746     }
1747
1748     if( p_demux->p_sys->csa )
1749     {
1750         csa_Decrypt( p_demux->p_sys->csa, p_bk->p_buffer, p_demux->p_sys->i_csa_pkt_size );
1751     }
1752
1753     if( !b_adaptation )
1754     {
1755         /* We don't have any adaptation_field, so payload starts
1756          * immediately after the 4 byte TS header */
1757         i_skip = 4;
1758     }
1759     else
1760     {
1761         /* p[4] is adaptation_field_length minus one */
1762         i_skip = 5 + p[4];
1763         if( p[4] > 0 )
1764         {
1765             /* discontinuity indicator found in stream */
1766             b_discontinuity = (p[5]&0x80) ? VLC_TRUE : VLC_FALSE;
1767             if( b_discontinuity && pid->es->p_pes )
1768             {
1769                 msg_Warn( p_demux, "discontinuity indicator (pid=%d) ",
1770                             pid->i_pid );
1771                 /* pid->es->p_pes->i_flags |= BLOCK_FLAG_DISCONTINUITY; */
1772             }
1773 #if 0
1774             if( p[5]&0x40 )
1775                 msg_Dbg( p_demux, "random access indicator (pid=%d) ", pid->i_pid );
1776 #endif
1777         }
1778     }
1779
1780     /* Test continuity counter */
1781     /* continuous when (one of this):
1782         * diff == 1
1783         * diff == 0 and payload == 0
1784         * diff == 0 and duplicate packet (playload != 0) <- should we
1785         *   test the content ?
1786      */
1787     i_diff = ( i_cc - pid->i_cc )&0x0f;
1788     if( b_payload && i_diff == 1 )
1789     {
1790         pid->i_cc = ( pid->i_cc + 1 ) & 0xf;
1791     }
1792     else
1793     {
1794         if( pid->i_cc == 0xff )
1795         {
1796             msg_Warn( p_demux, "first packet for pid=%d cc=0x%x",
1797                       pid->i_pid, i_cc );
1798             pid->i_cc = i_cc;
1799         }
1800         else if( i_diff != 0 && !b_discontinuity )
1801         {
1802             msg_Warn( p_demux, "discontinuity received 0x%x instead of 0x%x (pid=%d)",
1803                       i_cc, ( pid->i_cc + 1 )&0x0f, pid->i_pid );
1804
1805             pid->i_cc = i_cc;
1806             if( pid->es->p_pes && pid->es->fmt.i_cat != VIDEO_ES )
1807             {
1808                 /* Small video artifacts are usually better then
1809                  * dropping full frames */
1810                 pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
1811             }
1812         }
1813     }
1814
1815     PCRHandle( p_demux, pid, p_bk );
1816
1817     if( i_skip >= 188 || pid->es->id == NULL || p_demux->p_sys->b_udp_out )
1818     {
1819         block_Release( p_bk );
1820         return i_ret;
1821     }
1822
1823     /* We have to gather it */
1824     p_bk->p_buffer += i_skip;
1825     p_bk->i_buffer -= i_skip;
1826
1827     if( b_unit_start )
1828     {
1829         if( pid->es->p_pes )
1830         {
1831             ParsePES( p_demux, pid );
1832             i_ret = VLC_TRUE;
1833         }
1834
1835         block_ChainLastAppend( &pid->es->pp_last, p_bk );
1836         if( p_bk->i_buffer > 6 )
1837         {
1838             pid->es->i_pes_size = GetWBE( &p_bk->p_buffer[4] );
1839             if( pid->es->i_pes_size > 0 )
1840             {
1841                 pid->es->i_pes_size += 6;
1842             }
1843         }
1844         pid->es->i_pes_gathered += p_bk->i_buffer;
1845         if( pid->es->i_pes_size > 0 &&
1846             pid->es->i_pes_gathered >= pid->es->i_pes_size )
1847         {
1848             ParsePES( p_demux, pid );
1849             i_ret = VLC_TRUE;
1850         }
1851     }
1852     else
1853     {
1854         if( pid->es->p_pes == NULL )
1855         {
1856             /* msg_Dbg( p_demux, "broken packet" ); */
1857             block_Release( p_bk );
1858         }
1859         else
1860         {
1861             block_ChainLastAppend( &pid->es->pp_last, p_bk );
1862             pid->es->i_pes_gathered += p_bk->i_buffer;
1863             if( pid->es->i_pes_size > 0 &&
1864                 pid->es->i_pes_gathered >= pid->es->i_pes_size )
1865             {
1866                 ParsePES( p_demux, pid );
1867                 i_ret = VLC_TRUE;
1868             }
1869         }
1870     }
1871
1872     return i_ret;
1873 }
1874
1875 static int PIDFillFormat( ts_pid_t *pid, int i_stream_type )
1876 {
1877     es_format_t *fmt = &pid->es->fmt;
1878
1879     switch( i_stream_type )
1880     {
1881         case 0x01:  /* MPEG-1 video */
1882         case 0x02:  /* MPEG-2 video */
1883         case 0x80:  /* MPEG-2 MOTO video */
1884             es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', 'g', 'v' ) );
1885             break;
1886         case 0x03:  /* MPEG-1 audio */
1887         case 0x04:  /* MPEG-2 audio */
1888             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', 'g', 'a' ) );
1889             break;
1890         case 0x11:  /* MPEG4 (audio) */
1891         case 0x0f:  /* ISO/IEC 13818-7 Audio with ADTS transport syntax */
1892             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', '4', 'a' ) );
1893             break;
1894         case 0x10:  /* MPEG4 (video) */
1895             es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) );
1896             pid->es->b_gather = VLC_TRUE;
1897             break;
1898         case 0x1B:  /* H264 <- check transport syntax/needed descriptor */
1899             es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'h', '2', '6', '4' ) );
1900             break;
1901
1902         case 0x81:  /* A52 (audio) */
1903             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', ' ' ) );
1904             break;
1905         case 0x82:  /* DVD_SPU (sub) */
1906             es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', ' ' ) );
1907             break;
1908         case 0x83:  /* LPCM (audio) */
1909             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'l', 'p', 'c', 'm' ) );
1910             break;
1911         case 0x84:  /* SDDS (audio) */
1912             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 's' ) );
1913             break;
1914         case 0x85:  /* DTS (audio) */
1915             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'd', 't', 's', ' ' ) );
1916             break;
1917
1918         case 0x91:  /* A52 vls (audio) */
1919             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', 'b' ) );
1920             break;
1921         case 0x92:  /* DVD_SPU vls (sub) */
1922             es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', 'b' ) );
1923             break;
1924
1925         case 0x94:  /* SDDS (audio) */
1926             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 'b' ) );
1927             break;
1928
1929         case 0xa0:  /* MSCODEC vlc (video) (fixed later) */
1930             es_format_Init( fmt, UNKNOWN_ES, 0 );
1931             pid->es->b_gather = VLC_TRUE;
1932             break;
1933
1934         case 0x06:  /* PES_PRIVATE  (fixed later) */
1935         case 0x12:  /* MPEG-4 generic (sub/scene/...) (fixed later) */
1936         default:
1937             es_format_Init( fmt, UNKNOWN_ES, 0 );
1938             break;
1939     }
1940
1941     /* PES packets usually contain truncated frames */
1942     fmt->b_packetized = VLC_FALSE;
1943
1944     return fmt->i_cat == UNKNOWN_ES ? VLC_EGENERIC : VLC_SUCCESS ;
1945 }
1946
1947 /*****************************************************************************
1948  * MP4 specific functions (IOD parser)
1949  *****************************************************************************/
1950 static int  IODDescriptorLength( int *pi_data, uint8_t **pp_data )
1951 {
1952     unsigned int i_b;
1953     unsigned int i_len = 0;
1954     do
1955     {
1956         i_b = **pp_data;
1957         (*pp_data)++;
1958         (*pi_data)--;
1959         i_len = ( i_len << 7 ) + ( i_b&0x7f );
1960
1961     } while( i_b&0x80 );
1962
1963     return( i_len );
1964 }
1965 static int IODGetByte( int *pi_data, uint8_t **pp_data )
1966 {
1967     if( *pi_data > 0 )
1968     {
1969         const int i_b = **pp_data;
1970         (*pp_data)++;
1971         (*pi_data)--;
1972         return( i_b );
1973     }
1974     return( 0 );
1975 }
1976 static int IODGetWord( int *pi_data, uint8_t **pp_data )
1977 {
1978     const int i1 = IODGetByte( pi_data, pp_data );
1979     const int i2 = IODGetByte( pi_data, pp_data );
1980     return( ( i1 << 8 ) | i2 );
1981 }
1982 static int IODGet3Bytes( int *pi_data, uint8_t **pp_data )
1983 {
1984     const int i1 = IODGetByte( pi_data, pp_data );
1985     const int i2 = IODGetByte( pi_data, pp_data );
1986     const int i3 = IODGetByte( pi_data, pp_data );
1987
1988     return( ( i1 << 16 ) | ( i2 << 8) | i3 );
1989 }
1990
1991 static uint32_t IODGetDWord( int *pi_data, uint8_t **pp_data )
1992 {
1993     const uint32_t i1 = IODGetWord( pi_data, pp_data );
1994     const uint32_t i2 = IODGetWord( pi_data, pp_data );
1995     return( ( i1 << 16 ) | i2 );
1996 }
1997
1998 static char* IODGetURL( int *pi_data, uint8_t **pp_data )
1999 {
2000     char *url;
2001     int i_url_len, i;
2002
2003     i_url_len = IODGetByte( pi_data, pp_data );
2004     url = malloc( i_url_len + 1 );
2005     for( i = 0; i < i_url_len; i++ )
2006     {
2007         url[i] = IODGetByte( pi_data, pp_data );
2008     }
2009     url[i_url_len] = '\0';
2010     return( url );
2011 }
2012
2013 static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
2014 {
2015     iod_descriptor_t *p_iod;
2016     int i;
2017     int i_es_index;
2018     uint8_t     i_flags, i_iod_tag, byte1, byte2, byte3;
2019     vlc_bool_t  b_url;
2020     int         i_iod_length;
2021
2022     p_iod = malloc( sizeof( iod_descriptor_t ) );
2023     memset( p_iod, 0, sizeof( iod_descriptor_t ) );
2024
2025 #ifdef TS_DEBUG
2026     fprintf( stderr, "\n************ IOD ************" );
2027 #endif
2028     for( i = 0; i < 255; i++ )
2029     {
2030         p_iod->es_descr[i].b_ok = 0;
2031     }
2032     i_es_index = 0;
2033
2034     if( i_data < 3 )
2035     {
2036         return p_iod;
2037     }
2038
2039     byte1 = IODGetByte( &i_data, &p_data );
2040     byte2 = IODGetByte( &i_data, &p_data );
2041     byte3 = IODGetByte( &i_data, &p_data );
2042     if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor
2043     {
2044         p_iod->i_iod_label_scope = 0x11;
2045         p_iod->i_iod_label = byte1;
2046         i_iod_tag = byte2;
2047     }
2048     else  //correct implementation of the IOD_descriptor
2049     {
2050         p_iod->i_iod_label_scope = byte1;
2051         p_iod->i_iod_label = byte2;
2052         i_iod_tag = byte3;
2053     }
2054 #ifdef TS_DEBUG
2055     fprintf( stderr, "\n* iod_label:%d", p_iod->i_iod_label );
2056     fprintf( stderr, "\n* ===========" );
2057     fprintf( stderr, "\n* tag:0x%x", i_iod_tag );
2058 #endif
2059     if( i_iod_tag != 0x02 )
2060     {
2061 #ifdef TS_DEBUG
2062         fprintf( stderr, "\n ERR: tag %02x != 0x02", i_iod_tag );
2063 #endif
2064         return p_iod;
2065     }
2066
2067     i_iod_length = IODDescriptorLength( &i_data, &p_data );
2068 #ifdef TS_DEBUG
2069     fprintf( stderr, "\n* length:%d", i_iod_length );
2070 #endif
2071     if( i_iod_length > i_data )
2072     {
2073         i_iod_length = i_data;
2074     }
2075
2076     p_iod->i_od_id = ( IODGetByte( &i_data, &p_data ) << 2 );
2077     i_flags = IODGetByte( &i_data, &p_data );
2078     p_iod->i_od_id |= i_flags >> 6;
2079     b_url = ( i_flags >> 5  )&0x01;
2080 #ifdef TS_DEBUG
2081     fprintf( stderr, "\n* od_id:%d", p_iod->i_od_id );
2082     fprintf( stderr, "\n* url flag:%d", b_url );
2083     fprintf( stderr, "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 );
2084 #endif
2085     if( b_url )
2086     {
2087         p_iod->psz_url = IODGetURL( &i_data, &p_data );
2088 #ifdef TS_DEBUG
2089         fprintf( stderr, "\n* url string:%s", p_iod->psz_url );
2090         fprintf( stderr, "\n*****************************\n" );
2091 #endif
2092         return p_iod;
2093     }
2094     else
2095     {
2096         p_iod->psz_url = NULL;
2097     }
2098
2099     p_iod->i_ODProfileLevelIndication = IODGetByte( &i_data, &p_data );
2100     p_iod->i_sceneProfileLevelIndication = IODGetByte( &i_data, &p_data );
2101     p_iod->i_audioProfileLevelIndication = IODGetByte( &i_data, &p_data );
2102     p_iod->i_visualProfileLevelIndication = IODGetByte( &i_data, &p_data );
2103     p_iod->i_graphicsProfileLevelIndication = IODGetByte( &i_data, &p_data );
2104 #ifdef TS_DEBUG
2105     fprintf( stderr, "\n* ODProfileLevelIndication:%d", p_iod->i_ODProfileLevelIndication );
2106     fprintf( stderr, "\n* sceneProfileLevelIndication:%d", p_iod->i_sceneProfileLevelIndication );
2107     fprintf( stderr, "\n* audioProfileLevelIndication:%d", p_iod->i_audioProfileLevelIndication );
2108     fprintf( stderr, "\n* visualProfileLevelIndication:%d", p_iod->i_visualProfileLevelIndication );
2109     fprintf( stderr, "\n* graphicsProfileLevelIndication:%d", p_iod->i_graphicsProfileLevelIndication );
2110 #endif
2111
2112     while( i_data > 0 && i_es_index < 255)
2113     {
2114         int i_tag, i_length;
2115         int     i_data_sav;
2116         uint8_t *p_data_sav;
2117
2118         i_tag = IODGetByte( &i_data, &p_data );
2119         i_length = IODDescriptorLength( &i_data, &p_data );
2120
2121         i_data_sav = i_data;
2122         p_data_sav = p_data;
2123
2124         i_data = i_length;
2125
2126         switch( i_tag )
2127         {
2128             case 0x03:
2129                 {
2130 #define es_descr    p_iod->es_descr[i_es_index]
2131                     int i_decoderConfigDescr_length;
2132 #ifdef TS_DEBUG
2133                     fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length );
2134 #endif
2135                     es_descr.b_ok = 1;
2136
2137                     es_descr.i_es_id = IODGetWord( &i_data, &p_data );
2138                     i_flags = IODGetByte( &i_data, &p_data );
2139                     es_descr.b_streamDependenceFlag = ( i_flags >> 7 )&0x01;
2140                     b_url = ( i_flags >> 6 )&0x01;
2141                     es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01;
2142                     es_descr.i_streamPriority = i_flags & 0x1f;
2143 #ifdef TS_DEBUG
2144                     fprintf( stderr, "\n*   * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag );
2145                     fprintf( stderr, "\n*   * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag );
2146                     fprintf( stderr, "\n*   * streamPriority:%d", es_descr.i_streamPriority );
2147 #endif
2148                     if( es_descr.b_streamDependenceFlag )
2149                     {
2150                         es_descr.i_dependOn_es_id = IODGetWord( &i_data, &p_data );
2151 #ifdef TS_DEBUG
2152                         fprintf( stderr, "\n*   * dependOn_es_id:%d", es_descr.i_dependOn_es_id );
2153 #endif
2154                     }
2155
2156                     if( b_url )
2157                     {
2158                         es_descr.psz_url = IODGetURL( &i_data, &p_data );
2159 #ifdef TS_DEBUG
2160                         fprintf( stderr, "\n* url string:%s", es_descr.psz_url );
2161 #endif
2162                     }
2163                     else
2164                     {
2165                         es_descr.psz_url = NULL;
2166                     }
2167
2168                     if( es_descr.b_OCRStreamFlag )
2169                     {
2170                         es_descr.i_OCR_es_id = IODGetWord( &i_data, &p_data );
2171 #ifdef TS_DEBUG
2172                         fprintf( stderr, "\n*   * OCR_es_id:%d", es_descr.i_OCR_es_id );
2173 #endif
2174                     }
2175
2176                     if( IODGetByte( &i_data, &p_data ) != 0x04 )
2177                     {
2178 #ifdef TS_DEBUG
2179                         fprintf( stderr, "\n* ERR missing DecoderConfigDescr" );
2180 #endif
2181                         es_descr.b_ok = 0;
2182                         break;
2183                     }
2184                     i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
2185 #ifdef TS_DEBUG
2186                     fprintf( stderr, "\n*   - DecoderConfigDesc length:%d", i_decoderConfigDescr_length );
2187 #endif
2188 #define dec_descr   es_descr.dec_descr
2189                     dec_descr.i_objectTypeIndication = IODGetByte( &i_data, &p_data );
2190                     i_flags = IODGetByte( &i_data, &p_data );
2191                     dec_descr.i_streamType = i_flags >> 2;
2192                     dec_descr.b_upStream = ( i_flags >> 1 )&0x01;
2193                     dec_descr.i_bufferSizeDB = IODGet3Bytes( &i_data, &p_data );
2194                     dec_descr.i_maxBitrate = IODGetDWord( &i_data, &p_data );
2195                     dec_descr.i_avgBitrate = IODGetDWord( &i_data, &p_data );
2196 #ifdef TS_DEBUG
2197                     fprintf( stderr, "\n*     * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication  );
2198                     fprintf( stderr, "\n*     * streamType:0x%x", dec_descr.i_streamType );
2199                     fprintf( stderr, "\n*     * upStream:%d", dec_descr.b_upStream );
2200                     fprintf( stderr, "\n*     * bufferSizeDB:%d", dec_descr.i_bufferSizeDB );
2201                     fprintf( stderr, "\n*     * maxBitrate:%d", dec_descr.i_maxBitrate );
2202                     fprintf( stderr, "\n*     * avgBitrate:%d", dec_descr.i_avgBitrate );
2203 #endif
2204                     if( i_decoderConfigDescr_length > 13 && IODGetByte( &i_data, &p_data ) == 0x05 )
2205                     {
2206                         int i;
2207                         dec_descr.i_decoder_specific_info_len =
2208                             IODDescriptorLength( &i_data, &p_data );
2209                         if( dec_descr.i_decoder_specific_info_len > 0 )
2210                         {
2211                             dec_descr.p_decoder_specific_info =
2212                                 malloc( dec_descr.i_decoder_specific_info_len );
2213                         }
2214                         for( i = 0; i < dec_descr.i_decoder_specific_info_len; i++ )
2215                         {
2216                             dec_descr.p_decoder_specific_info[i] = IODGetByte( &i_data, &p_data );
2217                         }
2218                     }
2219                     else
2220                     {
2221                         dec_descr.i_decoder_specific_info_len = 0;
2222                         dec_descr.p_decoder_specific_info = NULL;
2223                     }
2224                 }
2225 #undef  dec_descr
2226 #define sl_descr    es_descr.sl_descr
2227                 {
2228                     int i_SLConfigDescr_length;
2229                     int i_predefined;
2230
2231                     if( IODGetByte( &i_data, &p_data ) != 0x06 )
2232                     {
2233 #ifdef TS_DEBUG
2234                         fprintf( stderr, "\n* ERR missing SLConfigDescr" );
2235 #endif
2236                         es_descr.b_ok = 0;
2237                         break;
2238                     }
2239                     i_SLConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
2240 #ifdef TS_DEBUG
2241                     fprintf( stderr, "\n*   - SLConfigDescr length:%d", i_SLConfigDescr_length );
2242 #endif
2243                     i_predefined = IODGetByte( &i_data, &p_data );
2244 #ifdef TS_DEBUG
2245                     fprintf( stderr, "\n*     * i_predefined:0x%x", i_predefined  );
2246 #endif
2247                     switch( i_predefined )
2248                     {
2249                         case 0x01:
2250                             {
2251                                 sl_descr.b_useAccessUnitStartFlag   = 0;
2252                                 sl_descr.b_useAccessUnitEndFlag     = 0;
2253                                 sl_descr.b_useRandomAccessPointFlag = 0;
2254                                 //sl_descr.b_useRandomAccessUnitsOnlyFlag = 0;
2255                                 sl_descr.b_usePaddingFlag           = 0;
2256                                 sl_descr.b_useTimeStampsFlags       = 0;
2257                                 sl_descr.b_useIdleFlag              = 0;
2258                                 sl_descr.b_durationFlag     = 0;    // FIXME FIXME
2259                                 sl_descr.i_timeStampResolution      = 1000;
2260                                 sl_descr.i_OCRResolution    = 0;    // FIXME FIXME
2261                                 sl_descr.i_timeStampLength          = 32;
2262                                 sl_descr.i_OCRLength        = 0;    // FIXME FIXME
2263                                 sl_descr.i_AU_Length                = 0;
2264                                 sl_descr.i_instantBitrateLength= 0; // FIXME FIXME
2265                                 sl_descr.i_degradationPriorityLength= 0;
2266                                 sl_descr.i_AU_seqNumLength          = 0;
2267                                 sl_descr.i_packetSeqNumLength       = 0;
2268                                 if( sl_descr.b_durationFlag )
2269                                 {
2270                                     sl_descr.i_timeScale            = 0;    // FIXME FIXME
2271                                     sl_descr.i_accessUnitDuration   = 0;    // FIXME FIXME
2272                                     sl_descr.i_compositionUnitDuration= 0;    // FIXME FIXME
2273                                 }
2274                                 if( !sl_descr.b_useTimeStampsFlags )
2275                                 {
2276                                     sl_descr.i_startDecodingTimeStamp   = 0;    // FIXME FIXME
2277                                     sl_descr.i_startCompositionTimeStamp= 0;    // FIXME FIXME
2278                                 }
2279                             }
2280                             break;
2281                         default:
2282 #ifdef TS_DEBUG
2283                             fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" );
2284 #endif
2285                             es_descr.b_ok = 0;
2286                             break;
2287                     }
2288                 }
2289                 break;
2290 #undef  sl_descr
2291 #undef  es_descr
2292             default:
2293 #ifdef TS_DEBUG
2294                 fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length );
2295 #endif
2296                 break;
2297         }
2298
2299         p_data = p_data_sav + i_length;
2300         i_data = i_data_sav - i_length;
2301         i_es_index++;
2302     }
2303 #ifdef TS_DEBUG
2304     fprintf( stderr, "\n*****************************\n" );
2305 #endif
2306     return p_iod;
2307 }
2308
2309 static void IODFree( iod_descriptor_t *p_iod )
2310 {
2311     int i;
2312
2313     if( p_iod->psz_url )
2314     {
2315         free( p_iod->psz_url );
2316         p_iod->psz_url = NULL;
2317         free( p_iod );
2318         return;
2319     }
2320
2321     for( i = 0; i < 255; i++ )
2322     {
2323 #define es_descr p_iod->es_descr[i]
2324         if( es_descr.b_ok )
2325         {
2326             if( es_descr.psz_url )
2327             {
2328                 free( es_descr.psz_url );
2329                 es_descr.psz_url = NULL;
2330             }
2331             else
2332             {
2333                 if( es_descr.dec_descr.p_decoder_specific_info != NULL )
2334                 {
2335                     free( es_descr.dec_descr.p_decoder_specific_info );
2336                     es_descr.dec_descr.p_decoder_specific_info = NULL;
2337                     es_descr.dec_descr.i_decoder_specific_info_len = 0;
2338                 }
2339             }
2340         }
2341         es_descr.b_ok = 0;
2342 #undef  es_descr
2343     }
2344     free( p_iod );
2345 }
2346
2347 /****************************************************************************
2348  ****************************************************************************
2349  ** libdvbpsi callbacks
2350  ****************************************************************************
2351  ****************************************************************************/
2352 static vlc_bool_t DVBProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm )
2353 {
2354     demux_sys_t          *p_sys = p_demux->p_sys;
2355
2356     if ( !p_sys->b_dvb_control ) return VLC_FALSE;
2357     if ( (p_sys->i_dvb_program == -1 && p_sys->p_programs_list == NULL)
2358            || p_sys->i_dvb_program == 0 )
2359         return VLC_TRUE;
2360     if ( p_sys->i_dvb_program == i_pgrm ) return VLC_TRUE;
2361
2362     if ( p_sys->p_programs_list != NULL )
2363     {
2364         int i;
2365         for ( i = 0; i < p_sys->p_programs_list->i_count; i++ )
2366         {
2367             if ( i_pgrm == p_sys->p_programs_list->p_values[i].i_int )
2368                 return VLC_TRUE;
2369         }
2370     }
2371     return VLC_FALSE;
2372 }
2373
2374 #ifdef TS_USE_DVB_SI
2375 static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
2376 {
2377     demux_sys_t          *p_sys = p_demux->p_sys;
2378     ts_pid_t             *sdt = &p_sys->pid[0x11];
2379     dvbpsi_sdt_service_t *p_srv;
2380
2381     msg_Dbg( p_demux, "SDTCallBack called" );
2382
2383     if( sdt->psi->i_sdt_version != -1 &&
2384         ( !p_sdt->b_current_next ||
2385           p_sdt->i_version == sdt->psi->i_sdt_version ) )
2386     {
2387         dvbpsi_DeleteSDT( p_sdt );
2388         return;
2389     }
2390
2391     msg_Dbg( p_demux, "new SDT ts_id=%d version=%d current_next=%d "
2392              "network_id=%d",
2393              p_sdt->i_ts_id, p_sdt->i_version, p_sdt->b_current_next,
2394              p_sdt->i_network_id );
2395
2396     for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next )
2397     {
2398         vlc_meta_t          *p_meta = vlc_meta_New();
2399         dvbpsi_descriptor_t *p_dr;
2400
2401         msg_Dbg( p_demux, "  * service id=%d eit schedule=%d present=%d "
2402                  "running=%d free_ca=%d",
2403                  p_srv->i_service_id, p_srv->b_eit_schedule,
2404                  p_srv->b_eit_present, p_srv->i_running_status,
2405                  p_srv->b_free_ca );
2406
2407         for( p_dr = p_srv->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
2408         {
2409             if( p_dr->i_tag == 0x48 )
2410             {
2411 #if 0
2412                 static const char *psz_type[0x11] = {
2413                     "Reserved",
2414                     "Digital television service",
2415                     "Digital radio sound service",
2416                     "Teletext service",
2417                     "NVOD reference service",
2418                     "NVOD time-shifted service",
2419                     "Mosaic service",
2420                     "PAL coded signal",
2421                     "SECAM coded signal",
2422                     "D/D2-MAC",
2423                     "FM Radio",
2424                     "NTSC coded signal",
2425                     "Data broadcast service",
2426                     "Reserved for Common Interface Usage",
2427                     "RCS Map (see EN 301 790 [35])",
2428                     "RCS FLS (see EN 301 790 [35])",
2429                     "DVB MHP service"
2430                 };
2431 #endif
2432                 dvbpsi_service_dr_t *pD = dvbpsi_DecodeServiceDr( p_dr );
2433                 char str1[257];
2434                 char str2[257];
2435
2436                 memcpy( str1, pD->i_service_provider_name,
2437                         pD->i_service_provider_name_length );
2438                 str1[pD->i_service_provider_name_length] = '\0';
2439                 memcpy( str2, pD->i_service_name, pD->i_service_name_length );
2440                 str2[pD->i_service_name_length] = '\0';
2441
2442                 msg_Dbg( p_demux, "    - type=%d provider=%s name=%s",
2443                         pD->i_service_type, str1, str2 );
2444
2445                 vlc_meta_SetTitle( p_meta, str2 );
2446                 vlc_meta_SetPublisher( p_meta, str1 );
2447                 if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 )
2448                     vlc_meta_Add( p_meta, "Type", psz_type[pD->i_service_type] );
2449             }
2450         }
2451
2452         if( p_srv->i_running_status == 0x01 )
2453             vlc_meta_Add( p_meta, "Status", "Not running" );
2454         else if( p_srv->i_running_status == 0x02 )
2455             vlc_meta_Add( p_meta, "Status", "Starts in a few seconds" );
2456         else if( p_srv->i_running_status == 0x03 )
2457             vlc_meta_Add( p_meta, "Status", "Pausing" );
2458         else if( p_srv->i_running_status == 0x04 )
2459             vlc_meta_Add( p_meta, "Status", "Running" );
2460         else
2461             vlc_meta_Add( p_meta, "Status", "Unknown" );
2462
2463         es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META,
2464                         p_srv->i_service_id, p_meta );
2465         vlc_meta_Delete( p_meta );
2466     }
2467
2468     sdt->psi->i_sdt_version = p_sdt->i_version;
2469     dvbpsi_DeleteSDT( p_sdt );
2470 }
2471 #if 0
2472 static void DecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d )
2473 {
2474     int yp = (int)( ( (double)i_mjd - 15078.2)/365.25 );
2475     int mp = (int)( ((double)i_mjd - 14956.1 - (int)(yp * 365.25)) / 30.6001 );
2476
2477     *p_d = i_mjd - 14956 - (int)(yp*365.25) - (int)(mp*30.6001);
2478
2479     if( mp == 14 || mp == 15 )
2480     {
2481         *p_y = yp + 1;
2482         *p_m = mp - 1 + 12;
2483     }
2484     else
2485     {
2486         *p_y = yp;
2487         *p_m = mp - 1;
2488     }
2489 }
2490 #endif
2491 static void EITEventFixString( unsigned char *psz )
2492 {
2493     int i_len;
2494     /* Sometimes the first char isn't a normal char but designed
2495      * caracters encoding, for now lets skip it */
2496     if( psz[0] >= 0x20 )
2497             return;
2498     if( ( i_len = strlen( (char *) psz ) ) > 0 )
2499         memmove( &psz[0], &psz[1], i_len ); /* Copy the \0 too */
2500 }
2501 static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
2502 {
2503     dvbpsi_eit_event_t *p_evt;
2504     vlc_meta_t         *p_meta;
2505     vlc_bool_t b_event_active = VLC_FALSE;
2506
2507     msg_Dbg( p_demux, "EITCallBack called" );
2508     if( !p_eit->b_current_next )
2509     {
2510         dvbpsi_DeleteEIT( p_eit );
2511         return;
2512     }
2513
2514     msg_Dbg( p_demux, "new EIT service_id=%d version=%d current_next=%d "
2515              "ts_id=%d network_id=%d segment_last_section_number=%d "
2516              "last_table_id=%d",
2517              p_eit->i_service_id, p_eit->i_version, p_eit->b_current_next,
2518              p_eit->i_ts_id, p_eit->i_network_id,
2519              p_eit->i_segment_last_section_number, p_eit->i_last_table_id );
2520
2521     p_meta = vlc_meta_New();
2522     for( p_evt = p_eit->p_first_event; p_evt; p_evt = p_evt->p_next )
2523     {
2524         dvbpsi_descriptor_t *p_dr;
2525         char                *psz_cat = malloc( strlen("Event")+10 );
2526         char                psz_start[15];
2527         char                psz_duration[15];
2528         char                psz_name[256];
2529         char                psz_text[256];
2530         char                *psz_extra = strdup("");
2531         char                *psz_value;
2532
2533         sprintf( psz_cat, "Event %d", p_evt->i_event_id );
2534         sprintf( psz_start, "%d%d:%d%d:%d%d",
2535                  (int)(p_evt->i_start_time >> 20)&0xf,
2536                  (int)(p_evt->i_start_time >> 16)&0xf,
2537                  (int)(p_evt->i_start_time >> 12)&0xf,
2538                  (int)(p_evt->i_start_time >>  8)&0xf,
2539                  (int)(p_evt->i_start_time >>  4)&0xf,
2540                  (int)(p_evt->i_start_time      )&0xf );
2541         sprintf( psz_duration, "%d%d:%d%d:%d%d",
2542                  (p_evt->i_duration >> 20)&0xf, (p_evt->i_duration >> 16)&0xf,
2543                  (p_evt->i_duration >> 12)&0xf, (p_evt->i_duration >>  8)&0xf,
2544                  (p_evt->i_duration >>  4)&0xf, (p_evt->i_duration      )&0xf );
2545         psz_name[0] = psz_text[0] = '\0';
2546
2547         msg_Dbg( p_demux, "  * event id=%d start_time:mjd=%d %s duration=%s "
2548                           "running=%d free_ca=%d",
2549                  p_evt->i_event_id,
2550                  (int)(p_evt->i_start_time >> 24),
2551                  psz_start, psz_duration,
2552                  p_evt->i_running_status, p_evt->b_free_ca );
2553
2554         for( p_dr = p_evt->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
2555         {
2556             if( p_dr->i_tag == 0x4d )
2557             {
2558                 dvbpsi_short_event_dr_t *pE = dvbpsi_DecodeShortEventDr( p_dr );
2559
2560                 if( pE )
2561                 {
2562                     memcpy( psz_name, pE->i_event_name, pE->i_event_name_length);
2563                     psz_name[pE->i_event_name_length] = '\0';
2564                     memcpy( psz_text, pE->i_text, pE->i_text_length );
2565                     psz_text[pE->i_text_length] = '\0';
2566
2567                     EITEventFixString((unsigned char *)&psz_name);
2568                     EITEventFixString((unsigned char *)&psz_text);
2569                     msg_Dbg( p_demux, "    - short event lang=%3.3s '%s' : '%s'",
2570                              pE->i_iso_639_code, psz_name, psz_text );
2571                 }
2572             }
2573             else if( p_dr->i_tag == 0x4e )
2574             {
2575                 dvbpsi_extended_event_dr_t *pE = dvbpsi_DecodeExtendedEventDr( p_dr );
2576                 char str1[257];
2577                 char str2[257];
2578
2579                 if( pE )
2580                 {
2581                     int i;
2582                     msg_Dbg( p_demux, "    - extended event lang=%3.3s",
2583                              pE->i_iso_639_code );
2584                     for( i = 0; i < pE->i_entry_count; i++ )
2585                     {
2586                         memcpy( str1, pE->i_item_description[i],
2587                                 pE->i_item_description_length[i] );
2588                         str1[pE->i_item_description_length[i]] = '\0';
2589                         EITEventFixString((unsigned char *)&str1);
2590
2591                         memcpy( str2, pE->i_item[i],
2592                                 pE->i_item_length[i] );
2593                         str2[pE->i_item_length[i]] = '\0';
2594                         EITEventFixString((unsigned char *)&str2);
2595
2596                         msg_Dbg( p_demux, "       - desc='%s' item='%s'", str1, str2 );
2597                         psz_extra = realloc( psz_extra,
2598                                     strlen(psz_extra) +
2599                                     strlen(str1) +strlen(str2) + 1 + 3 );
2600                         strcat( psz_extra, str1 );
2601                         strcat( psz_extra, "(" );
2602                         strcat( psz_extra, str2 );
2603                         strcat( psz_extra, ") " );
2604                     }
2605
2606                     memcpy( str1, pE->i_text, pE->i_text_length );
2607                     str1[pE->i_text_length] = '\0';
2608                     EITEventFixString((unsigned char *)&str1);
2609
2610                     msg_Dbg( p_demux, "       - text='%s'", str1 );
2611                     psz_extra = realloc( psz_extra,
2612                                          strlen(psz_extra) + strlen(str1) + 2 );
2613                     strcat( psz_extra, str1 );
2614                     strcat( psz_extra, " " );
2615                 }
2616             }
2617             else
2618             {
2619                 msg_Dbg( p_demux, "    - tag=0x%x(%d)", p_dr->i_tag, p_dr->i_tag );
2620             }
2621         }
2622
2623         asprintf( &psz_value, "%s: %s (+%s) %s (%s)",
2624                   psz_start,
2625                   psz_name,
2626                   psz_duration,
2627                   psz_text, psz_extra );
2628         vlc_meta_Add( p_meta, psz_cat, psz_value );
2629         free( psz_value );
2630
2631         if( p_evt->i_running_status == 0x04 )
2632         {
2633             vlc_meta_SetNowPlaying( p_meta, psz_name );
2634             b_event_active = VLC_TRUE;
2635         }
2636
2637         free( psz_cat );
2638         free( psz_extra );
2639     }
2640
2641     if( !b_event_active )
2642         vlc_meta_SetNowPlaying( p_meta, "" );
2643     es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META,
2644                     p_eit->i_service_id, p_meta );
2645     vlc_meta_Delete( p_meta );
2646
2647     dvbpsi_DeleteEIT( p_eit );
2648 }
2649
2650 static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h,
2651                                  uint8_t  i_table_id, uint16_t i_extension )
2652 {
2653 #if 0
2654     msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
2655              i_table_id, i_table_id, i_extension, i_extension );
2656 #endif
2657     if( p_demux->p_sys->pid[0].psi->i_pat_version == -1 )
2658         return;
2659
2660     if( i_table_id == 0x42 )
2661     {
2662         msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
2663                  i_table_id, i_table_id, i_extension, i_extension );
2664
2665         dvbpsi_AttachSDT( h, i_table_id, i_extension,
2666                           (dvbpsi_sdt_callback)SDTCallBack, p_demux );
2667     }
2668     else if( i_table_id == 0x4e || /* Current/Following */
2669              ( i_table_id >= 0x50 && i_table_id <= 0x5f ) ) /* Schedule */
2670     {
2671         msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
2672                  i_table_id, i_table_id, i_extension, i_extension );
2673
2674         dvbpsi_AttachEIT( h, i_table_id, i_extension,
2675                           (dvbpsi_eit_callback)EITCallBack, p_demux );
2676     }
2677 }
2678 #endif
2679
2680 static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
2681 {
2682     demux_sys_t          *p_sys = p_demux->p_sys;
2683     dvbpsi_descriptor_t  *p_dr;
2684     dvbpsi_pmt_es_t      *p_es;
2685
2686     ts_pid_t             *pmt = NULL;
2687     ts_prg_psi_t         *prg = NULL;
2688
2689     ts_pid_t             **pp_clean = NULL;
2690     int                  i_clean = 0, i;
2691
2692     msg_Dbg( p_demux, "PMTCallBack called" );
2693
2694     /* First find this PMT declared in PAT */
2695     for( i = 0; i < p_sys->i_pmt; i++ )
2696     {
2697         int i_prg;
2698         for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
2699         {
2700             if( p_sys->pmt[i]->psi->prg[i_prg]->i_number ==
2701                 p_pmt->i_program_number )
2702             {
2703                 pmt = p_sys->pmt[i];
2704                 prg = p_sys->pmt[i]->psi->prg[i_prg];
2705                 break;
2706             }
2707         }
2708         if( pmt ) break;
2709     }
2710
2711     if( pmt == NULL )
2712     {
2713         msg_Warn( p_demux, "unreferenced program (broken stream)" );
2714         dvbpsi_DeletePMT(p_pmt);
2715         return;
2716     }
2717
2718     if( prg->i_version != -1 &&
2719         ( !p_pmt->b_current_next || prg->i_version == p_pmt->i_version ) )
2720     {
2721         dvbpsi_DeletePMT( p_pmt );
2722         return;
2723     }
2724
2725     /* Clean this program (remove all es) */
2726     for( i = 0; i < 8192; i++ )
2727     {
2728         ts_pid_t *pid = &p_sys->pid[i];
2729
2730         if( pid->b_valid && pid->p_owner == pmt->psi &&
2731             pid->i_owner_number == prg->i_number && pid->psi == NULL )
2732         {
2733             TAB_APPEND( i_clean, pp_clean, pid );
2734         }
2735     }
2736     if( prg->iod )
2737     {
2738         IODFree( prg->iod );
2739         prg->iod = NULL;
2740     }
2741
2742     msg_Dbg( p_demux, "new PMT program number=%d version=%d pid_pcr=%d",
2743              p_pmt->i_program_number, p_pmt->i_version, p_pmt->i_pcr_pid );
2744     prg->i_pid_pcr = p_pmt->i_pcr_pid;
2745     prg->i_version = p_pmt->i_version;
2746
2747     if( DVBProgramIsSelected( p_demux, prg->i_number ) )
2748     {
2749         /* Set demux filter */
2750         stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
2751                         ACCESS_SET_PRIVATE_ID_STATE, prg->i_pid_pcr,
2752                         VLC_TRUE );
2753     }
2754     else if ( p_sys->b_dvb_control )
2755     {
2756         msg_Warn( p_demux, "skipping program (not selected)" );
2757         dvbpsi_DeletePMT(p_pmt);
2758         return;
2759     }
2760
2761     /* Parse descriptor */
2762     for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next )
2763     {
2764         if( p_dr->i_tag == 0x1d )
2765         {
2766             /* We have found an IOD descriptor */
2767             msg_Dbg( p_demux, " * descriptor : IOD (0x1d)" );
2768
2769             prg->iod = IODNew( p_dr->i_length, p_dr->p_data );
2770         }
2771         else if( p_dr->i_tag == 0x9 )
2772         {
2773             uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8)
2774                                 | p_dr->p_data[1];
2775             msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", i_sysid );
2776         }
2777         else
2778         {
2779             msg_Dbg( p_demux, " * descriptor : unknown (0x%x)", p_dr->i_tag );
2780         }
2781     }
2782
2783     for( p_es = p_pmt->p_first_es; p_es != NULL; p_es = p_es->p_next )
2784     {
2785         ts_pid_t tmp_pid, *old_pid = 0, *pid = &tmp_pid;
2786
2787         /* Find out if the PID was already declared */
2788         for( i = 0; i < i_clean; i++ )
2789         {
2790             if( pp_clean[i] == &p_sys->pid[p_es->i_pid] )
2791             {
2792                 old_pid = pp_clean[i];
2793                 break;
2794             }
2795         }
2796
2797         if( !old_pid && p_sys->pid[p_es->i_pid].b_valid )
2798         {
2799             ts_pid_t *pid = &p_sys->pid[p_es->i_pid];
2800             if( ( pid->i_pid == 0x11 /* SDT */ ||
2801                   pid->i_pid == 0x12 /* EDT */ ) && pid->psi )
2802             {
2803                 /* This doesn't look like a DVB stream so don't try
2804                  * parsing the SDT/EDT */
2805                 dvbpsi_DetachDemux( pid->psi->handle );
2806                 free( pid->psi );
2807                 pid->psi = 0;
2808             }
2809             else
2810             {
2811                 msg_Warn( p_demux, "pmt error: pid=%d already defined",
2812                           p_es->i_pid );
2813                 continue;
2814             }
2815         }
2816
2817         PIDInit( pid, VLC_FALSE, pmt->psi );
2818         PIDFillFormat( pid, p_es->i_type );
2819         pid->i_owner_number = prg->i_number;
2820         pid->i_pid          = p_es->i_pid;
2821         pid->b_seen         = p_sys->pid[p_es->i_pid].b_seen;
2822
2823         if( p_es->i_type == 0x10 || p_es->i_type == 0x11 ||
2824             p_es->i_type == 0x12 )
2825         {
2826             /* MPEG-4 stream: search SL_DESCRIPTOR */
2827             dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;;
2828
2829             while( p_dr && ( p_dr->i_tag != 0x1f ) ) p_dr = p_dr->p_next;
2830
2831             if( p_dr && p_dr->i_length == 2 )
2832             {
2833                 int i_es_id = ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1];
2834
2835                 msg_Warn( p_demux, "found SL_descriptor es_id=%d", i_es_id );
2836
2837                 pid->es->p_mpeg4desc = NULL;
2838
2839                 for( i = 0; i < 255; i++ )
2840                 {
2841                     iod_descriptor_t *iod = prg->iod;
2842
2843                     if( iod->es_descr[i].b_ok &&
2844                         iod->es_descr[i].i_es_id == i_es_id )
2845                     {
2846                         pid->es->p_mpeg4desc = &iod->es_descr[i];
2847                         break;
2848                     }
2849                 }
2850             }
2851
2852             if( pid->es->p_mpeg4desc != NULL )
2853             {
2854                 decoder_config_descriptor_t *dcd =
2855                     &pid->es->p_mpeg4desc->dec_descr;
2856
2857                 if( dcd->i_streamType == 0x04 )    /* VisualStream */
2858                 {
2859                     pid->es->fmt.i_cat = VIDEO_ES;
2860                     switch( dcd->i_objectTypeIndication )
2861                     {
2862                     case 0x0B: /* mpeg4 sub */
2863                         pid->es->fmt.i_cat = SPU_ES;
2864                         pid->es->fmt.i_codec = VLC_FOURCC('s','u','b','t');
2865                         break;
2866
2867                     case 0x20: /* mpeg4 */
2868                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','v');
2869                         break;
2870                     case 0x21: /* h264 */
2871                         pid->es->fmt.i_codec = VLC_FOURCC('h','2','6','4');
2872                         break;
2873                     case 0x60:
2874                     case 0x61:
2875                     case 0x62:
2876                     case 0x63:
2877                     case 0x64:
2878                     case 0x65: /* mpeg2 */
2879                         pid->es->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
2880                         break;
2881                     case 0x6a: /* mpeg1 */
2882                         pid->es->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
2883                         break;
2884                     case 0x6c: /* mpeg1 */
2885                         pid->es->fmt.i_codec = VLC_FOURCC( 'j','p','e','g' );
2886                         break;
2887                     default:
2888                         pid->es->fmt.i_cat = UNKNOWN_ES;
2889                         break;
2890                     }
2891                 }
2892                 else if( dcd->i_streamType == 0x05 )    /* AudioStream */
2893                 {
2894                     pid->es->fmt.i_cat = AUDIO_ES;
2895                     switch( dcd->i_objectTypeIndication )
2896                     {
2897                     case 0x40: /* mpeg4 */
2898                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','a');
2899                         break;
2900                     case 0x66:
2901                     case 0x67:
2902                     case 0x68: /* mpeg2 aac */
2903                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','a');
2904                         break;
2905                     case 0x69: /* mpeg2 */
2906                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','g','a');
2907                         break;
2908                     case 0x6b: /* mpeg1 */
2909                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','g','a');
2910                         break;
2911                     default:
2912                         pid->es->fmt.i_cat = UNKNOWN_ES;
2913                         break;
2914                     }
2915                 }
2916                 else
2917                 {
2918                     pid->es->fmt.i_cat = UNKNOWN_ES;
2919                 }
2920
2921                 if( pid->es->fmt.i_cat != UNKNOWN_ES )
2922                 {
2923                     pid->es->fmt.i_extra = dcd->i_decoder_specific_info_len;
2924                     if( pid->es->fmt.i_extra > 0 )
2925                     {
2926                         pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra );
2927                         memcpy( pid->es->fmt.p_extra,
2928                                 dcd->p_decoder_specific_info,
2929                                 pid->es->fmt.i_extra );
2930                     }
2931                 }
2932             }
2933         }
2934         else if( p_es->i_type == 0x06 )
2935         {
2936             dvbpsi_descriptor_t *p_dr;
2937
2938             for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
2939                  p_dr = p_dr->p_next )
2940             {
2941                 msg_Dbg( p_demux, "  * es pid=%d type=%d dr->i_tag=0x%x",
2942                          p_es->i_pid, p_es->i_type, p_dr->i_tag );
2943
2944                 if( p_dr->i_tag == 0x05 )
2945                 {
2946                     /* Registration Descriptor */
2947                     if( p_dr->i_length != 4 )
2948                     {
2949                         msg_Warn( p_demux, "invalid Registration Descriptor" );
2950                     }
2951                     else
2952                     {
2953                         if( !memcmp( p_dr->p_data, "AC-3", 4 ) )
2954                         {
2955                             /* ATSC with stream_type 0x81 (but this descriptor
2956                              * is then not mandatory */
2957                             pid->es->fmt.i_cat = AUDIO_ES;
2958                             pid->es->fmt.i_codec = VLC_FOURCC('a','5','2',' ');
2959                         }
2960                         else if( !memcmp( p_dr->p_data, "DTS1", 4 ) ||
2961                                  !memcmp( p_dr->p_data, "DTS2", 4 ) ||
2962                                  !memcmp( p_dr->p_data, "DTS3", 4 ) )
2963                         {
2964                            /*registration descriptor(ETSI TS 101 154 Annex F)*/
2965                             pid->es->fmt.i_cat = AUDIO_ES;
2966                             pid->es->fmt.i_codec = VLC_FOURCC('d','t','s',' ');
2967                         }
2968                         else if( !memcmp( p_dr->p_data, "BSSD", 4 ) )
2969                         {
2970                             pid->es->fmt.i_cat = AUDIO_ES;
2971                             pid->es->fmt.i_codec = VLC_FOURCC('l','p','c','m');
2972                         }
2973                         else
2974                         {
2975                             msg_Warn( p_demux,
2976                                       "unknown Registration Descriptor (%4.4s)",
2977                                       p_dr->p_data );
2978                         }
2979                     }
2980
2981                 }
2982                 else if( p_dr->i_tag == 0x6a )
2983                 {
2984                     /* DVB with stream_type 0x06 */
2985                     pid->es->fmt.i_cat = AUDIO_ES;
2986                     pid->es->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
2987                 }
2988                 else if( p_dr->i_tag == 0x73 )
2989                 {
2990                     /* DTS audio descriptor (ETSI TS 101 154 Annex F) */
2991                     msg_Dbg( p_demux, "    * DTS audio descriptor not decoded" );
2992                     pid->es->fmt.i_cat = AUDIO_ES;
2993                     pid->es->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
2994                 }
2995                 else if( p_dr->i_tag == 0x45 )
2996                 {
2997                     msg_Dbg( p_demux, "    * VBI Data descriptor" );
2998                     /* FIXME : store the information somewhere */
2999                 }
3000                 else if( p_dr->i_tag == 0x46 )
3001                 {
3002                     msg_Dbg( p_demux, "    * VBI Teletext descriptor" );
3003                     /* FIXME : store the information somewhere */
3004                 }
3005 #ifdef _DVBPSI_DR_52_H_
3006                 else if( p_dr->i_tag == 0x52 )
3007                 {
3008                     dvbpsi_stream_identifier_dr_t *si;
3009                     si = dvbpsi_DecodeStreamIdentifierDr( p_dr );
3010
3011                     msg_Dbg( p_demux, "    * Stream Component Identifier: %d", si->i_component_tag );
3012                 }
3013 #endif
3014                 else if( p_dr->i_tag == 0x56 )
3015                 {
3016                     msg_Dbg( p_demux, "    * EBU Teletext descriptor" );
3017                     pid->es->fmt.i_cat = SPU_ES;
3018                     pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' );
3019                     pid->es->fmt.i_extra = p_dr->i_length;
3020                     pid->es->fmt.p_extra = malloc( p_dr->i_length );
3021                     memcpy( pid->es->fmt.p_extra, p_dr->p_data,
3022                             p_dr->i_length );
3023
3024 #if defined _DVBPSI_DR_56_H_ && defined DVBPSI_VERSION \
3025                     && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5)
3026                     pid->es->fmt.i_group = p_pmt->i_program_number;
3027
3028                     /* If i_dvb_program == -1 it means the user specified
3029                      * --sout-all or --programs, so she want to stream, and
3030                      * she doesn't want to stream several identical ESes
3031                      * with different language descriptors. So for -1 we
3032                      * just enable descriptor pass-through. --Meuuh */
3033                     if( p_sys->i_dvb_program != -1 )
3034                     {
3035                         uint16_t n, i = 0;
3036                         dvbpsi_teletext_dr_t *sub;
3037
3038                         sub = dvbpsi_DecodeTeletextDr( p_dr );
3039                         if( !sub ) continue;
3040
3041                         /* Each subtitle ES contains n languages,
3042                          * We are going to create n ES for the n tracks */
3043                         for( n = 0; n < sub->i_pages_number; n++ )
3044                         {
3045                             dvbpsi_teletextpage_t *p_page = &sub->p_pages[n];
3046                             if( p_page->i_teletext_type == 0x2
3047                                  || p_page->i_teletext_type == 0x5 )
3048                             {
3049                                 ts_es_t *p_es;
3050
3051                                 if( i == 0 )
3052                                 {
3053                                     p_es = pid->es;
3054                                 }
3055                                 else
3056                                 {
3057                                     p_es = malloc( sizeof( ts_es_t ) );
3058                                     p_es->fmt = pid->es->fmt;
3059                                     p_es->id = NULL;
3060                                     p_es->p_pes = NULL;
3061                                     p_es->i_pes_size = 0;
3062                                     p_es->i_pes_gathered = 0;
3063                                     p_es->pp_last = &p_es->p_pes;
3064                                     p_es->p_mpeg4desc = NULL;
3065
3066                                     TAB_APPEND( pid->i_extra_es, pid->extra_es,
3067                                                 p_es );
3068                                 }
3069
3070                                 p_es->fmt.psz_language = malloc( 4 );
3071                                 memcpy( p_es->fmt.psz_language,
3072                                         p_page->i_iso6392_language_code, 3 );
3073                                 p_es->fmt.psz_language[3] = 0;
3074
3075                                 switch( p_page->i_teletext_type )
3076                                 {
3077                                 case 0x2:
3078                                     p_es->fmt.psz_description =
3079                                         strdup(_("subtitles"));
3080                                     msg_Dbg( p_demux,
3081                                              "    * sub lan=%s page=%d%x",
3082                                              p_es->fmt.psz_language,
3083                                              p_page->i_teletext_magazine_number,
3084                                              p_page->i_teletext_page_number );
3085                                     break;
3086
3087                                 case 0x5:
3088                                     p_es->fmt.psz_description =
3089                                         strdup(_("hearing impaired"));
3090                                     msg_Dbg( p_demux,
3091                                              "    * hearing impaired lan=%s page=%d%x",
3092                                              p_es->fmt.psz_language,
3093                                              p_page->i_teletext_magazine_number,
3094                                              p_page->i_teletext_page_number );
3095                                     break;
3096                                 default:
3097                                     break;
3098                                 }
3099
3100                                 p_es->fmt.subs.dvb.i_id =
3101                                     p_page->i_teletext_page_number;
3102                                 /* Hack, FIXME */
3103                                 p_es->fmt.subs.dvb.i_id |=
3104                                 ((int)p_page->i_teletext_magazine_number << 16);
3105
3106                                 i++;
3107                             }
3108                         }
3109
3110                         if( !i )
3111                             pid->es->fmt.i_cat = UNKNOWN_ES;
3112                     }
3113 #else
3114                     pid->es->fmt.subs.dvb.i_id = -1;
3115                     pid->es->fmt.psz_description = strdup( "Teletext" );
3116 #endif  /* defined _DVBPSI_DR_56_H_  && DVBPSI_VERSION(0,1,6) */
3117                 }
3118                 else if( p_dr->i_tag == 0x59 )
3119                 {
3120                     /* DVB subtitles */
3121                     pid->es->fmt.i_cat = SPU_ES;
3122                     pid->es->fmt.i_codec = VLC_FOURCC( 'd', 'v', 'b', 's' );
3123                     pid->es->fmt.i_extra = p_dr->i_length;
3124                     pid->es->fmt.p_extra = malloc( p_dr->i_length );
3125                     memcpy( pid->es->fmt.p_extra, p_dr->p_data,
3126                             p_dr->i_length );
3127
3128 #ifdef _DVBPSI_DR_59_H_
3129                     pid->es->fmt.i_group = p_pmt->i_program_number;
3130
3131                     /* If i_dvb_program == -1 it means the user specified
3132                      * --sout-all or --programs, so she want to stream, and
3133                      * she doesn't want to stream several identical ESes
3134                      * with different language descriptors. So for -1 we
3135                      * just enable descriptor pass-through. --Meuuh */
3136                     if( p_sys->i_dvb_program != -1 )
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 #endif /* _DVBPSI_DR_59_H_ */
3224                 }
3225             }
3226         }
3227         else if( p_es->i_type == 0xa0 )
3228         {
3229             /* MSCODEC sent by vlc */
3230             dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
3231
3232             while( p_dr && ( p_dr->i_tag != 0xa0 ) ) p_dr = p_dr->p_next;
3233
3234             if( p_dr && p_dr->i_length >= 8 )
3235             {
3236                 pid->es->fmt.i_cat = VIDEO_ES;
3237                 pid->es->fmt.i_codec =
3238                     VLC_FOURCC( p_dr->p_data[0], p_dr->p_data[1],
3239                                 p_dr->p_data[2], p_dr->p_data[3] );
3240                 pid->es->fmt.video.i_width =
3241                     ( p_dr->p_data[4] << 8 ) | p_dr->p_data[5];
3242                 pid->es->fmt.video.i_height =
3243                     ( p_dr->p_data[6] << 8 ) | p_dr->p_data[7];
3244                 pid->es->fmt.i_extra =
3245                     (p_dr->p_data[8] << 8) | p_dr->p_data[9];
3246
3247                 if( pid->es->fmt.i_extra > 0 )
3248                 {
3249                     pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra );
3250                     memcpy( pid->es->fmt.p_extra, &p_dr->p_data[10],
3251                             pid->es->fmt.i_extra );
3252                 }
3253             }
3254             else
3255             {
3256                 msg_Warn( p_demux, "private MSCODEC (vlc) without bih private "
3257                           "descriptor" );
3258             }
3259             /* For such stream we will gather them ourself and don't launch a
3260              * packetizer.
3261              * Yes it's ugly but it's the only way to have DIV3 working */
3262             pid->es->fmt.b_packetized = VLC_TRUE;
3263         }
3264
3265         if( pid->es->fmt.i_cat == AUDIO_ES ||
3266             ( pid->es->fmt.i_cat == SPU_ES &&
3267               pid->es->fmt.i_codec != VLC_FOURCC('d','v','b','s') &&
3268               pid->es->fmt.i_codec != VLC_FOURCC('t','e','l','x') ) )
3269         {
3270             /* get language descriptor */
3271             dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
3272             while( p_dr && ( p_dr->i_tag != 0x0a ) ) p_dr = p_dr->p_next;
3273
3274             if( p_dr )
3275             {
3276                 dvbpsi_iso639_dr_t *p_decoded = dvbpsi_DecodeISO639Dr( p_dr );
3277
3278                 if( p_decoded )
3279                 {
3280 #if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2)
3281                     pid->es->fmt.psz_language = malloc( 4 );
3282                     memcpy( pid->es->fmt.psz_language,
3283                             p_decoded->code[0].iso_639_code, 3 );
3284                     pid->es->fmt.psz_language[3] = 0;
3285                     msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language);
3286                     switch( p_decoded->code[0].i_audio_type ) {
3287                     case 0:
3288                         pid->es->fmt.psz_description = NULL;
3289                         break;
3290                     case 1:
3291                         pid->es->fmt.psz_description =
3292                             strdup(_("clean effects"));
3293                         break;
3294                     case 2:
3295                         pid->es->fmt.psz_description =
3296                             strdup(_("hearing impaired"));
3297                         break;
3298                     case 3:
3299                         pid->es->fmt.psz_description =
3300                             strdup(_("visual impaired commentary"));
3301                         break;
3302                     default:
3303                         msg_Dbg( p_demux, "unknown audio type: %d",
3304                                  p_decoded->code[0].i_audio_type);
3305                         pid->es->fmt.psz_description = NULL;
3306                         break;
3307                     }
3308                     pid->es->fmt.i_extra_languages = p_decoded->i_code_count-1;
3309                     pid->es->fmt.p_extra_languages =
3310                         malloc( sizeof(*pid->es->fmt.p_extra_languages) *
3311                                 pid->es->fmt.i_extra_languages );
3312                     for( i = 0; i < pid->es->fmt.i_extra_languages; i++ ) {
3313                         msg_Dbg( p_demux, "bang" );
3314                         pid->es->fmt.p_extra_languages[i].psz_language =
3315                             malloc(4);
3316                         memcpy(pid->es->fmt.p_extra_languages[i].psz_language,
3317                                p_decoded->code[i+1].iso_639_code, 3 );
3318                         pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0';
3319                         switch( p_decoded->code[i].i_audio_type ) {
3320                         case 0:
3321                             pid->es->fmt.p_extra_languages[i].psz_description =
3322                                 NULL;
3323                             break;
3324                         case 1:
3325                             pid->es->fmt.p_extra_languages[i].psz_description =
3326                                 strdup(_("clean effects"));
3327                             break;
3328                         case 2:
3329                             pid->es->fmt.p_extra_languages[i].psz_description =
3330                                 strdup(_("hearing impaired"));
3331                             break;
3332                         case 3:
3333                             pid->es->fmt.p_extra_languages[i].psz_description =
3334                                 strdup(_("visual impaired commentary"));
3335                             break;
3336                         default:
3337                             msg_Dbg( p_demux, "unknown audio type: %d",
3338                                      p_decoded->code[i].i_audio_type);
3339                             pid->es->fmt.psz_description = NULL;
3340                             break;
3341                         }
3342
3343                     }
3344 #else
3345                     pid->es->fmt.psz_language = malloc( 4 );
3346                     memcpy( pid->es->fmt.psz_language,
3347                             p_decoded->i_iso_639_code, 3 );
3348                     pid->es->fmt.psz_language[3] = 0;
3349 #endif
3350                 }
3351             }
3352         }
3353
3354         pid->es->fmt.i_group = p_pmt->i_program_number;
3355         if( pid->es->fmt.i_cat == UNKNOWN_ES )
3356         {
3357             msg_Dbg( p_demux, "  * es pid=%d type=%d *unknown*",
3358                      p_es->i_pid, p_es->i_type );
3359         }
3360         else if( !p_sys->b_udp_out )
3361         {
3362             msg_Dbg( p_demux, "  * es pid=%d type=%d fcc=%4.4s",
3363                      p_es->i_pid, p_es->i_type, (char*)&pid->es->fmt.i_codec );
3364
3365             if( p_sys->b_es_id_pid ) pid->es->fmt.i_id = p_es->i_pid;
3366
3367             /* Check if we can avoid restarting the ES */
3368             if( old_pid &&
3369                 pid->es->fmt.i_codec == old_pid->es->fmt.i_codec &&
3370                 pid->es->fmt.i_extra == old_pid->es->fmt.i_extra &&
3371                 pid->es->fmt.i_extra == 0 &&
3372                 pid->i_extra_es == old_pid->i_extra_es &&
3373                 ( ( !pid->es->fmt.psz_language &&
3374                     !old_pid->es->fmt.psz_language ) ||
3375                   ( pid->es->fmt.psz_language &&
3376                     old_pid->es->fmt.psz_language &&
3377                     !strcmp( pid->es->fmt.psz_language,
3378                              old_pid->es->fmt.psz_language ) ) ) )
3379             {
3380                 pid->es->id = old_pid->es->id;
3381                 old_pid->es->id = NULL;
3382                 for( i = 0; i < pid->i_extra_es; i++ )
3383                 {
3384                     pid->extra_es[i]->id = old_pid->extra_es[i]->id;
3385                     old_pid->extra_es[i]->id = NULL;
3386                 }
3387             }
3388             else
3389             {
3390                 if( old_pid )
3391                 {
3392                     PIDClean( p_demux->out, old_pid );
3393                     TAB_REMOVE( i_clean, pp_clean, old_pid );
3394                     old_pid = 0;
3395                 }
3396
3397                 pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt );
3398                 for( i = 0; i < pid->i_extra_es; i++ )
3399                 {
3400                     pid->extra_es[i]->id =
3401                         es_out_Add( p_demux->out, &pid->extra_es[i]->fmt );
3402                 }
3403             }
3404         }
3405
3406         /* Add ES to the list */
3407         if( old_pid )
3408         {
3409             PIDClean( p_demux->out, old_pid );
3410             TAB_REMOVE( i_clean, pp_clean, old_pid );
3411         }
3412         p_sys->pid[p_es->i_pid] = *pid;
3413
3414         for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
3415              p_dr = p_dr->p_next )
3416         {
3417             if( p_dr->i_tag == 0x9 )
3418             {
3419                 uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8)
3420                                     | p_dr->p_data[1];
3421                 msg_Dbg( p_demux, "   * descriptor : CA (0x9) SysID 0x%x",
3422                          i_sysid );
3423             }
3424         }
3425
3426         if( DVBProgramIsSelected( p_demux, prg->i_number )
3427              && (pid->es->id != NULL || p_sys->b_udp_out) )
3428         {
3429             /* Set demux filter */
3430             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3431                             ACCESS_SET_PRIVATE_ID_STATE, p_es->i_pid,
3432                             VLC_TRUE );
3433         }
3434     }
3435
3436     if( DVBProgramIsSelected( p_demux, prg->i_number ) )
3437     {
3438         /* Set CAM descrambling */
3439         stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3440                         ACCESS_SET_PRIVATE_ID_CA, p_pmt );
3441     }
3442     else
3443     {
3444         dvbpsi_DeletePMT( p_pmt );
3445     }
3446
3447     for ( i = 0; i < i_clean; i++ )
3448     {
3449         if( DVBProgramIsSelected( p_demux, prg->i_number ) )
3450         {
3451             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3452                             ACCESS_SET_PRIVATE_ID_STATE, pp_clean[i]->i_pid,
3453                             VLC_FALSE );
3454         }
3455
3456         PIDClean( p_demux->out, pp_clean[i] );
3457     }
3458     if( i_clean ) free( pp_clean );
3459 }
3460
3461 static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
3462 {
3463     demux_sys_t          *p_sys = p_demux->p_sys;
3464     dvbpsi_pat_program_t *p_program;
3465     ts_pid_t             *pat = &p_sys->pid[0];
3466     int                  i, j;
3467
3468     msg_Dbg( p_demux, "PATCallBack called" );
3469
3470     if( pat->psi->i_pat_version != -1 &&
3471         ( !p_pat->b_current_next ||
3472           p_pat->i_version == pat->psi->i_pat_version ) )
3473     {
3474         dvbpsi_DeletePAT( p_pat );
3475         return;
3476     }
3477
3478     msg_Dbg( p_demux, "new PAT ts_id=%d version=%d current_next=%d",
3479              p_pat->i_ts_id, p_pat->i_version, p_pat->b_current_next );
3480
3481     /* Clean old */
3482     if( p_sys->i_pmt > 0 )
3483     {
3484         int      i_pmt_rm = 0;
3485         ts_pid_t **pmt_rm = NULL;
3486
3487         /* Search pmt to be deleted */
3488         for( i = 0; i < p_sys->i_pmt; i++ )
3489         {
3490             ts_pid_t *pmt = p_sys->pmt[i];
3491             vlc_bool_t b_keep = VLC_FALSE;
3492
3493             for( p_program = p_pat->p_first_program; p_program != NULL;
3494                  p_program = p_program->p_next )
3495             {
3496                 if( p_program->i_pid == pmt->i_pid )
3497                 {
3498                     int i_prg;
3499                     for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
3500                     {
3501                         if( p_program->i_number ==
3502                             pmt->psi->prg[i_prg]->i_number )
3503                         {
3504                             b_keep = VLC_TRUE;
3505                             break;
3506                         }
3507                     }
3508                     if( b_keep ) break;
3509                 }
3510             }
3511
3512             if( !b_keep )
3513             {
3514                 TAB_APPEND( i_pmt_rm, pmt_rm, pmt );
3515             }
3516         }
3517
3518         /* Delete all ES attached to thoses PMT */
3519         for( i = 2; i < 8192; i++ )
3520         {
3521             ts_pid_t *pid = &p_sys->pid[i];
3522
3523             if( !pid->b_valid || pid->psi ) continue;
3524
3525             for( j = 0; j < i_pmt_rm; j++ )
3526             {
3527                 int i_prg;
3528                 for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
3529                 {
3530                     /* We only remove es that aren't defined by extra pmt */
3531                     if( pid->p_owner->prg[i_prg]->i_pid_pmt !=
3532                         pmt_rm[j]->i_pid ) continue;
3533
3534                     if( p_sys->b_dvb_control && pid->es->id )
3535                     {
3536                         if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3537                                             ACCESS_SET_PRIVATE_ID_STATE, i,
3538                                             VLC_FALSE ) )
3539                             p_sys->b_dvb_control = VLC_FALSE;
3540                     }
3541
3542                     PIDClean( p_demux->out, pid );
3543                     break;
3544                 }
3545
3546                 if( !pid->b_valid ) break;
3547             }
3548         }
3549
3550         /* Delete PMT pid */
3551         for( i = 0; i < i_pmt_rm; i++ )
3552         {
3553             int i_prg;
3554             if( p_sys->b_dvb_control )
3555             {
3556                 if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3557                                     ACCESS_SET_PRIVATE_ID_STATE,
3558                                     pmt_rm[i]->i_pid, VLC_FALSE ) )
3559                     p_sys->b_dvb_control = VLC_FALSE;
3560             }
3561
3562             for( i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ )
3563             {
3564                 const int i_number = pmt_rm[i]->psi->prg[i_prg]->i_number;
3565                 if( i_number != 0 )
3566                     es_out_Control( p_demux->out, ES_OUT_DEL_GROUP, i_number );
3567             }
3568
3569             PIDClean( p_demux->out, &p_sys->pid[pmt_rm[i]->i_pid] );
3570             TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] );
3571         }
3572
3573         if( pmt_rm ) free( pmt_rm );
3574     }
3575
3576     /* now create programs */
3577     for( p_program = p_pat->p_first_program; p_program != NULL;
3578          p_program = p_program->p_next )
3579     {
3580         msg_Dbg( p_demux, "  * number=%d pid=%d", p_program->i_number,
3581                  p_program->i_pid );
3582         if( p_program->i_number != 0 )
3583         {
3584             ts_pid_t *pmt = &p_sys->pid[p_program->i_pid];
3585             vlc_bool_t b_add = VLC_TRUE;
3586
3587             if( pmt->b_valid )
3588             {
3589                 int i_prg;
3590                 for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
3591                 {
3592                     if( pmt->psi->prg[i_prg]->i_number == p_program->i_number )
3593                     {
3594                         b_add = VLC_FALSE;
3595                         break;
3596                     }
3597                 }
3598             }
3599             else
3600             {
3601                 TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt );
3602             }
3603
3604             if( b_add )
3605             {
3606                 PIDInit( pmt, VLC_TRUE, pat->psi );
3607                 pmt->psi->prg[pmt->psi->i_prg-1]->handle =
3608                     dvbpsi_AttachPMT( p_program->i_number,
3609                                       (dvbpsi_pmt_callback)PMTCallBack,
3610                                       p_demux );
3611                 pmt->psi->prg[pmt->psi->i_prg-1]->i_number =
3612                     p_program->i_number;
3613                 pmt->psi->prg[pmt->psi->i_prg-1]->i_pid_pmt =
3614                     p_program->i_pid;
3615
3616                 /* Now select PID at access level */
3617                 if( p_sys->b_dvb_control )
3618                 {
3619                     if( DVBProgramIsSelected( p_demux, p_program->i_number ) )
3620                     {
3621                         if( p_sys->i_dvb_program == 0 )
3622                             p_sys->i_dvb_program = p_program->i_number;
3623
3624                         if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3625                                             ACCESS_SET_PRIVATE_ID_STATE,
3626                                             p_program->i_pid, VLC_TRUE ) )
3627                             p_sys->b_dvb_control = VLC_FALSE;
3628                     }
3629                 }
3630             }
3631         }
3632     }
3633     pat->psi->i_pat_version = p_pat->i_version;
3634
3635     dvbpsi_DeletePAT( p_pat );
3636 }
3637