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