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