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 VideoLAN
   5  * $Id$
   6  *
   7  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
   8  *
   9  * This program is free software; you can redistribute it and/or modify
  10  * it under the terms of the GNU General Public License as published by
  11  * the Free Software Foundation; either version 2 of the License, or
  12  * (at your option) any later version.
  13  *
  14  * This program is distributed in the hope that it will be useful,
  15  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  16  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  17  * GNU General Public License for more details.
  18  *
  19  * You should have received a copy of the GNU General Public License
  20  * along with this program; if not, write to the Free Software
  21  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  22  *****************************************************************************/
  23
  24 /*****************************************************************************
  25  * Preamble
  26  *****************************************************************************/
  27 #include <stdlib.h>                                      /* malloc(), free() */
  28
  29 #include <vlc/vlc.h>
  30 #include <vlc/input.h>
  31
  32 #include "iso_lang.h"
  33 #include "network.h"
  34
  35 #include "../mux/mpeg/csa.h"
  36
  37 /* Include dvbpsi headers */
  38 #ifdef HAVE_DVBPSI_DR_H
  39 #   include <dvbpsi/dvbpsi.h>
  40 #   include <dvbpsi/descriptor.h>
  41 #   include <dvbpsi/pat.h>
  42 #   include <dvbpsi/pmt.h>
  43 #   include <dvbpsi/dr.h>
  44 #   include <dvbpsi/psi.h>
  45 #else
  46 #   include "dvbpsi.h"
  47 #   include "descriptor.h"
  48 #   include "tables/pat.h"
  49 #   include "tables/pmt.h"
  50 #   include "descriptors/dr.h"
  51 #   include "psi.h"
  52 #endif
  53
  54 /* TODO:
  55  *  - XXX: do not mark options message to be translated, they are too osbcure for now ...
  56  *  - test it
  57  *  - ...
  58  */
  59
  60 /*****************************************************************************
  61  * Module descriptor
  62  *****************************************************************************/
  63 static int  Open  ( vlc_object_t * );
  64 static void Close ( vlc_object_t * );
  65
  66 #define PMT_TEXT N_("Extra PMT")
  67 #define PMT_LONGTEXT N_( \
  68   "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])" )
  69
  70 #define PID_TEXT N_("Set id of ES to PID")
  71 #define PID_LONGTEXT N_("set id of es to pid")
  72
  73 #define TSOUT_TEXT N_("Fast udp streaming")
  74 #define TSOUT_LONGTEXT N_( \
  75   "Sends TS to specific ip:port by udp (you must know what you are doing)")
  76
  77 #define MTUOUT_TEXT N_("MTU for out mode")
  78 #define MTUOUT_LONGTEXT N_("MTU for out mode")
  79
  80 #define CSA_TEXT N_("CSA ck")
  81 #define CSA_LONGTEXT N_("CSA ck")
  82
  83 #define SILENT_TEXT N_("Silent mode")
  84 #define SILENT_LONGTEXT N_("do not complain on encrypted PES")
  85
  86 #define CAPMT_SYSID_TEXT N_("CAPMT System ID")
  87 #define CAPMT_SYSID_LONGTEXT N_("only forward descriptors from this SysID to the CAM")
  88
  89 vlc_module_begin();
  90     set_description( _("ISO 13818-1 MPEG Transport Stream input - new" ) );
  91     set_shortname ( _("MPEG-TS") );
  92     set_category( CAT_INPUT );
  93     set_subcategory( SUBCAT_INPUT_DEMUX );
  94
  95     add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, VLC_TRUE );
  96     add_bool( "ts-es-id-pid", 0, NULL, PID_TEXT, PID_LONGTEXT, VLC_TRUE );
  97     add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, VLC_TRUE );
  98     add_integer( "ts-out-mtu", 1500, NULL, MTUOUT_TEXT,
  99                  MTUOUT_LONGTEXT, VLC_TRUE );
 100     add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, VLC_TRUE );
 101     add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, VLC_TRUE );
 102     add_integer( "ts-capmt-sysid", 0, NULL, CAPMT_SYSID_TEXT,
 103                  CAPMT_SYSID_LONGTEXT, VLC_TRUE );
 104
 105     set_capability( "demux2", 10 );
 106     set_callbacks( Open, Close );
 107     add_shortcut( "ts" );
 108 vlc_module_end();
 109
 110 /*****************************************************************************
 111  * Local prototypes
 112  *****************************************************************************/
 113
 114 typedef struct
 115 {
 116     uint8_t                 i_objectTypeIndication;
 117     uint8_t                 i_streamType;
 118     vlc_bool_t              b_upStream;
 119     uint32_t                i_bufferSizeDB;
 120     uint32_t                i_maxBitrate;
 121     uint32_t                i_avgBitrate;
 122
 123     int                     i_decoder_specific_info_len;
 124     uint8_t                 *p_decoder_specific_info;
 125
 126 } decoder_config_descriptor_t;
 127
 128 typedef struct
 129 {
 130     vlc_bool_t              b_useAccessUnitStartFlag;
 131     vlc_bool_t              b_useAccessUnitEndFlag;
 132     vlc_bool_t              b_useRandomAccessPointFlag;
 133     vlc_bool_t              b_useRandomAccessUnitsOnlyFlag;
 134     vlc_bool_t              b_usePaddingFlag;
 135     vlc_bool_t              b_useTimeStampsFlags;
 136     vlc_bool_t              b_useIdleFlag;
 137     vlc_bool_t              b_durationFlag;
 138     uint32_t                i_timeStampResolution;
 139     uint32_t                i_OCRResolution;
 140     uint8_t                 i_timeStampLength;
 141     uint8_t                 i_OCRLength;
 142     uint8_t                 i_AU_Length;
 143     uint8_t                 i_instantBitrateLength;
 144     uint8_t                 i_degradationPriorityLength;
 145     uint8_t                 i_AU_seqNumLength;
 146     uint8_t                 i_packetSeqNumLength;
 147
 148     uint32_t                i_timeScale;
 149     uint16_t                i_accessUnitDuration;
 150     uint16_t                i_compositionUnitDuration;
 151
 152     uint64_t                i_startDecodingTimeStamp;
 153     uint64_t                i_startCompositionTimeStamp;
 154
 155 } sl_config_descriptor_t;
 156
 157 typedef struct
 158 {
 159     vlc_bool_t              b_ok;
 160     uint16_t                i_es_id;
 161
 162     vlc_bool_t              b_streamDependenceFlag;
 163     vlc_bool_t              b_OCRStreamFlag;
 164     uint8_t                 i_streamPriority;
 165
 166     char                    *psz_url;
 167
 168     uint16_t                i_dependOn_es_id;
 169     uint16_t                i_OCR_es_id;
 170
 171     decoder_config_descriptor_t    dec_descr;
 172     sl_config_descriptor_t         sl_descr;
 173
 174 } es_mpeg4_descriptor_t;
 175
 176 typedef struct
 177 {
 178     uint8_t                i_iod_label;
 179
 180     /* IOD */
 181     uint16_t                i_od_id;
 182     char                    *psz_url;
 183
 184     uint8_t                 i_ODProfileLevelIndication;
 185     uint8_t                 i_sceneProfileLevelIndication;
 186     uint8_t                 i_audioProfileLevelIndication;
 187     uint8_t                 i_visualProfileLevelIndication;
 188     uint8_t                 i_graphicsProfileLevelIndication;
 189
 190     es_mpeg4_descriptor_t   es_descr[255];
 191
 192 } iod_descriptor_t;
 193
 194 typedef struct
 195 {
 196     dvbpsi_handle   handle;
 197
 198     int             i_version;
 199     int             i_number;
 200     int             i_pid_pcr;
 201     int             i_pid_pmt;
 202     /* IOD stuff (mpeg4) */
 203     iod_descriptor_t *iod;
 204
 205 } ts_prg_psi_t;
 206
 207 typedef struct
 208 {
 209     /* for special PAT case */
 210     dvbpsi_handle   handle;
 211     int             i_pat_version;
 212
 213     /* For PMT */
 214     int             i_prg;
 215     ts_prg_psi_t    **prg;
 216
 217 } ts_psi_t;
 218
 219 typedef struct
 220 {
 221     es_format_t  fmt;
 222     es_out_id_t *id;
 223     int         i_pes_size;
 224     int         i_pes_gathered;
 225     block_t     *p_pes;
 226     block_t     **pp_last;
 227
 228     es_mpeg4_descriptor_t *p_mpeg4desc;
 229     int         b_gather;
 230
 231 } ts_es_t;
 232
 233 typedef struct
 234 {
 235     int         i_pid;
 236
 237     vlc_bool_t  b_seen;
 238     vlc_bool_t  b_valid;
 239     int         i_cc;   /* countinuity counter */
 240
 241     /* PSI owner (ie PMT -> PAT, ES -> PMT */
 242     ts_psi_t   *p_owner;
 243     int         i_owner_number;
 244
 245     /* */
 246     ts_psi_t    *psi;
 247     ts_es_t     *es;
 248
 249     /* Some private streams encapsulate several ES (eg. DVB subtitles)*/
 250     ts_es_t     **extra_es;
 251     int         i_extra_es;
 252
 253 } ts_pid_t;
 254
 255 struct demux_sys_t
 256 {
 257     /* TS packet size (188, 192, 204) */
 258     int         i_packet_size;
 259
 260     /* how many TS packet we read at once */
 261     int         i_ts_read;
 262
 263     /* All pid */
 264     ts_pid_t    pid[8192];
 265
 266     /* All PMT */
 267     int         i_pmt;
 268     ts_pid_t    **pmt;
 269
 270     /* */
 271     vlc_bool_t  b_es_id_pid;
 272     csa_t       *csa;
 273     vlc_bool_t  b_silent;
 274     uint16_t    i_capmt_sysid;
 275
 276     vlc_bool_t  b_udp_out;
 277     int         fd; /* udp socket */
 278     uint8_t     *buffer;
 279
 280     vlc_bool_t  b_dvb_control;
 281     int         i_dvb_program;
 282     vlc_list_t  *p_programs_list;
 283 };
 284
 285 static int Demux  ( demux_t *p_demux );
 286 static int Control( demux_t *p_demux, int i_query, va_list args );
 287
 288
 289 static void PIDInit ( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner );
 290 static void PIDClean( es_out_t *out, ts_pid_t *pid );
 291 static int  PIDFillFormat( ts_pid_t *pid, int i_stream_type );
 292
 293 static void PATCallBack( demux_t *, dvbpsi_pat_t * );
 294 static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt );
 295
 296 static inline int PIDGet( block_t *p )
 297 {
 298     return ( (p->p_buffer[1]&0x1f)<<8 )|p->p_buffer[2];
 299 }
 300
 301 static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk );
 302
 303 static void PCRHandle( demux_t *p_demux, ts_pid_t *, block_t * );
 304
 305 static iod_descriptor_t *IODNew( int , uint8_t * );
 306 static void              IODFree( iod_descriptor_t * );
 307
 308 #define TS_PACKET_SIZE_188 188
 309 #define TS_PACKET_SIZE_192 192
 310 #define TS_PACKET_SIZE_204 204
 311 #define TS_PACKET_SIZE_MAX 204
 312
 313 /*****************************************************************************
 314  * Open
 315  *****************************************************************************/
 316 static int Open( vlc_object_t *p_this )
 317 {
 318     demux_t     *p_demux = (demux_t*)p_this;
 319     demux_sys_t *p_sys;
 320
 321     uint8_t     *p_peek;
 322     int          i_sync, i_peek, i;
 323     int          i_packet_size;
 324
 325     ts_pid_t     *pat;
 326
 327     vlc_value_t  val;
 328
 329     if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) <
 330         TS_PACKET_SIZE_MAX )
 331     {
 332         msg_Err( p_demux, "cannot peek" );
 333         return VLC_EGENERIC;
 334     }
 335
 336     /* Search first sync byte */
 337     for( i_sync = 0; i_sync < TS_PACKET_SIZE_MAX; i_sync++ )
 338     {
 339         if( p_peek[i_sync] == 0x47 ) break;
 340     }
 341     if( i_sync >= TS_PACKET_SIZE_MAX )
 342     {
 343         if( strcmp( p_demux->psz_demux, "ts" ) )
 344         {
 345             msg_Warn( p_demux, "TS module discarded" );
 346             return VLC_EGENERIC;
 347         }
 348         msg_Warn( p_demux, "this does not look like a TS stream, continuing" );
 349     }
 350
 351     /* Check next 3 sync bytes */
 352     i_peek = TS_PACKET_SIZE_MAX * 3 + i_sync + 1;
 353     if( ( stream_Peek( p_demux->s, &p_peek, i_peek ) ) < i_peek )
 354     {
 355         msg_Err( p_demux, "cannot peek" );
 356         return VLC_EGENERIC;
 357     }
 358     if( p_peek[i_sync + TS_PACKET_SIZE_188] == 0x47 &&
 359         p_peek[i_sync + 2 * TS_PACKET_SIZE_188] == 0x47 &&
 360         p_peek[i_sync + 3 * TS_PACKET_SIZE_188] == 0x47 )
 361     {
 362         i_packet_size = TS_PACKET_SIZE_188;
 363     }
 364     else if( p_peek[i_sync + TS_PACKET_SIZE_192] == 0x47 &&
 365              p_peek[i_sync + 2 * TS_PACKET_SIZE_192] == 0x47 &&
 366              p_peek[i_sync + 3 * TS_PACKET_SIZE_192] == 0x47 )
 367     {
 368         i_packet_size = TS_PACKET_SIZE_192;
 369     }
 370     else if( p_peek[i_sync + TS_PACKET_SIZE_204] == 0x47 &&
 371              p_peek[i_sync + 2 * TS_PACKET_SIZE_204] == 0x47 &&
 372              p_peek[i_sync + 3 * TS_PACKET_SIZE_204] == 0x47 )
 373     {
 374         i_packet_size = TS_PACKET_SIZE_204;
 375     }
 376     else if( !strcmp( p_demux->psz_demux, "ts" ) )
 377     {
 378         i_packet_size = TS_PACKET_SIZE_188;
 379     }
 380     else
 381     {
 382         msg_Warn( p_demux, "TS module discarded (lost sync)" );
 383         return VLC_EGENERIC;
 384     }
 385
 386     /* Fill p_demux field */
 387     p_demux->pf_demux = Demux;
 388     p_demux->pf_control = Control;
 389     p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
 390     memset( p_sys, 0, sizeof( demux_sys_t ) );
 391
 392     /* Init p_sys field */
 393     p_sys->b_dvb_control = VLC_TRUE;
 394     p_sys->i_dvb_program = 0;
 395     for( i = 0; i < 8192; i++ )
 396     {
 397         ts_pid_t *pid = &p_sys->pid[i];
 398
 399         pid->i_pid      = i;
 400         pid->b_seen     = VLC_FALSE;
 401         pid->b_valid    = VLC_FALSE;
 402     }
 403     p_sys->i_packet_size = i_packet_size;
 404     p_sys->b_udp_out = VLC_FALSE;
 405     p_sys->i_ts_read = 50;
 406     p_sys->csa = NULL;
 407
 408     /* Init PAT handler */
 409     pat = &p_sys->pid[0];
 410     PIDInit( pat, VLC_TRUE, NULL );
 411     pat->psi->handle = dvbpsi_AttachPAT( (dvbpsi_pat_callback)PATCallBack,
 412                                          p_demux );
 413
 414     /* Init PMT array */
 415     p_sys->i_pmt = 0;
 416     p_sys->pmt   = NULL;
 417
 418     /* Read config */
 419     var_Create( p_demux, "ts-es-id-pid", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
 420     var_Get( p_demux, "ts-es-id-pid", &val );
 421     p_sys->b_es_id_pid = val.b_bool,
 422
 423     var_Create( p_demux, "ts-out", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
 424     var_Get( p_demux, "ts-out", &val );
 425     if( val.psz_string && *val.psz_string )
 426     {
 427         vlc_value_t mtu;
 428         char *psz = strchr( val.psz_string, ':' );
 429         int   i_port = 0;
 430
 431         p_sys->b_udp_out = VLC_TRUE;
 432
 433         if( psz )
 434         {
 435             *psz++ = '\0';
 436             i_port = atoi( psz );
 437         }
 438         if( i_port <= 0 ) i_port  = 1234;
 439         msg_Dbg( p_demux, "resend ts to '%s:%d'", val.psz_string, i_port );
 440
 441         p_sys->fd = net_OpenUDP( p_demux, "", 0, val.psz_string, i_port );
 442         if( p_sys->fd < 0 )
 443         {
 444             msg_Err( p_demux, "failed to open udp socket, send disabled" );
 445             p_sys->b_udp_out = VLC_FALSE;
 446         }
 447         else
 448         {
 449             var_Create( p_demux, "ts-out-mtu",
 450                         VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 451             var_Get( p_demux, "ts-out-mtu", &mtu );
 452             p_sys->i_ts_read = mtu.i_int / p_sys->i_packet_size;
 453             if( p_sys->i_ts_read <= 0 )
 454             {
 455                 p_sys->i_ts_read = 1500 / p_sys->i_packet_size;
 456             }
 457             p_sys->buffer = malloc( p_sys->i_packet_size * p_sys->i_ts_read );
 458         }
 459     }
 460     if( val.psz_string )
 461     {
 462         free( val.psz_string );
 463     }
 464
 465
 466     /* We handle description of an extra PMT */
 467     var_Create( p_demux, "ts-extra-pmt", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
 468     var_Get( p_demux, "ts-extra-pmt", &val );
 469     if( val.psz_string && strchr( val.psz_string, '=' ) != NULL )
 470     {
 471         char *psz = val.psz_string;
 472         int  i_pid = strtol( psz, &psz, 0 );
 473
 474         if( i_pid >= 2 && i_pid < 8192 )
 475         {
 476             ts_pid_t *pmt = &p_sys->pid[i_pid];
 477
 478             msg_Dbg( p_demux, "extra pmt specified (pid=%d)", i_pid );
 479             PIDInit( pmt, VLC_TRUE, NULL );
 480             /* FIXME we should also ask for a number */
 481             pmt->psi->prg[0]->handle =
 482                 dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack,
 483                                   p_demux );
 484             pmt->psi->prg[0]->i_number = 0; /* special one */
 485
 486             psz = strchr( psz, '=' ) + 1;   /* can't failed */
 487             while( psz && *psz )
 488             {
 489                 char *psz_next = strchr( psz, ',' );
 490                 int i_pid, i_stream_type;
 491
 492                 if( psz_next )
 493                 {
 494                     *psz_next++ = '\0';
 495                 }
 496
 497                 i_pid = strtol( psz, &psz, 0 );
 498                 if( *psz == ':' )
 499                 {
 500                     i_stream_type = strtol( psz + 1, &psz, 0 );
 501                     if( i_pid >= 2 && i_pid < 8192 &&
 502                         !p_sys->pid[i_pid].b_valid )
 503                     {
 504                         ts_pid_t *pid = &p_sys->pid[i_pid];
 505
 506                         PIDInit( pid, VLC_FALSE, pmt->psi);
 507                         if( pmt->psi->prg[0]->i_pid_pcr <= 0 )
 508                         {
 509                             pmt->psi->prg[0]->i_pid_pcr = i_pid;
 510                         }
 511                         PIDFillFormat( pid, i_stream_type);
 512                         if( pid->es->fmt.i_cat != UNKNOWN_ES )
 513                         {
 514                             if( p_sys->b_es_id_pid )
 515                             {
 516                                 pid->es->fmt.i_id = i_pid;
 517                             }
 518                             msg_Dbg( p_demux, "  * es pid=%d type=%d "
 519                                      "fcc=%4.4s", i_pid, i_stream_type,
 520                                      (char*)&pid->es->fmt.i_codec );
 521                             pid->es->id = es_out_Add( p_demux->out,
 522                                                       &pid->es->fmt );
 523                         }
 524                     }
 525                 }
 526                 psz = psz_next;
 527             }
 528         }
 529     }
 530     if( val.psz_string )
 531     {
 532         free( val.psz_string );
 533     }
 534
 535     var_Create( p_demux, "ts-csa-ck", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
 536     var_Get( p_demux, "ts-csa-ck", &val );
 537     if( val.psz_string && *val.psz_string )
 538     {
 539         char *psz = val.psz_string;
 540         if( psz[0] == '0' && ( psz[1] == 'x' || psz[1] == 'X' ) )
 541         {
 542             psz += 2;
 543         }
 544         if( strlen( psz ) != 16 )
 545         {
 546             msg_Warn( p_demux, "invalid csa ck (it must be 16 chars long)" );
 547         }
 548         else
 549         {
 550             uint64_t i_ck = strtoull( psz, NULL, 16 );
 551             uint8_t ck[8];
 552             int     i;
 553             for( i = 0; i < 8; i++ )
 554             {
 555                 ck[i] = ( i_ck >> ( 56 - 8*i) )&0xff;
 556             }
 557
 558             msg_Dbg( p_demux, "using CSA scrambling with "
 559                      "ck=%x:%x:%x:%x:%x:%x:%x:%x",
 560                      ck[0], ck[1], ck[2], ck[3], ck[4], ck[5], ck[6], ck[7] );
 561
 562             p_sys->csa = csa_New();
 563             csa_SetCW( p_sys->csa, ck, ck );
 564         }
 565     }
 566     if( val.psz_string )
 567     {
 568         free( val.psz_string );
 569     }
 570
 571     var_Create( p_demux, "ts-silent", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
 572     var_Get( p_demux, "ts-silent", &val );
 573     p_sys->b_silent = val.b_bool;
 574
 575     var_Create( p_demux, "ts-capmt-sysid", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
 576     var_Get( p_demux, "ts-capmt-sysid", &val );
 577     p_sys->i_capmt_sysid = val.i_int;
 578
 579     return VLC_SUCCESS;
 580 }
 581
 582 /*****************************************************************************
 583  * Close
 584  *****************************************************************************/
 585 static void Close( vlc_object_t *p_this )
 586 {
 587     demux_t     *p_demux = (demux_t*)p_this;
 588     demux_sys_t *p_sys = p_demux->p_sys;
 589
 590     int          i;
 591
 592     msg_Dbg( p_demux, "pid list:" );
 593     for( i = 0; i < 8192; i++ )
 594     {
 595         ts_pid_t *pid = &p_sys->pid[i];
 596
 597         if( pid->b_valid && pid->psi )
 598         {
 599             switch( pid->i_pid )
 600             {
 601                 case 0: /* PAT */
 602                     dvbpsi_DetachPAT( pid->psi->handle );
 603                     free( pid->psi );
 604                     break;
 605                 case 1: /* CAT */
 606                     free( pid->psi );
 607                     break;
 608                 default:
 609                     PIDClean( p_demux->out, pid );
 610                     break;
 611             }
 612         }
 613         else if( pid->b_valid && pid->es )
 614         {
 615             PIDClean( p_demux->out, pid );
 616         }
 617
 618         if( pid->b_seen )
 619         {
 620             msg_Dbg( p_demux, "  - pid[%d] seen", pid->i_pid );
 621         }
 622
 623         if( p_sys->b_dvb_control && pid->i_pid > 0 )
 624         {
 625             /* too much */
 626             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid, VLC_FALSE );
 627         }
 628
 629     }
 630
 631     if( p_sys->b_udp_out )
 632     {
 633         net_Close( p_sys->fd );
 634         free( p_sys->buffer );
 635     }
 636     if( p_sys->csa )
 637     {
 638         csa_Delete( p_sys->csa );
 639     }
 640
 641     if( p_sys->i_pmt ) free( p_sys->pmt );
 642
 643     if ( p_sys->p_programs_list )
 644     {
 645         vlc_value_t val;
 646         val.p_list = p_sys->p_programs_list;
 647         var_Change( p_demux, "programs", VLC_VAR_FREELIST, &val, NULL );
 648     }
 649
 650     free( p_sys );
 651 }
 652
 653 /*****************************************************************************
 654  * Demux:
 655  *****************************************************************************/
 656 static int Demux( demux_t *p_demux )
 657 {
 658     demux_sys_t *p_sys = p_demux->p_sys;
 659     int          i_pkt;
 660
 661     /* We read at most 100 TS packet or until a frame is completed */
 662     for( i_pkt = 0; i_pkt < p_sys->i_ts_read; i_pkt++ )
 663     {
 664         vlc_bool_t  b_frame = VLC_FALSE;
 665         block_t     *p_pkt;
 666         ts_pid_t    *p_pid;
 667
 668         /* Get a new TS packet */
 669         if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) )
 670         {
 671             msg_Dbg( p_demux, "eof ?" );
 672             return 0;
 673         }
 674
 675         /* Check sync byte and re-sync if needed */
 676         if( p_pkt->p_buffer[0] != 0x47 )
 677         {
 678             msg_Warn( p_demux, "lost synchro" );
 679             block_Release( p_pkt );
 680
 681             while( !p_demux->b_die )
 682             {
 683                 uint8_t *p_peek;
 684                 int i_peek, i_skip = 0;
 685
 686                 i_peek = stream_Peek( p_demux->s, &p_peek,
 687                                       p_sys->i_packet_size * 10 );
 688                 if( i_peek < p_sys->i_packet_size + 1 )
 689                 {
 690                     msg_Dbg( p_demux, "eof ?" );
 691                     return 0;
 692                 }
 693
 694                 while( i_skip < i_peek - p_sys->i_packet_size )
 695                 {
 696                     if( p_peek[i_skip] == 0x47 &&
 697                         p_peek[i_skip + p_sys->i_packet_size] == 0x47 )
 698                     {
 699                         break;
 700                     }
 701                     i_skip++;
 702                 }
 703
 704                 msg_Dbg( p_demux, "skipping %d bytes of garbage", i_skip );
 705                 stream_Read( p_demux->s, NULL, i_skip );
 706
 707                 if( i_skip < i_peek - p_sys->i_packet_size )
 708                 {
 709                     break;
 710                 }
 711             }
 712
 713             if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) )
 714             {
 715                 msg_Dbg( p_demux, "eof ?" );
 716                 return 0;
 717             }
 718         }
 719
 720         if( p_sys->b_udp_out )
 721         {
 722             memcpy( &p_sys->buffer[i_pkt * p_sys->i_packet_size],
 723                     p_pkt->p_buffer, p_sys->i_packet_size );
 724         }
 725
 726         /* Parse the TS packet */
 727         p_pid = &p_sys->pid[PIDGet( p_pkt )];
 728
 729         if( p_pid->b_valid )
 730         {
 731             if( p_pid->psi )
 732             {
 733                 if( p_pid->i_pid == 0 )
 734                 {
 735                     dvbpsi_PushPacket( p_pid->psi->handle, p_pkt->p_buffer );
 736                 }
 737                 else
 738                 {
 739                     int i_prg;
 740                     for( i_prg = 0; i_prg < p_pid->psi->i_prg; i_prg++ )
 741                     {
 742                         dvbpsi_PushPacket( p_pid->psi->prg[i_prg]->handle,
 743                                            p_pkt->p_buffer );
 744                     }
 745                 }
 746                 block_Release( p_pkt );
 747             }
 748             else if( !p_sys->b_udp_out )
 749             {
 750                 b_frame = GatherPES( p_demux, p_pid, p_pkt );
 751             }
 752             else
 753             {
 754                 PCRHandle( p_demux, p_pid, p_pkt );
 755                 block_Release( p_pkt );
 756             }
 757         }
 758         else
 759         {
 760             if( !p_pid->b_seen )
 761             {
 762                 msg_Dbg( p_demux, "pid[%d] unknown", p_pid->i_pid );
 763             }
 764             /* We have to handle PCR if present */
 765             PCRHandle( p_demux, p_pid, p_pkt );
 766             block_Release( p_pkt );
 767         }
 768         p_pid->b_seen = VLC_TRUE;
 769
 770         if( b_frame )
 771         {
 772             break;
 773         }
 774     }
 775
 776     if( p_sys->b_udp_out )
 777     {
 778         /* Send the complete block */
 779         net_Write( p_demux, p_sys->fd, NULL, p_sys->buffer,
 780                    p_sys->i_ts_read * p_sys->i_packet_size );
 781     }
 782
 783     return 1;
 784 }
 785
 786 /*****************************************************************************
 787  * Control:
 788  *****************************************************************************/
 789 static int Control( demux_t *p_demux, int i_query, va_list args )
 790 {
 791     demux_sys_t *p_sys = p_demux->p_sys;
 792     double f, *pf;
 793     int64_t i64;
 794     int i_int;
 795
 796     switch( i_query )
 797     {
 798         case DEMUX_GET_POSITION:
 799             pf = (double*) va_arg( args, double* );
 800             i64 = stream_Size( p_demux->s );
 801             if( i64 > 0 )
 802             {
 803                 *pf = (double)stream_Tell( p_demux->s ) / (double)i64;
 804             }
 805             else
 806             {
 807                 *pf = 0.0;
 808             }
 809             return VLC_SUCCESS;
 810         case DEMUX_SET_POSITION:
 811             f = (double) va_arg( args, double );
 812             i64 = stream_Size( p_demux->s );
 813
 814             es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 815             if( stream_Seek( p_demux->s, (int64_t)(i64 * f) ) )
 816             {
 817                 return VLC_EGENERIC;
 818             }
 819             return VLC_SUCCESS;
 820 #if 0
 821
 822         case DEMUX_GET_TIME:
 823             pi64 = (int64_t*)va_arg( args, int64_t * );
 824             if( p_sys->i_time < 0 )
 825             {
 826                 *pi64 = 0;
 827                 return VLC_EGENERIC;
 828             }
 829             *pi64 = p_sys->i_time;
 830             return VLC_SUCCESS;
 831
 832         case DEMUX_GET_LENGTH:
 833             pi64 = (int64_t*)va_arg( args, int64_t * );
 834             if( p_sys->i_mux_rate > 0 )
 835             {
 836                 *pi64 = I64C(1000000) * ( stream_Size( p_demux->s ) / 50 ) /
 837                         p_sys->i_mux_rate;
 838                 return VLC_SUCCESS;
 839             }
 840             *pi64 = 0;
 841             return VLC_EGENERIC;
 842 #endif
 843         case DEMUX_SET_GROUP:
 844         {
 845             uint16_t i_vpid = 0, i_apid1 = 0, i_apid2 = 0, i_apid3 = 0;
 846             ts_prg_psi_t *p_prg = NULL;
 847             vlc_list_t *p_list;
 848
 849             i_int = (int)va_arg( args, int );
 850             p_list = (vlc_list_t *)va_arg( args, vlc_list_t * );
 851             msg_Dbg( p_demux, "DEMUX_SET_GROUP %d %p", i_int, p_list );
 852
 853             if( p_sys->b_dvb_control && i_int > 0 && i_int != p_sys->i_dvb_program )
 854             {
 855                 int i_pmt_pid = -1;
 856                 int i;
 857
 858                 /* Search pmt to be unselected */
 859                 for( i = 0; i < p_sys->i_pmt; i++ )
 860                 {
 861                     ts_pid_t *pmt = p_sys->pmt[i];
 862                     int i_prg;
 863
 864                     for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
 865                     {
 866                         if( pmt->psi->prg[i_prg]->i_number == p_sys->i_dvb_program )
 867                         {
 868                             i_pmt_pid = p_sys->pmt[i]->i_pid;
 869                             break;
 870                         }
 871                     }
 872                     if( i_pmt_pid > 0 ) break;
 873                 }
 874
 875                 if( i_pmt_pid > 0 )
 876                 {
 877                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
 878                                     ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
 879                                     VLC_FALSE );
 880                     /* All ES */
 881                     for( i = 2; i < 8192; i++ )
 882                     {
 883                         ts_pid_t *pid = &p_sys->pid[i];
 884                         int i_prg;
 885
 886                         if( !pid->b_valid || pid->psi ) continue;
 887
 888                         for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
 889                         {
 890                             if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
 891                             {
 892                                 /* We only remove es that aren't defined by extra pmt */
 893                                 stream_Control( p_demux->s,
 894                                                 STREAM_CONTROL_ACCESS,
 895                                                 ACCESS_SET_PRIVATE_ID_STATE,
 896                                                 i, VLC_FALSE );
 897                                 break;
 898                             }
 899                         }
 900                     }
 901                 }
 902
 903                 /* select new program */
 904                 p_sys->i_dvb_program = i_int;
 905                 i_pmt_pid = -1;
 906                 for( i = 0; i < p_sys->i_pmt; i++ )
 907                 {
 908                     ts_pid_t *pmt = p_sys->pmt[i];
 909                     int i_prg;
 910
 911                     for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
 912                     {
 913                         if( pmt->psi->prg[i_prg]->i_number == i_int )
 914                         {
 915                             i_pmt_pid = p_sys->pmt[i]->i_pid;
 916                             p_prg = p_sys->pmt[i]->psi->prg[i_prg];
 917                             break;
 918                         }
 919                     }
 920                     if( i_pmt_pid > 0 ) break;
 921                 }
 922                 if( i_pmt_pid > 0 )
 923                 {
 924                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
 925                                     ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
 926                                     VLC_TRUE );
 927                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
 928                                     ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr,
 929                                     VLC_TRUE );
 930
 931                     for( i = 2; i < 8192; i++ )
 932                     {
 933                         ts_pid_t *pid = &p_sys->pid[i];
 934                         int i_prg;
 935
 936                         if( !pid->b_valid || pid->psi ) continue;
 937
 938                         for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
 939                         {
 940                             if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
 941                             {
 942                                 if ( pid->es->fmt.i_cat == VIDEO_ES && !i_vpid )
 943                                     i_vpid = i;
 944                                 if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid1 )
 945                                     i_apid1 = i;
 946                                 else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid2 )
 947                                     i_apid2 = i;
 948                                 else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid3 )
 949                                     i_apid3 = i;
 950
 951                                 stream_Control( p_demux->s,
 952                                                 STREAM_CONTROL_ACCESS,
 953                                                 ACCESS_SET_PRIVATE_ID_STATE,
 954                                                 i, VLC_TRUE );
 955                                 break;
 956                             }
 957                         }
 958                     }
 959                 }
 960             }
 961             else
 962             {
 963                 p_sys->i_dvb_program = -1;
 964                 p_sys->p_programs_list = p_list;
 965             }
 966             return VLC_SUCCESS;
 967         }
 968
 969         case DEMUX_GET_FPS:
 970         case DEMUX_SET_TIME:
 971         default:
 972             return VLC_EGENERIC;
 973     }
 974 }
 975
 976 static void PIDInit( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner )
 977 {
 978     vlc_bool_t b_old_valid = pid->b_valid;
 979
 980     pid->b_valid    = VLC_TRUE;
 981     pid->i_cc       = 0xff;
 982     pid->p_owner    = p_owner;
 983     pid->i_owner_number = 0;
 984
 985     pid->extra_es   = NULL;
 986     pid->i_extra_es = 0;
 987
 988     if( b_psi )
 989     {
 990         pid->es  = NULL;
 991
 992         if( !b_old_valid )
 993         {
 994             pid->psi = malloc( sizeof( ts_psi_t ) );
 995             pid->psi->i_prg = 0;
 996             pid->psi->prg   = NULL;
 997             pid->psi->handle= NULL;
 998         }
 999         pid->psi->i_pat_version  = -1;
1000         if( p_owner )
1001         {
1002             ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) );
1003             /* PMT */
1004             prg->i_version  = -1;
1005             prg->i_number   = -1;
1006             prg->i_pid_pcr  = -1;
1007             prg->i_pid_pmt  = -1;
1008             prg->iod        = NULL;
1009             prg->handle     = NULL;
1010
1011             TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg );
1012         }
1013     }
1014     else
1015     {
1016         pid->psi = NULL;
1017         pid->es  = malloc( sizeof( ts_es_t ) );
1018
1019         es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 );
1020         pid->es->id      = NULL;
1021         pid->es->p_pes   = NULL;
1022         pid->es->i_pes_size= 0;
1023         pid->es->i_pes_gathered= 0;
1024         pid->es->pp_last = &pid->es->p_pes;
1025         pid->es->p_mpeg4desc = NULL;
1026         pid->es->b_gather = VLC_FALSE;
1027     }
1028 }
1029
1030 static void PIDClean( es_out_t *out, ts_pid_t *pid )
1031 {
1032     if( pid->psi )
1033     {
1034         int i;
1035
1036         if( pid->psi->handle ) dvbpsi_DetachPMT( pid->psi->handle );
1037         for( i = 0; i < pid->psi->i_prg; i++ )
1038         {
1039             if( pid->psi->prg[i]->iod )
1040                 IODFree( pid->psi->prg[i]->iod );
1041             if( pid->psi->prg[i]->handle )
1042                 dvbpsi_DetachPMT( pid->psi->prg[i]->handle );
1043             free( pid->psi->prg[i] );
1044         }
1045         if( pid->psi->prg ) free( pid->psi->prg );
1046         free( pid->psi );
1047     }
1048     else
1049     {
1050         int i;
1051
1052         if( pid->es->id )
1053             es_out_Del( out, pid->es->id );
1054
1055         if( pid->es->p_pes )
1056             block_ChainRelease( pid->es->p_pes );
1057
1058         es_format_Clean( &pid->es->fmt );
1059
1060         free( pid->es );
1061
1062         for( i = 0; i < pid->i_extra_es; i++ )
1063         {
1064             if( pid->extra_es[i]->id )
1065                 es_out_Del( out, pid->extra_es[i]->id );
1066
1067             if( pid->extra_es[i]->p_pes )
1068                 block_ChainRelease( pid->extra_es[i]->p_pes );
1069
1070             es_format_Clean( &pid->extra_es[i]->fmt );
1071
1072             free( pid->extra_es[i] );
1073         }
1074         if( pid->i_extra_es ) free( pid->extra_es );
1075     }
1076
1077     pid->b_valid = VLC_FALSE;
1078 }
1079
1080 /****************************************************************************
1081  * gathering stuff
1082  ****************************************************************************/
1083 static void ParsePES( demux_t *p_demux, ts_pid_t *pid )
1084 {
1085     block_t *p_pes = pid->es->p_pes;
1086     uint8_t header[30];
1087     int     i_pes_size = 0;
1088     int     i_skip = 0;
1089     mtime_t i_dts = -1;
1090     mtime_t i_pts = -1;
1091     mtime_t i_length = 0;
1092     int i_max;
1093
1094     /* remove the pes from pid */
1095     pid->es->p_pes = NULL;
1096     pid->es->i_pes_size= 0;
1097     pid->es->i_pes_gathered= 0;
1098     pid->es->pp_last = &pid->es->p_pes;
1099
1100     /* FIXME find real max size */
1101     i_max = block_ChainExtract( p_pes, header, 30 );
1102
1103
1104     if( header[0] != 0 || header[1] != 0 || header[2] != 1 )
1105     {
1106         if( !p_demux->p_sys->b_silent )
1107             msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x] (pid: %d)",
1108                       header[0], header[1],header[2],header[3], pid->i_pid );
1109         block_ChainRelease( p_pes );
1110         return;
1111     }
1112
1113     /* TODO check size */
1114     switch( header[3] )
1115     {
1116         case 0xBC:  /* Program stream map */
1117         case 0xBE:  /* Padding */
1118         case 0xBF:  /* Private stream 2 */
1119         case 0xB0:  /* ECM */
1120         case 0xB1:  /* EMM */
1121         case 0xFF:  /* Program stream directory */
1122         case 0xF2:  /* DSMCC stream */
1123         case 0xF8:  /* ITU-T H.222.1 type E stream */
1124             i_skip = 6;
1125             break;
1126         default:
1127             if( ( header[6]&0xC0 ) == 0x80 )
1128             {
1129                 /* mpeg2 PES */
1130                 i_skip = header[8] + 9;
1131
1132                 if( header[7]&0x80 )    /* has pts */
1133                 {
1134                     i_pts = ((mtime_t)(header[ 9]&0x0e ) << 29)|
1135                              (mtime_t)(header[10] << 22)|
1136                             ((mtime_t)(header[11]&0xfe) << 14)|
1137                              (mtime_t)(header[12] << 7)|
1138                              (mtime_t)(header[13] >> 1);
1139
1140                     if( header[7]&0x40 )    /* has dts */
1141                     {
1142                          i_dts = ((mtime_t)(header[14]&0x0e ) << 29)|
1143                                  (mtime_t)(header[15] << 22)|
1144                                 ((mtime_t)(header[16]&0xfe) << 14)|
1145                                  (mtime_t)(header[17] << 7)|
1146                                  (mtime_t)(header[18] >> 1);
1147                     }
1148                 }
1149             }
1150             else
1151             {
1152                 i_skip = 6;
1153                 while( i_skip < 23 && header[i_skip] == 0xff )
1154                 {
1155                     i_skip++;
1156                 }
1157                 if( i_skip == 23 )
1158                 {
1159                     msg_Err( p_demux, "too much MPEG-1 stuffing" );
1160                     block_ChainRelease( p_pes );
1161                     return;
1162                 }
1163                 if( ( header[i_skip] & 0xC0 ) == 0x40 )
1164                 {
1165                     i_skip += 2;
1166                 }
1167
1168                 if(  header[i_skip]&0x20 )
1169                 {
1170                      i_pts = ((mtime_t)(header[i_skip]&0x0e ) << 29)|
1171                               (mtime_t)(header[i_skip+1] << 22)|
1172                              ((mtime_t)(header[i_skip+2]&0xfe) << 14)|
1173                               (mtime_t)(header[i_skip+3] << 7)|
1174                               (mtime_t)(header[i_skip+4] >> 1);
1175
1176                     if( header[i_skip]&0x10 )    /* has dts */
1177                     {
1178                          i_dts = ((mtime_t)(header[i_skip+5]&0x0e ) << 29)|
1179                                   (mtime_t)(header[i_skip+6] << 22)|
1180                                  ((mtime_t)(header[i_skip+7]&0xfe) << 14)|
1181                                   (mtime_t)(header[i_skip+8] << 7)|
1182                                   (mtime_t)(header[i_skip+9] >> 1);
1183                          i_skip += 10;
1184                     }
1185                     else
1186                     {
1187                         i_skip += 5;
1188                     }
1189                 }
1190                 else
1191                 {
1192                     i_skip += 1;
1193                 }
1194             }
1195             break;
1196     }
1197
1198     if( pid->es->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', 'b' ) ||
1199         pid->es->fmt.i_codec == VLC_FOURCC( 'd', 't', 's', 'b' ) )
1200     {
1201         i_skip += 4;
1202     }
1203     else if( pid->es->fmt.i_codec == VLC_FOURCC( 'l', 'p', 'c', 'b' ) ||
1204              pid->es->fmt.i_codec == VLC_FOURCC( 's', 'p', 'u', 'b' ) ||
1205              pid->es->fmt.i_codec == VLC_FOURCC( 's', 'd', 'd', 'b' ) )
1206     {
1207         i_skip += 1;
1208     }
1209     else if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) &&
1210              pid->es->p_mpeg4desc )
1211     {
1212         decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr;
1213
1214         if( dcd->i_decoder_specific_info_len > 2 &&
1215             dcd->p_decoder_specific_info[0] == 0x10 &&
1216             ( dcd->p_decoder_specific_info[1]&0x10 ) )
1217         {
1218             /* display length */
1219             if( p_pes->i_buffer + 2 <= i_skip )
1220             {
1221                 i_length = GetWBE( &p_pes->p_buffer[i_skip] );
1222             }
1223
1224             i_skip += 2;
1225         }
1226         if( p_pes->i_buffer + 2 <= i_skip )
1227         {
1228             i_pes_size = GetWBE( &p_pes->p_buffer[i_skip] );
1229         }
1230         /* */
1231         i_skip += 2;
1232     }
1233
1234     /* skip header */
1235     while( p_pes && i_skip > 0 )
1236     {
1237         if( p_pes->i_buffer <= i_skip )
1238         {
1239             block_t *p_next = p_pes->p_next;
1240
1241             i_skip -= p_pes->i_buffer;
1242             block_Release( p_pes );
1243             p_pes = p_next;
1244         }
1245         else
1246         {
1247             p_pes->i_buffer -= i_skip;
1248             p_pes->p_buffer += i_skip;
1249             break;
1250         }
1251     }
1252
1253     if( p_pes )
1254     {
1255         block_t *p_block;
1256         int i;
1257
1258         if( i_dts >= 0 )
1259         {
1260             p_pes->i_dts = i_dts * 100 / 9;
1261         }
1262         if( i_pts >= 0 )
1263         {
1264             p_pes->i_pts = i_pts * 100 / 9;
1265         }
1266         p_pes->i_length = i_length * 100 / 9;
1267
1268         p_block = block_ChainGather( p_pes );
1269         if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) )
1270         {
1271             if( i_pes_size > 0 && p_block->i_buffer > i_pes_size )
1272             {
1273                 p_block->i_buffer = i_pes_size;
1274             }
1275             /* Append a \0 */
1276             p_block = block_Realloc( p_block, 0, p_block->i_buffer + 1 );
1277             p_block->p_buffer[p_block->i_buffer -1] = '\0';
1278         }
1279
1280         for( i = 0; i < pid->i_extra_es; i++ )
1281         {
1282             es_out_Send( p_demux->out, pid->extra_es[i]->id,
1283                          block_Duplicate( p_block ) );
1284         }
1285
1286         es_out_Send( p_demux->out, pid->es->id, p_block );
1287     }
1288     else
1289     {
1290         msg_Warn( p_demux, "empty pes" );
1291     }
1292 }
1293
1294 static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
1295 {
1296     demux_sys_t   *p_sys = p_demux->p_sys;
1297     const uint8_t *p = p_bk->p_buffer;
1298
1299     if( ( p[3]&0x20 ) && /* adaptation */
1300         ( p[5]&0x10 ) &&
1301         ( p[4] >= 7 ) )
1302     {
1303         int i;
1304         mtime_t i_pcr;  /* 33 bits */
1305
1306         i_pcr = ( (mtime_t)p[6] << 25 ) |
1307                 ( (mtime_t)p[7] << 17 ) |
1308                 ( (mtime_t)p[8] << 9 ) |
1309                 ( (mtime_t)p[9] << 1 ) |
1310                 ( (mtime_t)p[10] >> 7 );
1311
1312         /* Search program and set the PCR */
1313         for( i = 0; i < p_sys->i_pmt; i++ )
1314         {
1315             int i_prg;
1316             for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
1317             {
1318                 if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr )
1319                 {
1320                     es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
1321                                     (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number,
1322                                     (int64_t)(i_pcr * 100 / 9) );
1323                 }
1324             }
1325         }
1326     }
1327 }
1328
1329 static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
1330 {
1331     const uint8_t    *p = p_bk->p_buffer;
1332     const vlc_bool_t b_unit_start = p[1]&0x40;
1333     const vlc_bool_t b_adaptation = p[3]&0x20;
1334     const vlc_bool_t b_payload    = p[3]&0x10;
1335     const int        i_cc         = p[3]&0x0f;   /* continuity counter */
1336
1337     /* transport_scrambling_control is ignored */
1338
1339     int         i_skip = 0;
1340     vlc_bool_t  i_ret  = VLC_FALSE;
1341     int         i_diff;
1342
1343 #if 0
1344     msg_Dbg( p_demux, "pid=%d unit_start=%d adaptation=%d payload=%d "
1345              "cc=0x%x", pid->i_pid, b_unit_start, b_adaptation,
1346              b_payload, i_cc );
1347 #endif
1348
1349     /* For now, ignore additional error correction
1350      * TODO: handle Reed-Solomon 204,188 error correction */
1351     p_bk->i_buffer = TS_PACKET_SIZE_188;
1352
1353     if( p[1]&0x80 )
1354     {
1355         msg_Dbg( p_demux, "transport_error_indicator set (pid=%d)",
1356                  pid->i_pid );
1357     }
1358
1359     if( p_demux->p_sys->csa )
1360     {
1361         csa_Decrypt( p_demux->p_sys->csa, p_bk->p_buffer );
1362     }
1363
1364     if( !b_adaptation )
1365     {
1366         /* We don't have any adaptation_field, so payload starts
1367          * immediately after the 4 byte TS header */
1368         i_skip = 4;
1369     }
1370     else
1371     {
1372         /* p[4] is adaptation_field_length minus one */
1373         i_skip = 5 + p[4];
1374         if( p[4] > 0 )
1375         {
1376             if( p[5]&0x80 )
1377             {
1378                 msg_Warn( p_demux, "discontinuity_indicator (pid=%d) "
1379                           "ignored", pid->i_pid );
1380             }
1381         }
1382     }
1383
1384     /* Test continuity counter */
1385     /* continuous when (one of this):
1386         * diff == 1
1387         * diff == 0 and payload == 0
1388         * diff == 0 and duplicate packet (playload != 0) <- should we
1389         *   test the content ?
1390      */
1391
1392     i_diff = ( i_cc - pid->i_cc )&0x0f;
1393     if( b_payload && i_diff == 1 )
1394     {
1395         pid->i_cc++;
1396     }
1397     else
1398     {
1399         if( pid->i_cc == 0xff )
1400         {
1401             msg_Warn( p_demux, "first packet for pid=%d cc=0x%x",
1402                       pid->i_pid, i_cc );
1403             pid->i_cc = i_cc;
1404         }
1405         else if( i_diff != 0 )
1406         {
1407             /* FIXME what to do when discontinuity_indicator is set ? */
1408             msg_Warn( p_demux, "discontinuity received 0x%x instead of 0x%x",
1409                       i_cc, ( pid->i_cc + 1 )&0x0f );
1410
1411             pid->i_cc = i_cc;
1412
1413             if( pid->es->p_pes && pid->es->fmt.i_cat != VIDEO_ES )
1414             {
1415                 /* Small video artifacts are usually better then
1416                  * dropping full frames */
1417                 pid->es->p_pes->i_flags |= BLOCK_FLAG_DISCONTINUITY;
1418             }
1419         }
1420     }
1421
1422     PCRHandle( p_demux, pid, p_bk );
1423
1424     if( i_skip >= 188 || pid->es->id == NULL || p_demux->p_sys->b_udp_out )
1425     {
1426         block_Release( p_bk );
1427         return i_ret;
1428     }
1429
1430     /* We have to gather it */
1431     p_bk->p_buffer += i_skip;
1432     p_bk->i_buffer -= i_skip;
1433
1434     if( b_unit_start )
1435     {
1436         if( pid->es->p_pes )
1437         {
1438             ParsePES( p_demux, pid );
1439             i_ret = VLC_TRUE;
1440         }
1441
1442         block_ChainLastAppend( &pid->es->pp_last, p_bk );
1443         if( p_bk->i_buffer > 6 )
1444         {
1445             pid->es->i_pes_size = GetWBE( &p_bk->p_buffer[4] );
1446             if( pid->es->i_pes_size > 0 )
1447             {
1448                 pid->es->i_pes_size += 6;
1449             }
1450         }
1451         pid->es->i_pes_gathered += p_bk->i_buffer;
1452         if( pid->es->i_pes_size > 0 &&
1453             pid->es->i_pes_gathered >= pid->es->i_pes_size )
1454         {
1455             ParsePES( p_demux, pid );
1456             i_ret = VLC_TRUE;
1457         }
1458     }
1459     else
1460     {
1461         if( pid->es->p_pes == NULL )
1462         {
1463             /* msg_Dbg( p_demux, "broken packet" ); */
1464             block_Release( p_bk );
1465         }
1466         else
1467         {
1468             block_ChainLastAppend( &pid->es->pp_last, p_bk );
1469             pid->es->i_pes_gathered += p_bk->i_buffer;
1470             if( pid->es->i_pes_size > 0 &&
1471                 pid->es->i_pes_gathered >= pid->es->i_pes_size )
1472             {
1473                 ParsePES( p_demux, pid );
1474                 i_ret = VLC_TRUE;
1475             }
1476         }
1477     }
1478
1479     return i_ret;
1480 }
1481
1482 static int PIDFillFormat( ts_pid_t *pid, int i_stream_type )
1483 {
1484     es_format_t *fmt = &pid->es->fmt;
1485
1486     switch( i_stream_type )
1487     {
1488         case 0x01:  /* MPEG-1 video */
1489         case 0x02:  /* MPEG-2 video */
1490         case 0x80:  /* MPEG-2 MOTO video */
1491             es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', 'g', 'v' ) );
1492             break;
1493         case 0x03:  /* MPEG-1 audio */
1494         case 0x04:  /* MPEG-2 audio */
1495             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', 'g', 'a' ) );
1496             break;
1497         case 0x11:  /* MPEG4 (audio) */
1498         case 0x0f:  /* ISO/IEC 13818-7 Audio with ADTS transport syntax */
1499             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', '4', 'a' ) );
1500             break;
1501         case 0x10:  /* MPEG4 (video) */
1502             es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) );
1503             pid->es->b_gather = VLC_TRUE;
1504             break;
1505         case 0x1B:  /* H264 <- check transport syntax/needed descriptor */
1506             es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'h', '2', '6', '4' ) );
1507             break;
1508
1509         case 0x81:  /* A52 (audio) */
1510             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', ' ' ) );
1511             break;
1512         case 0x82:  /* DVD_SPU (sub) */
1513             es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', ' ' ) );
1514             break;
1515         case 0x83:  /* LPCM (audio) */
1516             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'l', 'p', 'c', 'm' ) );
1517             break;
1518         case 0x84:  /* SDDS (audio) */
1519             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 's' ) );
1520             break;
1521         case 0x85:  /* DTS (audio) */
1522             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'd', 't', 's', ' ' ) );
1523             break;
1524
1525         case 0x91:  /* A52 vls (audio) */
1526             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', 'b' ) );
1527             break;
1528         case 0x92:  /* DVD_SPU vls (sub) */
1529             es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', 'b' ) );
1530             break;
1531         case 0x93:  /* LPCM vls (audio) */
1532             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'l', 'p', 'c', 'b' ) );
1533             break;
1534         case 0x94:  /* SDDS (audio) */
1535             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 'b' ) );
1536             break;
1537
1538         case 0xa0:  /* MSCODEC vlc (video) (fixed later) */
1539             es_format_Init( fmt, UNKNOWN_ES, 0 );
1540             pid->es->b_gather = VLC_TRUE;
1541             break;
1542
1543         case 0x06:  /* PES_PRIVATE  (fixed later) */
1544         case 0x12:  /* MPEG-4 generic (sub/scene/...) (fixed later) */
1545         default:
1546             es_format_Init( fmt, UNKNOWN_ES, 0 );
1547             break;
1548     }
1549
1550     /* PES packets usually contain truncated frames */
1551     fmt->b_packetized = VLC_FALSE;
1552
1553     return fmt->i_cat == UNKNOWN_ES ? VLC_EGENERIC : VLC_SUCCESS ;
1554 }
1555
1556 /*****************************************************************************
1557  * MP4 specific functions (IOD parser)
1558  *****************************************************************************/
1559 static int  IODDescriptorLength( int *pi_data, uint8_t **pp_data )
1560 {
1561     unsigned int i_b;
1562     unsigned int i_len = 0;
1563     do
1564     {
1565         i_b = **pp_data;
1566         (*pp_data)++;
1567         (*pi_data)--;
1568         i_len = ( i_len << 7 ) + ( i_b&0x7f );
1569
1570     } while( i_b&0x80 );
1571
1572     return( i_len );
1573 }
1574 static int IODGetByte( int *pi_data, uint8_t **pp_data )
1575 {
1576     if( *pi_data > 0 )
1577     {
1578         const int i_b = **pp_data;
1579         (*pp_data)++;
1580         (*pi_data)--;
1581         return( i_b );
1582     }
1583     return( 0 );
1584 }
1585 static int IODGetWord( int *pi_data, uint8_t **pp_data )
1586 {
1587     const int i1 = IODGetByte( pi_data, pp_data );
1588     const int i2 = IODGetByte( pi_data, pp_data );
1589     return( ( i1 << 8 ) | i2 );
1590 }
1591 static int IODGet3Bytes( int *pi_data, uint8_t **pp_data )
1592 {
1593     const int i1 = IODGetByte( pi_data, pp_data );
1594     const int i2 = IODGetByte( pi_data, pp_data );
1595     const int i3 = IODGetByte( pi_data, pp_data );
1596
1597     return( ( i1 << 16 ) | ( i2 << 8) | i3 );
1598 }
1599
1600 static uint32_t IODGetDWord( int *pi_data, uint8_t **pp_data )
1601 {
1602     const uint32_t i1 = IODGetWord( pi_data, pp_data );
1603     const uint32_t i2 = IODGetWord( pi_data, pp_data );
1604     return( ( i1 << 16 ) | i2 );
1605 }
1606
1607 static char* IODGetURL( int *pi_data, uint8_t **pp_data )
1608 {
1609     char *url;
1610     int i_url_len, i;
1611
1612     i_url_len = IODGetByte( pi_data, pp_data );
1613     url = malloc( i_url_len + 1 );
1614     for( i = 0; i < i_url_len; i++ )
1615     {
1616         url[i] = IODGetByte( pi_data, pp_data );
1617     }
1618     url[i_url_len] = '\0';
1619     return( url );
1620 }
1621
1622 static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
1623 {
1624     iod_descriptor_t *p_iod;
1625     int i;
1626     int i_es_index;
1627     uint8_t     i_flags;
1628     vlc_bool_t  b_url;
1629     int         i_iod_length;
1630
1631     p_iod = malloc( sizeof( iod_descriptor_t ) );
1632     memset( p_iod, 0, sizeof( iod_descriptor_t ) );
1633
1634     fprintf( stderr, "\n************ IOD ************" );
1635     for( i = 0; i < 255; i++ )
1636     {
1637         p_iod->es_descr[i].b_ok = 0;
1638     }
1639     i_es_index = 0;
1640
1641     if( i_data < 3 )
1642     {
1643         return p_iod;
1644     }
1645
1646     p_iod->i_iod_label = IODGetByte( &i_data, &p_data );
1647     fprintf( stderr, "\n* iod_label:%d", p_iod->i_iod_label );
1648     fprintf( stderr, "\n* ===========" );
1649     fprintf( stderr, "\n* tag:0x%x", p_data[0] );
1650
1651     if( IODGetByte( &i_data, &p_data ) != 0x02 )
1652     {
1653         fprintf( stderr, "\n ERR: tag != 0x02" );
1654         return p_iod;
1655     }
1656
1657     i_iod_length = IODDescriptorLength( &i_data, &p_data );
1658     fprintf( stderr, "\n* length:%d", i_iod_length );
1659     if( i_iod_length > i_data )
1660     {
1661         i_iod_length = i_data;
1662     }
1663
1664     p_iod->i_od_id = ( IODGetByte( &i_data, &p_data ) << 2 );
1665     i_flags = IODGetByte( &i_data, &p_data );
1666     p_iod->i_od_id |= i_flags >> 6;
1667     b_url = ( i_flags >> 5  )&0x01;
1668
1669     fprintf( stderr, "\n* od_id:%d", p_iod->i_od_id );
1670     fprintf( stderr, "\n* url flag:%d", b_url );
1671     fprintf( stderr, "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 );
1672
1673     if( b_url )
1674     {
1675         p_iod->psz_url = IODGetURL( &i_data, &p_data );
1676         fprintf( stderr, "\n* url string:%s", p_iod->psz_url );
1677         fprintf( stderr, "\n*****************************\n" );
1678         return p_iod;
1679     }
1680     else
1681     {
1682         p_iod->psz_url = NULL;
1683     }
1684
1685     p_iod->i_ODProfileLevelIndication = IODGetByte( &i_data, &p_data );
1686     p_iod->i_sceneProfileLevelIndication = IODGetByte( &i_data, &p_data );
1687     p_iod->i_audioProfileLevelIndication = IODGetByte( &i_data, &p_data );
1688     p_iod->i_visualProfileLevelIndication = IODGetByte( &i_data, &p_data );
1689     p_iod->i_graphicsProfileLevelIndication = IODGetByte( &i_data, &p_data );
1690
1691     fprintf( stderr, "\n* ODProfileLevelIndication:%d", p_iod->i_ODProfileLevelIndication );
1692     fprintf( stderr, "\n* sceneProfileLevelIndication:%d", p_iod->i_sceneProfileLevelIndication );
1693     fprintf( stderr, "\n* audioProfileLevelIndication:%d", p_iod->i_audioProfileLevelIndication );
1694     fprintf( stderr, "\n* visualProfileLevelIndication:%d", p_iod->i_visualProfileLevelIndication );
1695     fprintf( stderr, "\n* graphicsProfileLevelIndication:%d", p_iod->i_graphicsProfileLevelIndication );
1696
1697
1698     while( i_data > 0 && i_es_index < 255)
1699     {
1700         int i_tag, i_length;
1701         int     i_data_sav;
1702         uint8_t *p_data_sav;
1703
1704         i_tag = IODGetByte( &i_data, &p_data );
1705         i_length = IODDescriptorLength( &i_data, &p_data );
1706
1707         i_data_sav = i_data;
1708         p_data_sav = p_data;
1709
1710         i_data = i_length;
1711
1712         switch( i_tag )
1713         {
1714             case 0x03:
1715                 {
1716 #define es_descr    p_iod->es_descr[i_es_index]
1717                     int i_decoderConfigDescr_length;
1718                     fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length );
1719                     es_descr.b_ok = 1;
1720
1721                     es_descr.i_es_id = IODGetWord( &i_data, &p_data );
1722                     i_flags = IODGetByte( &i_data, &p_data );
1723                     es_descr.b_streamDependenceFlag = ( i_flags >> 7 )&0x01;
1724                     b_url = ( i_flags >> 6 )&0x01;
1725                     es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01;
1726                     es_descr.i_streamPriority = i_flags & 0x1f;
1727                     fprintf( stderr, "\n*   * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag );
1728                     fprintf( stderr, "\n*   * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag );
1729                     fprintf( stderr, "\n*   * streamPriority:%d", es_descr.i_streamPriority );
1730
1731                     if( es_descr.b_streamDependenceFlag )
1732                     {
1733                         es_descr.i_dependOn_es_id = IODGetWord( &i_data, &p_data );
1734                         fprintf( stderr, "\n*   * dependOn_es_id:%d", es_descr.i_dependOn_es_id );
1735                     }
1736
1737                     if( b_url )
1738                     {
1739                         es_descr.psz_url = IODGetURL( &i_data, &p_data );
1740                         fprintf( stderr, "\n* url string:%s", es_descr.psz_url );
1741                     }
1742                     else
1743                     {
1744                         es_descr.psz_url = NULL;
1745                     }
1746
1747                     if( es_descr.b_OCRStreamFlag )
1748                     {
1749                         es_descr.i_OCR_es_id = IODGetWord( &i_data, &p_data );
1750                         fprintf( stderr, "\n*   * OCR_es_id:%d", es_descr.i_OCR_es_id );
1751                     }
1752
1753                     if( IODGetByte( &i_data, &p_data ) != 0x04 )
1754                     {
1755                         fprintf( stderr, "\n* ERR missing DecoderConfigDescr" );
1756                         es_descr.b_ok = 0;
1757                         break;
1758                     }
1759                     i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
1760
1761                     fprintf( stderr, "\n*   - DecoderConfigDesc length:%d", i_decoderConfigDescr_length );
1762 #define dec_descr   es_descr.dec_descr
1763                     dec_descr.i_objectTypeIndication = IODGetByte( &i_data, &p_data );
1764                     i_flags = IODGetByte( &i_data, &p_data );
1765                     dec_descr.i_streamType = i_flags >> 2;
1766                     dec_descr.b_upStream = ( i_flags >> 1 )&0x01;
1767                     dec_descr.i_bufferSizeDB = IODGet3Bytes( &i_data, &p_data );
1768                     dec_descr.i_maxBitrate = IODGetDWord( &i_data, &p_data );
1769                     dec_descr.i_avgBitrate = IODGetDWord( &i_data, &p_data );
1770                     fprintf( stderr, "\n*     * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication  );
1771                     fprintf( stderr, "\n*     * streamType:0x%x", dec_descr.i_streamType );
1772                     fprintf( stderr, "\n*     * upStream:%d", dec_descr.b_upStream );
1773                     fprintf( stderr, "\n*     * bufferSizeDB:%d", dec_descr.i_bufferSizeDB );
1774                     fprintf( stderr, "\n*     * maxBitrate:%d", dec_descr.i_maxBitrate );
1775                     fprintf( stderr, "\n*     * avgBitrate:%d", dec_descr.i_avgBitrate );
1776                     if( i_decoderConfigDescr_length > 13 && IODGetByte( &i_data, &p_data ) == 0x05 )
1777                     {
1778                         int i;
1779                         dec_descr.i_decoder_specific_info_len =
1780                             IODDescriptorLength( &i_data, &p_data );
1781                         if( dec_descr.i_decoder_specific_info_len > 0 )
1782                         {
1783                             dec_descr.p_decoder_specific_info =
1784                                 malloc( dec_descr.i_decoder_specific_info_len );
1785                         }
1786                         for( i = 0; i < dec_descr.i_decoder_specific_info_len; i++ )
1787                         {
1788                             dec_descr.p_decoder_specific_info[i] = IODGetByte( &i_data, &p_data );
1789                         }
1790                     }
1791                     else
1792                     {
1793                         dec_descr.i_decoder_specific_info_len = 0;
1794                         dec_descr.p_decoder_specific_info = NULL;
1795                     }
1796                 }
1797 #undef  dec_descr
1798 #define sl_descr    es_descr.sl_descr
1799                 {
1800                     int i_SLConfigDescr_length;
1801                     int i_predefined;
1802
1803                     if( IODGetByte( &i_data, &p_data ) != 0x06 )
1804                     {
1805                         fprintf( stderr, "\n* ERR missing SLConfigDescr" );
1806                         es_descr.b_ok = 0;
1807                         break;
1808                     }
1809                     i_SLConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
1810
1811                     fprintf( stderr, "\n*   - SLConfigDescr length:%d", i_SLConfigDescr_length );
1812                     i_predefined = IODGetByte( &i_data, &p_data );
1813                     fprintf( stderr, "\n*     * i_predefined:0x%x", i_predefined  );
1814                     switch( i_predefined )
1815                     {
1816                         case 0x01:
1817                             {
1818                                 sl_descr.b_useAccessUnitStartFlag   = 0;
1819                                 sl_descr.b_useAccessUnitEndFlag     = 0;
1820                                 sl_descr.b_useRandomAccessPointFlag = 0;
1821                                 //sl_descr.b_useRandomAccessUnitsOnlyFlag = 0;
1822                                 sl_descr.b_usePaddingFlag           = 0;
1823                                 sl_descr.b_useTimeStampsFlags       = 0;
1824                                 sl_descr.b_useIdleFlag              = 0;
1825                                 sl_descr.b_durationFlag     = 0;    // FIXME FIXME
1826                                 sl_descr.i_timeStampResolution      = 1000;
1827                                 sl_descr.i_OCRResolution    = 0;    // FIXME FIXME
1828                                 sl_descr.i_timeStampLength          = 32;
1829                                 sl_descr.i_OCRLength        = 0;    // FIXME FIXME
1830                                 sl_descr.i_AU_Length                = 0;
1831                                 sl_descr.i_instantBitrateLength= 0; // FIXME FIXME
1832                                 sl_descr.i_degradationPriorityLength= 0;
1833                                 sl_descr.i_AU_seqNumLength          = 0;
1834                                 sl_descr.i_packetSeqNumLength       = 0;
1835                                 if( sl_descr.b_durationFlag )
1836                                 {
1837                                     sl_descr.i_timeScale            = 0;    // FIXME FIXME
1838                                     sl_descr.i_accessUnitDuration   = 0;    // FIXME FIXME
1839                                     sl_descr.i_compositionUnitDuration= 0;    // FIXME FIXME
1840                                 }
1841                                 if( !sl_descr.b_useTimeStampsFlags )
1842                                 {
1843                                     sl_descr.i_startDecodingTimeStamp   = 0;    // FIXME FIXME
1844                                     sl_descr.i_startCompositionTimeStamp= 0;    // FIXME FIXME
1845                                 }
1846                             }
1847                             break;
1848                         default:
1849                             fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" );
1850                             es_descr.b_ok = 0;
1851                             break;
1852                     }
1853                 }
1854                 break;
1855 #undef  sl_descr
1856 #undef  es_descr
1857             default:
1858                 fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length );
1859                 break;
1860         }
1861
1862         p_data = p_data_sav + i_length;
1863         i_data = i_data_sav - i_length;
1864         i_es_index++;
1865     }
1866
1867
1868     fprintf( stderr, "\n*****************************\n" );
1869     return p_iod;
1870 }
1871
1872 static void IODFree( iod_descriptor_t *p_iod )
1873 {
1874     int i;
1875
1876     if( p_iod->psz_url )
1877     {
1878         free( p_iod->psz_url );
1879         p_iod->psz_url = NULL;
1880         free( p_iod );
1881         return;
1882     }
1883
1884     for( i = 0; i < 255; i++ )
1885     {
1886 #define es_descr p_iod->es_descr[i]
1887         if( es_descr.b_ok )
1888         {
1889             if( es_descr.psz_url )
1890             {
1891                 free( es_descr.psz_url );
1892                 es_descr.psz_url = NULL;
1893             }
1894             else
1895             {
1896                 if( es_descr.dec_descr.p_decoder_specific_info != NULL )
1897                 {
1898                     free( es_descr.dec_descr.p_decoder_specific_info );
1899                     es_descr.dec_descr.p_decoder_specific_info = NULL;
1900                     es_descr.dec_descr.i_decoder_specific_info_len = 0;
1901                 }
1902             }
1903         }
1904         es_descr.b_ok = 0;
1905 #undef  es_descr
1906     }
1907     free( p_iod );
1908 }
1909
1910 /****************************************************************************
1911  ****************************************************************************
1912  ** libdvbpsi callbacks
1913  ****************************************************************************
1914  ****************************************************************************/
1915 static vlc_bool_t DVBProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm )
1916 {
1917     demux_sys_t          *p_sys = p_demux->p_sys;
1918
1919     if ( !p_sys->b_dvb_control ) return VLC_FALSE;
1920     if ( p_sys->i_dvb_program == -1 && p_sys->p_programs_list == NULL )
1921         return VLC_TRUE;
1922     if ( p_sys->i_dvb_program == i_pgrm ) return VLC_TRUE;
1923
1924     if ( p_sys->p_programs_list != NULL )
1925     {
1926         int i;
1927         for ( i = 0; i < p_sys->p_programs_list->i_count; i++ )
1928         {
1929             if ( i_pgrm == p_sys->p_programs_list->p_values[i].i_int )
1930                 return VLC_TRUE;
1931         }
1932     }
1933     return VLC_FALSE;
1934 }
1935
1936 static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
1937 {
1938     demux_sys_t          *p_sys = p_demux->p_sys;
1939     dvbpsi_descriptor_t  *p_dr;
1940     dvbpsi_pmt_es_t      *p_es;
1941
1942     ts_pid_t             *pmt = NULL;
1943     ts_prg_psi_t         *prg = NULL;
1944
1945     ts_pid_t             **pp_clean = NULL;
1946     int                  i_clean = 0, i;
1947
1948     msg_Dbg( p_demux, "PMTCallBack called" );
1949
1950     /* First find this PMT declared in PAT */
1951     for( i = 0; i < p_sys->i_pmt; i++ )
1952     {
1953         int i_prg;
1954         for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
1955         {
1956             if( p_sys->pmt[i]->psi->prg[i_prg]->i_number ==
1957                 p_pmt->i_program_number )
1958             {
1959                 pmt = p_sys->pmt[i];
1960                 prg = p_sys->pmt[i]->psi->prg[i_prg];
1961                 break;
1962             }
1963         }
1964         if( pmt ) break;
1965     }
1966
1967     if( pmt == NULL )
1968     {
1969         msg_Warn( p_demux, "unreferenced program (broken stream)" );
1970         dvbpsi_DeletePMT(p_pmt);
1971         return;
1972     }
1973
1974     if( prg->i_version != -1 &&
1975         ( !p_pmt->b_current_next || prg->i_version == p_pmt->i_version ) )
1976     {
1977         dvbpsi_DeletePMT( p_pmt );
1978         return;
1979     }
1980
1981     /* Clean this program (remove all es) */
1982     for( i = 0; i < 8192; i++ )
1983     {
1984         ts_pid_t *pid = &p_sys->pid[i];
1985
1986         if( pid->b_valid && pid->p_owner == pmt->psi &&
1987             pid->i_owner_number == prg->i_number && pid->psi == NULL )
1988         {
1989             TAB_APPEND( i_clean, pp_clean, pid );
1990         }
1991     }
1992     if( prg->iod )
1993     {
1994         IODFree( prg->iod );
1995         prg->iod = NULL;
1996     }
1997
1998     msg_Dbg( p_demux, "new PMT program number=%d version=%d pid_pcr=%d",
1999              p_pmt->i_program_number, p_pmt->i_version, p_pmt->i_pcr_pid );
2000     prg->i_pid_pcr = p_pmt->i_pcr_pid;
2001     prg->i_version = p_pmt->i_version;
2002
2003     if( DVBProgramIsSelected( p_demux, prg->i_number ) )
2004     {
2005         /* Set demux filter */
2006         stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
2007                         ACCESS_SET_PRIVATE_ID_STATE, prg->i_pid_pcr,
2008                         VLC_TRUE );
2009     }
2010     else if ( p_sys->b_dvb_control )
2011     {
2012         msg_Warn( p_demux, "skipping program (not selected)" );
2013         dvbpsi_DeletePMT(p_pmt);
2014         return;
2015     }
2016
2017     /* Parse descriptor */
2018     for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next )
2019     {
2020         if( p_dr->i_tag == 0x1d )
2021         {
2022             /* We have found an IOD descriptor */
2023             msg_Dbg( p_demux, " * descriptor : IOD (0x1d)" );
2024
2025             prg->iod = IODNew( p_dr->i_length, p_dr->p_data );
2026         }
2027         else if( p_dr->i_tag == 0x9 )
2028         {
2029             uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8)
2030                                 | p_dr->p_data[1];
2031             msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", i_sysid );
2032         }
2033         else
2034         {
2035             msg_Dbg( p_demux, " * descriptor : unknown (0x%x)", p_dr->i_tag );
2036         }
2037     }
2038
2039     for( p_es = p_pmt->p_first_es; p_es != NULL; p_es = p_es->p_next )
2040     {
2041         ts_pid_t tmp_pid, *old_pid = 0, *pid = &tmp_pid;
2042
2043         /* Find out if the PID was already declared */
2044         for( i = 0; i < i_clean; i++ )
2045         {
2046             if( pp_clean[i] == &p_sys->pid[p_es->i_pid] )
2047             {
2048                 old_pid = pp_clean[i];
2049                 break;
2050             }
2051         }
2052
2053         if( !old_pid && p_sys->pid[p_es->i_pid].b_valid )
2054         {
2055             msg_Warn( p_demux, "pmt error: pid=%d already defined",
2056                       p_es->i_pid );
2057             continue;
2058         }
2059
2060         PIDInit( pid, VLC_FALSE, pmt->psi );
2061         PIDFillFormat( pid, p_es->i_type );
2062         pid->i_owner_number = prg->i_number;
2063         pid->i_pid          = p_es->i_pid;
2064         pid->b_seen         = p_sys->pid[p_es->i_pid].b_seen;
2065
2066         if( p_es->i_type == 0x10 || p_es->i_type == 0x11 ||
2067             p_es->i_type == 0x12 )
2068         {
2069             /* MPEG-4 stream: search SL_DESCRIPTOR */
2070             dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;;
2071
2072             while( p_dr && ( p_dr->i_tag != 0x1f ) ) p_dr = p_dr->p_next;
2073
2074             if( p_dr && p_dr->i_length == 2 )
2075             {
2076                 int i_es_id = ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1];
2077
2078                 msg_Warn( p_demux, "found SL_descriptor es_id=%d", i_es_id );
2079
2080                 pid->es->p_mpeg4desc = NULL;
2081
2082                 for( i = 0; i < 255; i++ )
2083                 {
2084                     iod_descriptor_t *iod = prg->iod;
2085
2086                     if( iod->es_descr[i].b_ok &&
2087                         iod->es_descr[i].i_es_id == i_es_id )
2088                     {
2089                         pid->es->p_mpeg4desc = &iod->es_descr[i];
2090                         break;
2091                     }
2092                 }
2093             }
2094
2095             if( pid->es->p_mpeg4desc != NULL )
2096             {
2097                 decoder_config_descriptor_t *dcd =
2098                     &pid->es->p_mpeg4desc->dec_descr;
2099
2100                 if( dcd->i_streamType == 0x04 )    /* VisualStream */
2101                 {
2102                     pid->es->fmt.i_cat = VIDEO_ES;
2103                     switch( dcd->i_objectTypeIndication )
2104                     {
2105                     case 0x0B: /* mpeg4 sub */
2106                         pid->es->fmt.i_cat = SPU_ES;
2107                         pid->es->fmt.i_codec = VLC_FOURCC('s','u','b','t');
2108                         break;
2109
2110                     case 0x20: /* mpeg4 */
2111                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','v');
2112                         break;
2113                     case 0x60:
2114                     case 0x61:
2115                     case 0x62:
2116                     case 0x63:
2117                     case 0x64:
2118                     case 0x65: /* mpeg2 */
2119                         pid->es->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
2120                         break;
2121                     case 0x6a: /* mpeg1 */
2122                         pid->es->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
2123                         break;
2124                     case 0x6c: /* mpeg1 */
2125                         pid->es->fmt.i_codec = VLC_FOURCC( 'j','p','e','g' );
2126                         break;
2127                     default:
2128                         pid->es->fmt.i_cat = UNKNOWN_ES;
2129                         break;
2130                     }
2131                 }
2132                 else if( dcd->i_streamType == 0x05 )    /* AudioStream */
2133                 {
2134                     pid->es->fmt.i_cat = AUDIO_ES;
2135                     switch( dcd->i_objectTypeIndication )
2136                     {
2137                     case 0x40: /* mpeg4 */
2138                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','a');
2139                         break;
2140                     case 0x66:
2141                     case 0x67:
2142                     case 0x68: /* mpeg2 aac */
2143                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','a');
2144                         break;
2145                     case 0x69: /* mpeg2 */
2146                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','g','a');
2147                         break;
2148                     case 0x6b: /* mpeg1 */
2149                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','g','a');
2150                         break;
2151                     default:
2152                         pid->es->fmt.i_cat = UNKNOWN_ES;
2153                         break;
2154                     }
2155                 }
2156                 else
2157                 {
2158                     pid->es->fmt.i_cat = UNKNOWN_ES;
2159                 }
2160
2161                 if( pid->es->fmt.i_cat != UNKNOWN_ES )
2162                 {
2163                     pid->es->fmt.i_extra = dcd->i_decoder_specific_info_len;
2164                     if( pid->es->fmt.i_extra > 0 )
2165                     {
2166                         pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra );
2167                         memcpy( pid->es->fmt.p_extra,
2168                                 dcd->p_decoder_specific_info,
2169                                 pid->es->fmt.i_extra );
2170                     }
2171                 }
2172             }
2173         }
2174         else if( p_es->i_type == 0x06 )
2175         {
2176             dvbpsi_descriptor_t *p_dr;
2177
2178             for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
2179                  p_dr = p_dr->p_next )
2180             {
2181                 msg_Dbg( p_demux, "  * es pid=%d type=%d dr->i_tag=0x%x",
2182                          p_es->i_pid, p_es->i_type, p_dr->i_tag );
2183
2184                 if( p_dr->i_tag == 0x6a )
2185                 {
2186                     pid->es->fmt.i_cat = AUDIO_ES;
2187                     pid->es->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
2188                 }
2189                 else if( p_dr->i_tag == 0x05 )
2190                 {
2191
2192                     /* DTS registration descriptor (ETSI TS 101 154 Annex F) */
2193                     pid->es->fmt.i_cat = AUDIO_ES;
2194                     pid->es->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
2195                 }
2196                 else if( p_dr->i_tag == 0x73 )
2197                 {
2198                     /* DTS audio descriptor (ETSI TS 101 154 Annex F) */
2199                     msg_Dbg( p_demux, "   * DTS audio descriptor not decoded" );
2200                     pid->es->fmt.i_cat = AUDIO_ES;
2201                     pid->es->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
2202                 }
2203                 else if( p_dr->i_tag == 0x45 )
2204                 {
2205                     msg_Dbg( p_demux, "   * VBI Data descriptor" );
2206                     pid->es->fmt.i_cat = SPU_ES;
2207                     pid->es->fmt.i_codec = VLC_FOURCC( 'v', 'b', 'i', 'd' );
2208                     pid->es->fmt.psz_description = strdup( "VBI Data" );
2209                     pid->es->fmt.i_extra = p_dr->i_length;
2210                     pid->es->fmt.p_extra = malloc( p_dr->i_length );
2211                     memcpy( pid->es->fmt.p_extra, p_dr->p_data,
2212                             p_dr->i_length );
2213                 }
2214                 else if( p_dr->i_tag == 0x46 )
2215                 {
2216                     msg_Dbg( p_demux, "  * VBI Teletext descriptor" );
2217                     pid->es->fmt.i_cat = SPU_ES;
2218                     pid->es->fmt.i_codec = VLC_FOURCC( 'v', 'b', 'i', 't' );
2219                     pid->es->fmt.psz_description = strdup( "VBI Teletext" );
2220                     pid->es->fmt.i_extra = p_dr->i_length;
2221                     pid->es->fmt.p_extra = malloc( p_dr->i_length );
2222                     memcpy( pid->es->fmt.p_extra, p_dr->p_data,
2223                             p_dr->i_length );
2224                 }
2225                 else if( p_dr->i_tag == 0x56 )
2226                 {
2227                     msg_Dbg( p_demux, "   * EBU Teletext descriptor" );
2228                     pid->es->fmt.i_cat = SPU_ES;
2229                     pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' );
2230                     pid->es->fmt.psz_description = strdup( "Teletext" );
2231                     pid->es->fmt.i_extra = p_dr->i_length;
2232                     pid->es->fmt.p_extra = malloc( p_dr->i_length );
2233                     memcpy( pid->es->fmt.p_extra, p_dr->p_data,
2234                             p_dr->i_length );
2235                 }
2236 #ifdef _DVBPSI_DR_59_H_
2237                 else if( p_dr->i_tag == 0x59 )
2238                 {
2239                     uint16_t n;
2240                     dvbpsi_subtitling_dr_t *sub;
2241
2242                     /* DVB subtitles */
2243                     pid->es->fmt.i_cat = SPU_ES;
2244                     pid->es->fmt.i_codec = VLC_FOURCC( 'd', 'v', 'b', 's' );
2245                     pid->es->fmt.i_group = p_pmt->i_program_number;
2246
2247                     sub = dvbpsi_DecodeSubtitlingDr( p_dr );
2248                     if( !sub ) continue;
2249
2250                     /* Each subtitle ES contains n languages,
2251                      * We are going to create n ES for the n tracks */
2252                     if( sub->i_subtitles_number > 0 )
2253                     {
2254                         pid->es->fmt.psz_language = malloc( 4 );
2255                         memcpy( pid->es->fmt.psz_language,
2256                                 sub->p_subtitle[0].i_iso6392_language_code, 3);
2257                         pid->es->fmt.psz_language[3] = 0;
2258
2259                         pid->es->fmt.subs.dvb.i_id =
2260                             sub->p_subtitle[0].i_composition_page_id;
2261                         /* Hack, FIXME */
2262                         pid->es->fmt.subs.dvb.i_id |=
2263                           ((int)sub->p_subtitle[0].i_ancillary_page_id << 16);
2264                     }
2265                     else pid->es->fmt.i_cat = UNKNOWN_ES;
2266
2267                     for( n = 1; n < sub->i_subtitles_number; n++ )
2268                     {
2269                         ts_es_t *p_es = malloc( sizeof( ts_es_t ) );
2270                         p_es->fmt = pid->es->fmt;
2271                         p_es->id = NULL;
2272                         p_es->p_pes = NULL;
2273                         p_es->i_pes_size = 0;
2274                         p_es->i_pes_gathered = 0;
2275                         p_es->pp_last = &p_es->p_pes;
2276                         p_es->p_mpeg4desc = NULL;
2277
2278                         p_es->fmt.psz_language = malloc( 4 );
2279                         memcpy( p_es->fmt.psz_language,
2280                                 sub->p_subtitle[n].i_iso6392_language_code, 3);
2281                         p_es->fmt.psz_language[3] = 0;
2282
2283                         p_es->fmt.subs.dvb.i_id =
2284                             sub->p_subtitle[n].i_composition_page_id;
2285                         /* Hack, FIXME */
2286                         pid->es->fmt.subs.dvb.i_id |=
2287                           ((int)sub->p_subtitle[n].i_ancillary_page_id << 16);
2288
2289                         TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es );
2290                     }
2291                 }
2292 #endif /* _DVBPSI_DR_59_H_ */
2293             }
2294         }
2295         else if( p_es->i_type == 0xa0 )
2296         {
2297             /* MSCODEC sent by vlc */
2298             dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
2299
2300             while( p_dr && ( p_dr->i_tag != 0xa0 ) ) p_dr = p_dr->p_next;
2301
2302             if( p_dr && p_dr->i_length >= 8 )
2303             {
2304                 pid->es->fmt.i_cat = VIDEO_ES;
2305                 pid->es->fmt.i_codec =
2306                     VLC_FOURCC( p_dr->p_data[0], p_dr->p_data[1],
2307                                 p_dr->p_data[2], p_dr->p_data[3] );
2308                 pid->es->fmt.video.i_width =
2309                     ( p_dr->p_data[4] << 8 ) | p_dr->p_data[5];
2310                 pid->es->fmt.video.i_height =
2311                     ( p_dr->p_data[6] << 8 ) | p_dr->p_data[7];
2312                 pid->es->fmt.i_extra =
2313                     (p_dr->p_data[8] << 8) | p_dr->p_data[9];
2314
2315                 if( pid->es->fmt.i_extra > 0 )
2316                 {
2317                     pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra );
2318                     memcpy( pid->es->fmt.p_extra, &p_dr->p_data[10],
2319                             pid->es->fmt.i_extra );
2320                 }
2321             }
2322             else
2323             {
2324                 msg_Warn( p_demux, "private MSCODEC (vlc) without bih private "
2325                           "descriptor" );
2326             }
2327             /* For such stream we will gather them ourself and don't launch a
2328              * packetizer.
2329              * Yes it's ugly but it's the only way to have DIV3 working */
2330             pid->es->fmt.b_packetized = VLC_TRUE;
2331         }
2332
2333         if( pid->es->fmt.i_cat == AUDIO_ES ||
2334             ( pid->es->fmt.i_cat == SPU_ES &&
2335               pid->es->fmt.i_codec != VLC_FOURCC('d','v','b','s') ) )
2336         {
2337             /* get language descriptor */
2338             dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
2339             while( p_dr && ( p_dr->i_tag != 0x0a ) ) p_dr = p_dr->p_next;
2340
2341             if( p_dr )
2342             {
2343                 dvbpsi_iso639_dr_t *p_decoded = dvbpsi_DecodeISO639Dr( p_dr );
2344
2345                 if( p_decoded )
2346                 {
2347                     pid->es->fmt.psz_language = malloc( 4 );
2348                     memcpy( pid->es->fmt.psz_language,
2349                             p_decoded->i_iso_639_code, 3 );
2350                     pid->es->fmt.psz_language[3] = 0;
2351                 }
2352             }
2353         }
2354
2355         pid->es->fmt.i_group = p_pmt->i_program_number;
2356         if( pid->es->fmt.i_cat == UNKNOWN_ES )
2357         {
2358             msg_Dbg( p_demux, "  * es pid=%d type=%d *unknown*",
2359                      p_es->i_pid, p_es->i_type );
2360         }
2361         else if( !p_sys->b_udp_out )
2362         {
2363             msg_Dbg( p_demux, "  * es pid=%d type=%d fcc=%4.4s",
2364                      p_es->i_pid, p_es->i_type, (char*)&pid->es->fmt.i_codec );
2365
2366             if( p_sys->b_es_id_pid ) pid->es->fmt.i_id = p_es->i_pid;
2367
2368             /* Check if we can avoid restarting the ES */
2369             if( old_pid &&
2370                 pid->es->fmt.i_codec == old_pid->es->fmt.i_codec &&
2371                 pid->es->fmt.i_extra == old_pid->es->fmt.i_extra &&
2372                 pid->es->fmt.i_extra == 0 &&
2373                 pid->i_extra_es == old_pid->i_extra_es &&
2374                 ( ( !pid->es->fmt.psz_language &&
2375                     !old_pid->es->fmt.psz_language ) ||
2376                   ( pid->es->fmt.psz_language &&
2377                     old_pid->es->fmt.psz_language &&
2378                     !strcmp( pid->es->fmt.psz_language,
2379                              old_pid->es->fmt.psz_language ) ) ) )
2380             {
2381                 pid->es->id = old_pid->es->id;
2382                 old_pid->es->id = NULL;
2383                 for( i = 0; i < pid->i_extra_es; i++ )
2384                 {
2385                     pid->extra_es[i]->id = old_pid->extra_es[i]->id;
2386                     old_pid->extra_es[i]->id = NULL;
2387                 }
2388             }
2389             else
2390             {
2391                 if( old_pid )
2392                 {
2393                     PIDClean( p_demux->out, old_pid );
2394                     TAB_REMOVE( i_clean, pp_clean, old_pid );
2395                     old_pid = 0;
2396                 }
2397
2398                 pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt );
2399                 for( i = 0; i < pid->i_extra_es; i++ )
2400                 {
2401                     pid->extra_es[i]->id =
2402                         es_out_Add( p_demux->out, &pid->extra_es[i]->fmt );
2403                 }
2404             }
2405         }
2406
2407         /* Add ES to the list */
2408         if( old_pid )
2409         {
2410             PIDClean( p_demux->out, old_pid );
2411             TAB_REMOVE( i_clean, pp_clean, old_pid );
2412         }
2413         p_sys->pid[p_es->i_pid] = *pid;
2414
2415         for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
2416              p_dr = p_dr->p_next )
2417         {
2418             if( p_dr->i_tag == 0x9 )
2419             {
2420                 uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8)
2421                                     | p_dr->p_data[1];
2422                 msg_Dbg( p_demux, "   * descriptor : CA (0x9) SysID 0x%x",
2423                          i_sysid );
2424             }
2425         }
2426
2427         if( DVBProgramIsSelected( p_demux, prg->i_number ) )
2428         {
2429             /* Set demux filter */
2430             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
2431                             ACCESS_SET_PRIVATE_ID_STATE, p_es->i_pid,
2432                             VLC_TRUE );
2433         }
2434     }
2435
2436     if( DVBProgramIsSelected( p_demux, prg->i_number ) )
2437     {
2438         /* Set CAM descrambling */
2439         stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
2440                         ACCESS_SET_PRIVATE_ID_CA, p_pmt );
2441     }
2442     else
2443     {
2444         dvbpsi_DeletePMT( p_pmt );
2445     }
2446
2447     for ( i = 0; i < i_clean; i++ )
2448     {
2449         if( DVBProgramIsSelected( p_demux, prg->i_number ) )
2450         {
2451             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
2452                             ACCESS_SET_PRIVATE_ID_STATE, pp_clean[i]->i_pid,
2453                             VLC_FALSE );
2454         }
2455
2456         PIDClean( p_demux->out, pp_clean[i] );
2457     }
2458     if( i_clean ) free( pp_clean );
2459 }
2460
2461 static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
2462 {
2463     demux_sys_t          *p_sys = p_demux->p_sys;
2464     dvbpsi_pat_program_t *p_program;
2465     ts_pid_t             *pat = &p_sys->pid[0];
2466     int                  i, j;
2467
2468     msg_Dbg( p_demux, "PATCallBack called" );
2469
2470     if( pat->psi->i_pat_version != -1 &&
2471         ( !p_pat->b_current_next ||
2472           p_pat->i_version == pat->psi->i_pat_version ) )
2473     {
2474         dvbpsi_DeletePAT( p_pat );
2475         return;
2476     }
2477
2478     msg_Dbg( p_demux, "new PAT ts_id=%d version=%d current_next=%d",
2479              p_pat->i_ts_id, p_pat->i_version, p_pat->b_current_next );
2480
2481     /* Clean old */
2482     if( p_sys->i_pmt > 0 )
2483     {
2484         int      i_pmt_rm = 0;
2485         ts_pid_t **pmt_rm = NULL;
2486
2487         /* Search pmt to be deleted */
2488         for( i = 0; i < p_sys->i_pmt; i++ )
2489         {
2490             ts_pid_t *pmt = p_sys->pmt[i];
2491             vlc_bool_t b_keep = VLC_FALSE;
2492
2493             for( p_program = p_pat->p_first_program; p_program != NULL;
2494                  p_program = p_program->p_next )
2495             {
2496                 if( p_program->i_pid == pmt->i_pid )
2497                 {
2498                     int i_prg;
2499                     for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
2500                     {
2501                         if( p_program->i_number ==
2502                             pmt->psi->prg[i_prg]->i_number )
2503                         {
2504                             b_keep = VLC_TRUE;
2505                             break;
2506                         }
2507                     }
2508                     if( b_keep ) break;
2509                 }
2510             }
2511
2512             if( !b_keep )
2513             {
2514                 TAB_APPEND( i_pmt_rm, pmt_rm, pmt );
2515             }
2516         }
2517
2518         /* Delete all ES attached to thoses PMT */
2519         for( i = 2; i < 8192; i++ )
2520         {
2521             ts_pid_t *pid = &p_sys->pid[i];
2522
2523             if( !pid->b_valid || pid->psi ) continue;
2524
2525             for( j = 0; j < i_pmt_rm; j++ )
2526             {
2527                 int i_prg;
2528                 for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
2529                 {
2530                     /* We only remove es that aren't defined by extra pmt */
2531                     if( pid->p_owner->prg[i_prg]->i_pid_pmt !=
2532                         pmt_rm[j]->i_pid ) continue;
2533
2534                     if( p_sys->b_dvb_control && pid->es->id )
2535                     {
2536                         if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
2537                                             ACCESS_SET_PRIVATE_ID_STATE, i,
2538                                             VLC_FALSE ) )
2539                             p_sys->b_dvb_control = VLC_FALSE;
2540                     }
2541
2542                     PIDClean( p_demux->out, pid );
2543                     break;
2544                 }
2545
2546                 if( !pid->b_valid ) break;
2547             }
2548         }
2549
2550         /* Delete PMT pid */
2551         for( i = 0; i < i_pmt_rm; i++ )
2552         {
2553             if( p_sys->b_dvb_control )
2554             {
2555                 if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
2556                                     ACCESS_SET_PRIVATE_ID_STATE,
2557                                     pmt_rm[i]->i_pid, VLC_FALSE ) )
2558                     p_sys->b_dvb_control = VLC_FALSE;
2559             }
2560
2561             PIDClean( p_demux->out, &p_sys->pid[pmt_rm[i]->i_pid] );
2562             TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] );
2563         }
2564
2565         if( pmt_rm ) free( pmt_rm );
2566     }
2567
2568     /* now create programs */
2569     for( p_program = p_pat->p_first_program; p_program != NULL;
2570          p_program = p_program->p_next )
2571     {
2572         msg_Dbg( p_demux, "  * number=%d pid=%d", p_program->i_number,
2573                  p_program->i_pid );
2574         if( p_program->i_number != 0 )
2575         {
2576             ts_pid_t *pmt = &p_sys->pid[p_program->i_pid];
2577             vlc_bool_t b_add = VLC_TRUE;
2578
2579             if( pmt->b_valid )
2580             {
2581                 int i_prg;
2582                 for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
2583                 {
2584                     if( pmt->psi->prg[i_prg]->i_number == p_program->i_number )
2585                     {
2586                         b_add = VLC_FALSE;
2587                         break;
2588                     }
2589                 }
2590             }
2591             else
2592             {
2593                 TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt );
2594             }
2595
2596             if( b_add )
2597             {
2598                 PIDInit( pmt, VLC_TRUE, pat->psi );
2599                 pmt->psi->prg[pmt->psi->i_prg-1]->handle =
2600                     dvbpsi_AttachPMT( p_program->i_number,
2601                                       (dvbpsi_pmt_callback)PMTCallBack,
2602                                       p_demux );
2603                 pmt->psi->prg[pmt->psi->i_prg-1]->i_number =
2604                     p_program->i_number;
2605                 pmt->psi->prg[pmt->psi->i_prg-1]->i_pid_pmt =
2606                     p_program->i_pid;
2607
2608                 /* Now select PID at access level */
2609                 if( p_sys->b_dvb_control )
2610                 {
2611                     if( DVBProgramIsSelected( p_demux, p_program->i_number ) )
2612                     {
2613                         if( p_sys->i_dvb_program == 0 )
2614                             p_sys->i_dvb_program = p_program->i_number;
2615
2616                         if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, p_program->i_pid, VLC_TRUE ) )
2617                             p_sys->b_dvb_control = VLC_FALSE;
2618                     }
2619                     else
2620                     {
2621                         if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, p_program->i_pid, VLC_FALSE ) )
2622                             p_sys->b_dvb_control = VLC_FALSE;
2623                     }
2624                 }
2625             }
2626         }
2627     }
2628     pat->psi->i_pat_version = p_pat->i_version;
2629
2630     dvbpsi_DeletePAT( p_pat );
2631 }
2632