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