]> git.sesse.net Git - vlc/blob - modules/demux/ts.c
Do not filter out program/epg at the TS demuxer level.
[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, NULL, PMT_TEXT, PMT_LONGTEXT, true )
170     add_bool( "ts-es-id-pid", true, NULL, PID_TEXT, PID_LONGTEXT, true )
171     add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true )
172     add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT,
173                  MTUOUT_LONGTEXT, true )
174     add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true )
175     add_string( "ts-csa2-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true )
176     add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true )
177     add_bool( "ts-silent", false, NULL, SILENT_TEXT, SILENT_LONGTEXT, true )
178
179     add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, false )
180     add_bool( "ts-dump-append", false, NULL, APPEND_TEXT, APPEND_LONGTEXT, false )
181     add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT,
182                  DUMPSIZE_LONGTEXT, true )
183     add_bool( "ts-split-es", true, NULL, 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 )
1286         {
1287             if( i_int != p_sys->i_current_program )
1288             {
1289                 SetPrgFilter( p_demux, p_sys->i_current_program, false );
1290
1291                 p_sys->i_current_program = i_int;
1292                 SetPrgFilter( p_demux, p_sys->i_current_program, true );
1293             }
1294         }
1295         else
1296         {
1297             p_sys->i_current_program = -1;
1298             p_sys->programs_list.i_count = 0;
1299             if( p_list )
1300             {
1301                 vlc_list_t *p_dst = &p_sys->programs_list;
1302                 free( p_dst->p_values );
1303
1304                 p_dst->p_values = calloc( p_list->i_count,
1305                                           sizeof(*p_dst->p_values) );
1306                 if( p_dst->p_values )
1307                 {
1308                     p_dst->i_count = p_list->i_count;
1309                     for( int i = 0; i < p_list->i_count; i++ )
1310                         p_dst->p_values[i] = p_list->p_values[i];
1311                 }
1312             }
1313         }
1314         return VLC_SUCCESS;
1315     }
1316
1317     case DEMUX_CAN_RECORD:
1318         pb_bool = (bool*)va_arg( args, bool * );
1319         *pb_bool = true;
1320         return VLC_SUCCESS;
1321
1322     case DEMUX_SET_RECORD_STATE:
1323         b_bool = (bool)va_arg( args, int );
1324
1325         if( !b_bool )
1326             stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, false );
1327         p_sys->b_start_record = b_bool;
1328         return VLC_SUCCESS;
1329
1330     case DEMUX_GET_FPS:
1331     case DEMUX_SET_TIME:
1332     default:
1333         return VLC_EGENERIC;
1334     }
1335 }
1336
1337 /*****************************************************************************
1338  *
1339  *****************************************************************************/
1340 static int UserPmt( demux_t *p_demux, const char *psz_fmt )
1341 {
1342     demux_sys_t *p_sys = p_demux->p_sys;
1343     char *psz_dup = strdup( psz_fmt );
1344     char *psz = psz_dup;
1345     int  i_pid;
1346     int  i_number;
1347
1348     if( !psz_dup )
1349         return VLC_ENOMEM;
1350
1351     /* Parse PID */
1352     i_pid = strtol( psz, &psz, 0 );
1353     if( i_pid < 2 || i_pid >= 8192 )
1354         goto error;
1355
1356     /* Parse optional program number */
1357     i_number = 0;
1358     if( *psz == ':' )
1359         i_number = strtol( &psz[1], &psz, 0 );
1360
1361     /* */
1362     ts_pid_t *pmt = &p_sys->pid[i_pid];
1363     ts_prg_psi_t *prg;
1364
1365     msg_Dbg( p_demux, "user pmt specified (pid=%d,number=%d)", i_pid, i_number );
1366     PIDInit( pmt, true, NULL );
1367
1368     /* Dummy PMT */
1369     prg = malloc( sizeof( ts_prg_psi_t ) );
1370     if( !prg )
1371         goto error;
1372
1373     memset( prg, 0, sizeof( ts_prg_psi_t ) );
1374     prg->i_pid_pcr  = -1;
1375     prg->i_pid_pmt  = -1;
1376     prg->i_version  = -1;
1377     prg->i_number   = i_number != 0 ? i_number : TS_USER_PMT_NUMBER;
1378     prg->handle     = dvbpsi_AttachPMT( i_number != TS_USER_PMT_NUMBER ? i_number : 1, (dvbpsi_pmt_callback)PMTCallBack, p_demux );
1379     TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg );
1380
1381     psz = strchr( psz, '=' );
1382     if( psz )
1383         psz++;
1384     while( psz && *psz )
1385     {
1386         char *psz_next = strchr( psz, ',' );
1387         int i_pid;
1388
1389         if( psz_next )
1390             *psz_next++ = '\0';
1391
1392         i_pid = strtol( psz, &psz, 0 );
1393         if( *psz != ':' || i_pid < 2 || i_pid >= 8192 )
1394             goto next;
1395
1396         char *psz_opt = &psz[1];
1397         if( !strcmp( psz_opt, "pcr" ) )
1398         {
1399             prg->i_pid_pcr = i_pid;
1400         }
1401         else if( !p_sys->pid[i_pid].b_valid )
1402         {
1403             ts_pid_t *pid = &p_sys->pid[i_pid];
1404
1405             char *psz_arg = strchr( psz_opt, '=' );
1406             if( psz_arg )
1407                 *psz_arg++ = '\0';
1408
1409             PIDInit( pid, false, pmt->psi);
1410             if( prg->i_pid_pcr <= 0 )
1411                 prg->i_pid_pcr = i_pid;
1412
1413             if( psz_arg && strlen( psz_arg ) == 4 )
1414             {
1415                 const vlc_fourcc_t i_codec = VLC_FOURCC( psz_arg[0], psz_arg[1],
1416                                                          psz_arg[2], psz_arg[3] );
1417                 int i_cat = UNKNOWN_ES;
1418                 es_format_t *fmt = &pid->es->fmt;
1419
1420                 if( !strcmp( psz_opt, "video" ) )
1421                     i_cat = VIDEO_ES;
1422                 else if( !strcmp( psz_opt, "audio" ) )
1423                     i_cat = AUDIO_ES;
1424                 else if( !strcmp( psz_opt, "spu" ) )
1425                     i_cat = SPU_ES;
1426
1427                 es_format_Init( fmt, i_cat, i_codec );
1428                 fmt->b_packetized = false;
1429             }
1430             else
1431             {
1432                 const int i_stream_type = strtol( psz_opt, NULL, 0 );
1433                 PIDFillFormat( pid, i_stream_type );
1434             }
1435             pid->es->fmt.i_group = i_number;
1436             if( p_sys->b_es_id_pid )
1437                 pid->es->fmt.i_id = i_pid;
1438
1439             if( pid->es->fmt.i_cat != UNKNOWN_ES )
1440             {
1441                 msg_Dbg( p_demux, "  * es pid=%d fcc=%4.4s", i_pid,
1442                          (char*)&pid->es->fmt.i_codec );
1443                 pid->es->id = es_out_Add( p_demux->out,
1444                                           &pid->es->fmt );
1445                 p_sys->i_pmt_es++;
1446             }
1447         }
1448
1449     next:
1450         psz = psz_next;
1451     }
1452
1453     p_sys->b_user_pmt = true;
1454     TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt );
1455     free( psz_dup );
1456     return VLC_SUCCESS;
1457
1458 error:
1459     free( psz_dup );
1460     return VLC_EGENERIC;
1461 }
1462
1463 static int SetPIDFilter( demux_t *p_demux, int i_pid, bool b_selected )
1464 {
1465     demux_sys_t *p_sys = p_demux->p_sys;
1466
1467     if( !p_sys->b_access_control )
1468         return VLC_EGENERIC;
1469
1470     return stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1471                            ACCESS_SET_PRIVATE_ID_STATE, i_pid, b_selected );
1472 }
1473
1474 static void SetPrgFilter( demux_t *p_demux, int i_prg_id, bool b_selected )
1475 {
1476     demux_sys_t *p_sys = p_demux->p_sys;
1477     ts_prg_psi_t *p_prg = NULL;
1478     int i_pmt_pid = -1;
1479
1480     /* Search pmt to be unselected */
1481     for( int i = 0; i < p_sys->i_pmt; i++ )
1482     {
1483         ts_pid_t *pmt = p_sys->pmt[i];
1484
1485         for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
1486         {
1487             if( pmt->psi->prg[i_prg]->i_number == i_prg_id )
1488             {
1489                 i_pmt_pid = p_sys->pmt[i]->i_pid;
1490                 p_prg = p_sys->pmt[i]->psi->prg[i_prg];
1491                 break;
1492             }
1493         }
1494         if( i_pmt_pid > 0 )
1495             break;
1496     }
1497     if( i_pmt_pid <= 0 )
1498         return;
1499     assert( p_prg );
1500
1501     SetPIDFilter( p_demux, i_pmt_pid, b_selected );
1502     if( p_prg->i_pid_pcr > 0 )
1503         SetPIDFilter( p_demux, p_prg->i_pid_pcr, b_selected );
1504
1505     /* All ES */
1506     for( int i = 2; i < 8192; i++ )
1507     {
1508         ts_pid_t *pid = &p_sys->pid[i];
1509
1510         if( !pid->b_valid || pid->psi )
1511             continue;
1512
1513         for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
1514         {
1515             if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
1516             {
1517                 /* We only remove/select es that aren't defined by extra pmt */
1518                 SetPIDFilter( p_demux, i, b_selected );
1519                 break;
1520             }
1521         }
1522     }
1523 }
1524
1525 static void PIDInit( ts_pid_t *pid, bool b_psi, ts_psi_t *p_owner )
1526 {
1527     bool b_old_valid = pid->b_valid;
1528
1529     pid->b_valid    = true;
1530     pid->i_cc       = 0xff;
1531     pid->b_scrambled = false;
1532     pid->p_owner    = p_owner;
1533     pid->i_owner_number = 0;
1534
1535     TAB_INIT( pid->i_extra_es, pid->extra_es );
1536
1537     if( b_psi )
1538     {
1539         pid->es  = NULL;
1540
1541         if( !b_old_valid )
1542         {
1543             pid->psi = xmalloc( sizeof( ts_psi_t ) );
1544             if( pid->psi )
1545             {
1546                 pid->psi->handle = NULL;
1547                 TAB_INIT( pid->psi->i_prg, pid->psi->prg );
1548             }
1549         }
1550         assert( pid->psi );
1551
1552         pid->psi->i_pat_version  = -1;
1553         pid->psi->i_sdt_version  = -1;
1554         if( p_owner )
1555         {
1556             ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) );
1557             if( prg )
1558             {
1559                 /* PMT */
1560                 prg->i_version  = -1;
1561                 prg->i_number   = -1;
1562                 prg->i_pid_pcr  = -1;
1563                 prg->i_pid_pmt  = -1;
1564                 prg->iod        = NULL;
1565                 prg->handle     = NULL;
1566
1567                 TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg );
1568             }
1569         }
1570     }
1571     else
1572     {
1573         pid->psi = NULL;
1574         pid->es  = malloc( sizeof( ts_es_t ) );
1575         if( pid->es )
1576         {
1577             es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 );
1578             pid->es->id      = NULL;
1579             pid->es->p_pes   = NULL;
1580             pid->es->i_pes_size= 0;
1581             pid->es->i_pes_gathered= 0;
1582             pid->es->pp_last = &pid->es->p_pes;
1583             pid->es->p_mpeg4desc = NULL;
1584             pid->es->b_gather = false;
1585         }
1586     }
1587 }
1588
1589 static void PIDClean( demux_t *p_demux, ts_pid_t *pid )
1590 {
1591     demux_sys_t *p_sys = p_demux->p_sys;
1592     es_out_t *out = p_demux->out;
1593
1594     if( pid->psi )
1595     {
1596         if( pid->psi->handle )
1597             dvbpsi_DetachPMT( pid->psi->handle );
1598         for( int i = 0; i < pid->psi->i_prg; i++ )
1599         {
1600             if( pid->psi->prg[i]->iod )
1601                 IODFree( pid->psi->prg[i]->iod );
1602             if( pid->psi->prg[i]->handle )
1603                 dvbpsi_DetachPMT( pid->psi->prg[i]->handle );
1604             free( pid->psi->prg[i] );
1605         }
1606         free( pid->psi->prg );
1607         free( pid->psi );
1608     }
1609     else
1610     {
1611         if( pid->es->id )
1612         {
1613             es_out_Del( out, pid->es->id );
1614             p_sys->i_pmt_es--;
1615         }
1616
1617         if( pid->es->p_pes )
1618             block_ChainRelease( pid->es->p_pes );
1619
1620         es_format_Clean( &pid->es->fmt );
1621
1622         free( pid->es );
1623
1624         for( int i = 0; i < pid->i_extra_es; i++ )
1625         {
1626             if( pid->extra_es[i]->id )
1627             {
1628                 es_out_Del( out, pid->extra_es[i]->id );
1629                 p_sys->i_pmt_es--;
1630             }
1631
1632             if( pid->extra_es[i]->p_pes )
1633                 block_ChainRelease( pid->extra_es[i]->p_pes );
1634
1635             es_format_Clean( &pid->extra_es[i]->fmt );
1636
1637             free( pid->extra_es[i] );
1638         }
1639         if( pid->i_extra_es )
1640             free( pid->extra_es );
1641     }
1642
1643     pid->b_valid = false;
1644 }
1645
1646 /****************************************************************************
1647  * gathering stuff
1648  ****************************************************************************/
1649 static void ParsePES( demux_t *p_demux, ts_pid_t *pid )
1650 {
1651     block_t *p_pes = pid->es->p_pes;
1652     uint8_t header[34];
1653     unsigned i_pes_size = 0;
1654     unsigned i_skip = 0;
1655     mtime_t i_dts = -1;
1656     mtime_t i_pts = -1;
1657     mtime_t i_length = 0;
1658
1659     /* remove the pes from pid */
1660     pid->es->p_pes = NULL;
1661     pid->es->i_pes_size= 0;
1662     pid->es->i_pes_gathered= 0;
1663     pid->es->pp_last = &pid->es->p_pes;
1664
1665     /* FIXME find real max size */
1666     /* const int i_max = */ block_ChainExtract( p_pes, header, 34 );
1667     
1668     if( header[0] != 0 || header[1] != 0 || header[2] != 1 )
1669     {
1670         if( !p_demux->p_sys->b_silent )
1671             msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x] (pid: %d)",
1672                       header[0], header[1],header[2],header[3], pid->i_pid );
1673         block_ChainRelease( p_pes );
1674         return;
1675     }
1676
1677     /* TODO check size */
1678     switch( header[3] )
1679     {
1680     case 0xBC:  /* Program stream map */
1681     case 0xBE:  /* Padding */
1682     case 0xBF:  /* Private stream 2 */
1683     case 0xF0:  /* ECM */
1684     case 0xF1:  /* EMM */
1685     case 0xFF:  /* Program stream directory */
1686     case 0xF2:  /* DSMCC stream */
1687     case 0xF8:  /* ITU-T H.222.1 type E stream */
1688         i_skip = 6;
1689         break;
1690     default:
1691         if( ( header[6]&0xC0 ) == 0x80 )
1692         {
1693             /* mpeg2 PES */
1694             i_skip = header[8] + 9;
1695
1696             if( header[7]&0x80 )    /* has pts */
1697             {
1698                 i_pts = ((mtime_t)(header[ 9]&0x0e ) << 29)|
1699                          (mtime_t)(header[10] << 22)|
1700                         ((mtime_t)(header[11]&0xfe) << 14)|
1701                          (mtime_t)(header[12] << 7)|
1702                          (mtime_t)(header[13] >> 1);
1703
1704                 if( header[7]&0x40 )    /* has dts */
1705                 {
1706                      i_dts = ((mtime_t)(header[14]&0x0e ) << 29)|
1707                              (mtime_t)(header[15] << 22)|
1708                             ((mtime_t)(header[16]&0xfe) << 14)|
1709                              (mtime_t)(header[17] << 7)|
1710                              (mtime_t)(header[18] >> 1);
1711                 }
1712             }
1713         }
1714         else
1715         {
1716             i_skip = 6;
1717             while( i_skip < 23 && header[i_skip] == 0xff )
1718             {
1719                 i_skip++;
1720             }
1721             if( i_skip == 23 )
1722             {
1723                 msg_Err( p_demux, "too much MPEG-1 stuffing" );
1724                 block_ChainRelease( p_pes );
1725                 return;
1726             }
1727             if( ( header[i_skip] & 0xC0 ) == 0x40 )
1728             {
1729                 i_skip += 2;
1730             }
1731
1732             if(  header[i_skip]&0x20 )
1733             {
1734                  i_pts = ((mtime_t)(header[i_skip]&0x0e ) << 29)|
1735                           (mtime_t)(header[i_skip+1] << 22)|
1736                          ((mtime_t)(header[i_skip+2]&0xfe) << 14)|
1737                           (mtime_t)(header[i_skip+3] << 7)|
1738                           (mtime_t)(header[i_skip+4] >> 1);
1739
1740                 if( header[i_skip]&0x10 )    /* has dts */
1741                 {
1742                      i_dts = ((mtime_t)(header[i_skip+5]&0x0e ) << 29)|
1743                               (mtime_t)(header[i_skip+6] << 22)|
1744                              ((mtime_t)(header[i_skip+7]&0xfe) << 14)|
1745                               (mtime_t)(header[i_skip+8] << 7)|
1746                               (mtime_t)(header[i_skip+9] >> 1);
1747                      i_skip += 10;
1748                 }
1749                 else
1750                 {
1751                     i_skip += 5;
1752                 }
1753             }
1754             else
1755             {
1756                 i_skip += 1;
1757             }
1758         }
1759         break;
1760     }
1761
1762     if( pid->es->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', 'b' ) ||
1763         pid->es->fmt.i_codec == VLC_FOURCC( 'd', 't', 's', 'b' ) )
1764     {
1765         i_skip += 4;
1766     }
1767     else if( pid->es->fmt.i_codec == VLC_FOURCC( 'l', 'p', 'c', 'b' ) ||
1768              pid->es->fmt.i_codec == VLC_FOURCC( 's', 'p', 'u', 'b' ) ||
1769              pid->es->fmt.i_codec == VLC_FOURCC( 's', 'd', 'd', 'b' ) )
1770     {
1771         i_skip += 1;
1772     }
1773     else if( pid->es->fmt.i_codec == VLC_CODEC_SUBT &&
1774              pid->es->p_mpeg4desc )
1775     {
1776         decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr;
1777
1778         if( dcd->i_decoder_specific_info_len > 2 &&
1779             dcd->p_decoder_specific_info[0] == 0x10 &&
1780             ( dcd->p_decoder_specific_info[1]&0x10 ) )
1781         {
1782             /* display length */
1783             if( p_pes->i_buffer + 2 <= i_skip )
1784                 i_length = GetWBE( &p_pes->p_buffer[i_skip] );
1785
1786             i_skip += 2;
1787         }
1788         if( p_pes->i_buffer + 2 <= i_skip )
1789             i_pes_size = GetWBE( &p_pes->p_buffer[i_skip] );
1790         /* */
1791         i_skip += 2;
1792     }
1793 #ifdef ZVBI_COMPILED
1794     else if( pid->es->fmt.i_codec == VLC_CODEC_TELETEXT )
1795         i_skip = 0; /*hack for zvbi support */
1796 #endif
1797     /* skip header */
1798     while( p_pes && i_skip > 0 )
1799     {
1800         if( p_pes->i_buffer <= i_skip )
1801         {
1802             block_t *p_next = p_pes->p_next;
1803
1804             i_skip -= p_pes->i_buffer;
1805             block_Release( p_pes );
1806             p_pes = p_next;
1807         }
1808         else
1809         {
1810             p_pes->i_buffer -= i_skip;
1811             p_pes->p_buffer += i_skip;
1812             break;
1813         }
1814     }
1815
1816     /* ISO/IEC 13818-1 2.7.5: if no pts and no dts, then dts == pts */
1817     if( i_pts >= 0 && i_dts < 0 )
1818         i_dts = i_pts;
1819
1820     if( p_pes )
1821     {
1822         block_t *p_block;
1823         int i;
1824
1825         if( i_dts >= 0 )
1826             p_pes->i_dts = VLC_TS_0 + i_dts * 100 / 9;
1827
1828         if( i_pts >= 0 )
1829             p_pes->i_pts = VLC_TS_0 + i_pts * 100 / 9;
1830
1831         p_pes->i_length = i_length * 100 / 9;
1832
1833         p_block = block_ChainGather( p_pes );
1834         if( pid->es->fmt.i_codec == VLC_CODEC_SUBT )
1835         {
1836             if( i_pes_size > 0 && p_block->i_buffer > i_pes_size )
1837             {
1838                 p_block->i_buffer = i_pes_size;
1839             }
1840             /* Append a \0 */
1841             p_block = block_Realloc( p_block, 0, p_block->i_buffer + 1 );
1842             p_block->p_buffer[p_block->i_buffer -1] = '\0';
1843         }
1844
1845         for( i = 0; i < pid->i_extra_es; i++ )
1846         {
1847             es_out_Send( p_demux->out, pid->extra_es[i]->id,
1848                          block_Duplicate( p_block ) );
1849         }
1850
1851         es_out_Send( p_demux->out, pid->es->id, p_block );
1852     }
1853     else
1854     {
1855         msg_Warn( p_demux, "empty pes" );
1856     }
1857 }
1858
1859 static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
1860 {
1861     demux_sys_t   *p_sys = p_demux->p_sys;
1862     const uint8_t *p = p_bk->p_buffer;
1863
1864     if( p_sys->i_pmt_es <= 0 )
1865         return;
1866
1867     if( ( p[3]&0x20 ) && /* adaptation */
1868         ( p[5]&0x10 ) &&
1869         ( p[4] >= 7 ) )
1870     {
1871         /* PCR is 33 bits */
1872         const mtime_t i_pcr = ( (mtime_t)p[6] << 25 ) |
1873                               ( (mtime_t)p[7] << 17 ) |
1874                               ( (mtime_t)p[8] << 9 ) |
1875                               ( (mtime_t)p[9] << 1 ) |
1876                               ( (mtime_t)p[10] >> 7 );
1877
1878         /* Search program and set the PCR */
1879         for( int i = 0; i < p_sys->i_pmt; i++ )
1880         {
1881             for( int i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
1882             {
1883                 if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr )
1884                 {
1885                     es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
1886                                     (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number,
1887                                     (int64_t)(VLC_TS_0 + i_pcr * 100 / 9) );
1888                 }
1889             }
1890         }
1891     }
1892 }
1893
1894 static bool GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
1895 {
1896     const uint8_t *p = p_bk->p_buffer;
1897     const bool b_unit_start = p[1]&0x40;
1898     const bool b_scrambled  = p[3]&0x80;
1899     const bool b_adaptation = p[3]&0x20;
1900     const bool b_payload    = p[3]&0x10;
1901     const int  i_cc         = p[3]&0x0f; /* continuity counter */
1902     bool       b_discontinuity = false;  /* discontinuity */
1903
1904     /* transport_scrambling_control is ignored */
1905     int         i_skip = 0;
1906     bool        i_ret  = false;
1907
1908 #if 0
1909     msg_Dbg( p_demux, "pid=%d unit_start=%d adaptation=%d payload=%d "
1910              "cc=0x%x", pid->i_pid, b_unit_start, b_adaptation,
1911              b_payload, i_cc );
1912 #endif
1913
1914     /* For now, ignore additional error correction
1915      * TODO: handle Reed-Solomon 204,188 error correction */
1916     p_bk->i_buffer = TS_PACKET_SIZE_188;
1917
1918     if( p[1]&0x80 )
1919     {
1920         msg_Dbg( p_demux, "transport_error_indicator set (pid=%d)",
1921                  pid->i_pid );
1922         if( pid->es->p_pes ) //&& pid->es->fmt.i_cat == VIDEO_ES )
1923             pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
1924     }
1925
1926     if( p_demux->p_sys->csa )
1927     {
1928         vlc_mutex_lock( &p_demux->p_sys->csa_lock );
1929         csa_Decrypt( p_demux->p_sys->csa, p_bk->p_buffer, p_demux->p_sys->i_csa_pkt_size );
1930         vlc_mutex_unlock( &p_demux->p_sys->csa_lock );
1931     }
1932
1933     if( !b_adaptation )
1934     {
1935         /* We don't have any adaptation_field, so payload starts
1936          * immediately after the 4 byte TS header */
1937         i_skip = 4;
1938     }
1939     else
1940     {
1941         /* p[4] is adaptation_field_length minus one */
1942         i_skip = 5 + p[4];
1943         if( p[4] > 0 )
1944         {
1945             /* discontinuity indicator found in stream */
1946             b_discontinuity = (p[5]&0x80) ? true : false;
1947             if( b_discontinuity && pid->es->p_pes )
1948             {
1949                 msg_Warn( p_demux, "discontinuity indicator (pid=%d) ",
1950                             pid->i_pid );
1951                 /* pid->es->p_pes->i_flags |= BLOCK_FLAG_DISCONTINUITY; */
1952             }
1953 #if 0
1954             if( p[5]&0x40 )
1955                 msg_Dbg( p_demux, "random access indicator (pid=%d) ", pid->i_pid );
1956 #endif
1957         }
1958     }
1959
1960     /* Test continuity counter */
1961     /* continuous when (one of this):
1962         * diff == 1
1963         * diff == 0 and payload == 0
1964         * diff == 0 and duplicate packet (playload != 0) <- should we
1965         *   test the content ?
1966      */
1967     const int i_diff = ( i_cc - pid->i_cc )&0x0f;
1968     if( b_payload && i_diff == 1 )
1969     {
1970         pid->i_cc = ( pid->i_cc + 1 ) & 0xf;
1971     }
1972     else
1973     {
1974         if( pid->i_cc == 0xff )
1975         {
1976             msg_Warn( p_demux, "first packet for pid=%d cc=0x%x",
1977                       pid->i_pid, i_cc );
1978             pid->i_cc = i_cc;
1979         }
1980         else if( i_diff != 0 && !b_discontinuity )
1981         {
1982             msg_Warn( p_demux, "discontinuity received 0x%x instead of 0x%x (pid=%d)",
1983                       i_cc, ( pid->i_cc + 1 )&0x0f, pid->i_pid );
1984
1985             pid->i_cc = i_cc;
1986             if( pid->es->p_pes && pid->es->fmt.i_cat != VIDEO_ES )
1987             {
1988                 /* Small video artifacts are usually better than
1989                  * dropping full frames */
1990                 pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
1991             }
1992         }
1993     }
1994
1995     PCRHandle( p_demux, pid, p_bk );
1996
1997     if( i_skip >= 188 || pid->es->id == NULL || p_demux->p_sys->b_udp_out )
1998     {
1999         block_Release( p_bk );
2000         return i_ret;
2001     }
2002
2003     /* */
2004     if( !pid->b_scrambled != !b_scrambled )
2005     {
2006         msg_Warn( p_demux, "scrambled state changed on pid %d (%d->%d)",
2007                   pid->i_pid, pid->b_scrambled, b_scrambled );
2008
2009         pid->b_scrambled = b_scrambled;
2010
2011         for( int i = 0; i < pid->i_extra_es; i++ )
2012         {
2013             es_out_Control( p_demux->out, ES_OUT_SET_ES_SCRAMBLED_STATE,
2014                             pid->extra_es[i]->id, b_scrambled );
2015         }
2016         es_out_Control( p_demux->out, ES_OUT_SET_ES_SCRAMBLED_STATE,
2017                         pid->es->id, b_scrambled );
2018     }
2019
2020     /* We have to gather it */
2021     p_bk->p_buffer += i_skip;
2022     p_bk->i_buffer -= i_skip;
2023
2024     if( b_unit_start )
2025     {
2026         if( pid->es->p_pes )
2027         {
2028             ParsePES( p_demux, pid );
2029             i_ret = true;
2030         }
2031
2032         block_ChainLastAppend( &pid->es->pp_last, p_bk );
2033         if( p_bk->i_buffer > 6 )
2034         {
2035             pid->es->i_pes_size = GetWBE( &p_bk->p_buffer[4] );
2036             if( pid->es->i_pes_size > 0 )
2037             {
2038                 pid->es->i_pes_size += 6;
2039             }
2040         }
2041         pid->es->i_pes_gathered += p_bk->i_buffer;
2042         if( pid->es->i_pes_size > 0 &&
2043             pid->es->i_pes_gathered >= pid->es->i_pes_size )
2044         {
2045             ParsePES( p_demux, pid );
2046             i_ret = true;
2047         }
2048     }
2049     else
2050     {
2051         if( pid->es->p_pes == NULL )
2052         {
2053             /* msg_Dbg( p_demux, "broken packet" ); */
2054             block_Release( p_bk );
2055         }
2056         else
2057         {
2058             block_ChainLastAppend( &pid->es->pp_last, p_bk );
2059             pid->es->i_pes_gathered += p_bk->i_buffer;
2060             if( pid->es->i_pes_size > 0 &&
2061                 pid->es->i_pes_gathered >= pid->es->i_pes_size )
2062             {
2063                 ParsePES( p_demux, pid );
2064                 i_ret = true;
2065             }
2066         }
2067     }
2068
2069     return i_ret;
2070 }
2071
2072 static int PIDFillFormat( ts_pid_t *pid, int i_stream_type )
2073 {
2074     es_format_t *fmt = &pid->es->fmt;
2075
2076     switch( i_stream_type )
2077     {
2078     case 0x01:  /* MPEG-1 video */
2079     case 0x02:  /* MPEG-2 video */
2080     case 0x80:  /* MPEG-2 MOTO video */
2081         es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MPGV );
2082         break;
2083     case 0x03:  /* MPEG-1 audio */
2084     case 0x04:  /* MPEG-2 audio */
2085         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MPGA );
2086         break;
2087     case 0x11:  /* MPEG4 (audio) LATM */
2088     case 0x0f:  /* ISO/IEC 13818-7 Audio with ADTS transport syntax */
2089         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_MP4A );
2090         break;
2091     case 0x10:  /* MPEG4 (video) */
2092         es_format_Init( fmt, VIDEO_ES, VLC_CODEC_MP4V );
2093         pid->es->b_gather = true;
2094         break;
2095     case 0x1B:  /* H264 <- check transport syntax/needed descriptor */
2096         es_format_Init( fmt, VIDEO_ES, VLC_CODEC_H264 );
2097         break;
2098
2099     case 0x81:  /* A52 (audio) */
2100         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_A52 );
2101         break;
2102     case 0x82:  /* DVD_SPU (sub) */
2103         es_format_Init( fmt, SPU_ES, VLC_CODEC_SPU );
2104         break;
2105     case 0x83:  /* LPCM (audio) */
2106         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_DVD_LPCM );
2107         break;
2108     case 0x84:  /* SDDS (audio) */
2109         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_SDDS );
2110         break;
2111     case 0x85:  /* DTS (audio) */
2112         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_DTS );
2113         break;
2114     case 0x87: /* E-AC3 */
2115         es_format_Init( fmt, AUDIO_ES, VLC_CODEC_EAC3 );
2116         break;
2117
2118     case 0x91:  /* A52 vls (audio) */
2119         es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', 'b' ) );
2120         break;
2121     case 0x92:  /* DVD_SPU vls (sub) */
2122         es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', 'b' ) );
2123         break;
2124
2125     case 0x94:  /* SDDS (audio) */
2126         es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 'b' ) );
2127         break;
2128
2129     case 0xa0:  /* MSCODEC vlc (video) (fixed later) */
2130         es_format_Init( fmt, UNKNOWN_ES, 0 );
2131         pid->es->b_gather = true;
2132         break;
2133
2134     case 0x06:  /* PES_PRIVATE  (fixed later) */
2135     case 0x12:  /* MPEG-4 generic (sub/scene/...) (fixed later) */
2136     case 0xEA:  /* Privately managed ES (VC-1) (fixed later */
2137     default:
2138         es_format_Init( fmt, UNKNOWN_ES, 0 );
2139         break;
2140     }
2141
2142     /* PES packets usually contain truncated frames */
2143     fmt->b_packetized = false;
2144
2145     return fmt->i_cat == UNKNOWN_ES ? VLC_EGENERIC : VLC_SUCCESS ;
2146 }
2147
2148 /*****************************************************************************
2149  * MP4 specific functions (IOD parser)
2150  *****************************************************************************/
2151 static int  IODDescriptorLength( int *pi_data, uint8_t **pp_data )
2152 {
2153     unsigned int i_b;
2154     unsigned int i_len = 0;
2155     do
2156     {
2157         i_b = **pp_data;
2158         (*pp_data)++;
2159         (*pi_data)--;
2160         i_len = ( i_len << 7 ) + ( i_b&0x7f );
2161
2162     } while( i_b&0x80 );
2163
2164     return( i_len );
2165 }
2166
2167 static int IODGetByte( int *pi_data, uint8_t **pp_data )
2168 {
2169     if( *pi_data > 0 )
2170     {
2171         const int i_b = **pp_data;
2172         (*pp_data)++;
2173         (*pi_data)--;
2174         return( i_b );
2175     }
2176     return( 0 );
2177 }
2178
2179 static int IODGetWord( int *pi_data, uint8_t **pp_data )
2180 {
2181     const int i1 = IODGetByte( pi_data, pp_data );
2182     const int i2 = IODGetByte( pi_data, pp_data );
2183     return( ( i1 << 8 ) | i2 );
2184 }
2185
2186 static int IODGet3Bytes( int *pi_data, uint8_t **pp_data )
2187 {
2188     const int i1 = IODGetByte( pi_data, pp_data );
2189     const int i2 = IODGetByte( pi_data, pp_data );
2190     const int i3 = IODGetByte( pi_data, pp_data );
2191
2192     return( ( i1 << 16 ) | ( i2 << 8) | i3 );
2193 }
2194
2195 static uint32_t IODGetDWord( int *pi_data, uint8_t **pp_data )
2196 {
2197     const uint32_t i1 = IODGetWord( pi_data, pp_data );
2198     const uint32_t i2 = IODGetWord( pi_data, pp_data );
2199     return( ( i1 << 16 ) | i2 );
2200 }
2201
2202 static char* IODGetURL( int *pi_data, uint8_t **pp_data )
2203 {
2204     char *url;
2205     int i_url_len, i;
2206
2207     i_url_len = IODGetByte( pi_data, pp_data );
2208     url = malloc( i_url_len + 1 );
2209     if( !url ) return NULL;
2210     for( i = 0; i < i_url_len; i++ )
2211     {
2212         url[i] = IODGetByte( pi_data, pp_data );
2213     }
2214     url[i_url_len] = '\0';
2215     return( url );
2216 }
2217
2218 static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
2219 {
2220     iod_descriptor_t *p_iod;
2221     int i;
2222     int i_es_index;
2223     uint8_t i_flags, i_iod_tag, byte1, byte2, byte3;
2224     bool  b_url;
2225     int   i_iod_length;
2226
2227     p_iod = malloc( sizeof( iod_descriptor_t ) );
2228     if( !p_iod ) return NULL;
2229     memset( p_iod, 0, sizeof( iod_descriptor_t ) );
2230
2231 #ifdef TS_DEBUG
2232     fprintf( stderr, "\n************ IOD ************" );
2233 #endif
2234     for( i = 0; i < 255; i++ )
2235     {
2236         p_iod->es_descr[i].b_ok = 0;
2237     }
2238     i_es_index = 0;
2239
2240     if( i_data < 3 )
2241     {
2242         return p_iod;
2243     }
2244
2245     byte1 = IODGetByte( &i_data, &p_data );
2246     byte2 = IODGetByte( &i_data, &p_data );
2247     byte3 = IODGetByte( &i_data, &p_data );
2248     if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor
2249     {
2250         p_iod->i_iod_label_scope = 0x11;
2251         p_iod->i_iod_label = byte1;
2252         i_iod_tag = byte2;
2253     }
2254     else  //correct implementation of the IOD_descriptor
2255     {
2256         p_iod->i_iod_label_scope = byte1;
2257         p_iod->i_iod_label = byte2;
2258         i_iod_tag = byte3;
2259     }
2260 #ifdef TS_DEBUG
2261     fprintf( stderr, "\n* iod_label:%d", p_iod->i_iod_label );
2262     fprintf( stderr, "\n* ===========" );
2263     fprintf( stderr, "\n* tag:0x%x", i_iod_tag );
2264 #endif
2265     if( i_iod_tag != 0x02 )
2266     {
2267 #ifdef TS_DEBUG
2268         fprintf( stderr, "\n ERR: tag %02x != 0x02", i_iod_tag );
2269 #endif
2270         return p_iod;
2271     }
2272
2273     i_iod_length = IODDescriptorLength( &i_data, &p_data );
2274 #ifdef TS_DEBUG
2275     fprintf( stderr, "\n* length:%d", i_iod_length );
2276 #endif
2277     if( i_iod_length > i_data )
2278     {
2279         i_iod_length = i_data;
2280     }
2281
2282     p_iod->i_od_id = ( IODGetByte( &i_data, &p_data ) << 2 );
2283     i_flags = IODGetByte( &i_data, &p_data );
2284     p_iod->i_od_id |= i_flags >> 6;
2285     b_url = ( i_flags >> 5  )&0x01;
2286 #ifdef TS_DEBUG
2287     fprintf( stderr, "\n* od_id:%d", p_iod->i_od_id );
2288     fprintf( stderr, "\n* url flag:%d", b_url );
2289     fprintf( stderr, "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 );
2290 #endif
2291     if( b_url )
2292     {
2293         p_iod->psz_url = IODGetURL( &i_data, &p_data );
2294 #ifdef TS_DEBUG
2295         fprintf( stderr, "\n* url string:%s", p_iod->psz_url );
2296         fprintf( stderr, "\n*****************************\n" );
2297 #endif
2298         return p_iod;
2299     }
2300     else
2301     {
2302         p_iod->psz_url = NULL;
2303     }
2304
2305     p_iod->i_ODProfileLevelIndication = IODGetByte( &i_data, &p_data );
2306     p_iod->i_sceneProfileLevelIndication = IODGetByte( &i_data, &p_data );
2307     p_iod->i_audioProfileLevelIndication = IODGetByte( &i_data, &p_data );
2308     p_iod->i_visualProfileLevelIndication = IODGetByte( &i_data, &p_data );
2309     p_iod->i_graphicsProfileLevelIndication = IODGetByte( &i_data, &p_data );
2310 #ifdef TS_DEBUG
2311     fprintf( stderr, "\n* ODProfileLevelIndication:%d", p_iod->i_ODProfileLevelIndication );
2312     fprintf( stderr, "\n* sceneProfileLevelIndication:%d", p_iod->i_sceneProfileLevelIndication );
2313     fprintf( stderr, "\n* audioProfileLevelIndication:%d", p_iod->i_audioProfileLevelIndication );
2314     fprintf( stderr, "\n* visualProfileLevelIndication:%d", p_iod->i_visualProfileLevelIndication );
2315     fprintf( stderr, "\n* graphicsProfileLevelIndication:%d", p_iod->i_graphicsProfileLevelIndication );
2316 #endif
2317
2318     while( i_data > 0 && i_es_index < 255)
2319     {
2320         int i_tag, i_length;
2321         int     i_data_sav;
2322         uint8_t *p_data_sav;
2323
2324         i_tag = IODGetByte( &i_data, &p_data );
2325         i_length = IODDescriptorLength( &i_data, &p_data );
2326
2327         i_data_sav = i_data;
2328         p_data_sav = p_data;
2329
2330         i_data = i_length;
2331
2332         switch( i_tag )
2333         {
2334         case 0x03:
2335             {
2336 #define es_descr    p_iod->es_descr[i_es_index]
2337                 int i_decoderConfigDescr_length;
2338 #ifdef TS_DEBUG
2339                 fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length );
2340 #endif
2341                 es_descr.b_ok = 1;
2342
2343                 es_descr.i_es_id = IODGetWord( &i_data, &p_data );
2344                 i_flags = IODGetByte( &i_data, &p_data );
2345                 es_descr.b_streamDependenceFlag = ( i_flags >> 7 )&0x01;
2346                 b_url = ( i_flags >> 6 )&0x01;
2347                 es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01;
2348                 es_descr.i_streamPriority = i_flags & 0x1f;
2349 #ifdef TS_DEBUG
2350                 fprintf( stderr, "\n*   * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag );
2351                 fprintf( stderr, "\n*   * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag );
2352                 fprintf( stderr, "\n*   * streamPriority:%d", es_descr.i_streamPriority );
2353 #endif
2354                 if( es_descr.b_streamDependenceFlag )
2355                 {
2356                     es_descr.i_dependOn_es_id = IODGetWord( &i_data, &p_data );
2357 #ifdef TS_DEBUG
2358                     fprintf( stderr, "\n*   * dependOn_es_id:%d", es_descr.i_dependOn_es_id );
2359 #endif
2360                 }
2361
2362                 if( b_url )
2363                 {
2364                     es_descr.psz_url = IODGetURL( &i_data, &p_data );
2365 #ifdef TS_DEBUG
2366                     fprintf( stderr, "\n* url string:%s", es_descr.psz_url );
2367 #endif
2368                 }
2369                 else
2370                 {
2371                     es_descr.psz_url = NULL;
2372                 }
2373
2374                 if( es_descr.b_OCRStreamFlag )
2375                 {
2376                     es_descr.i_OCR_es_id = IODGetWord( &i_data, &p_data );
2377 #ifdef TS_DEBUG
2378                     fprintf( stderr, "\n*   * OCR_es_id:%d", es_descr.i_OCR_es_id );
2379 #endif
2380                 }
2381
2382                 if( IODGetByte( &i_data, &p_data ) != 0x04 )
2383                 {
2384 #ifdef TS_DEBUG
2385                     fprintf( stderr, "\n* ERR missing DecoderConfigDescr" );
2386 #endif
2387                     es_descr.b_ok = 0;
2388                     break;
2389                 }
2390                 i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
2391 #ifdef TS_DEBUG
2392                 fprintf( stderr, "\n*   - DecoderConfigDesc length:%d", i_decoderConfigDescr_length );
2393 #endif
2394 #define dec_descr   es_descr.dec_descr
2395                 dec_descr.i_objectTypeIndication = IODGetByte( &i_data, &p_data );
2396                 i_flags = IODGetByte( &i_data, &p_data );
2397                 dec_descr.i_streamType = i_flags >> 2;
2398                 dec_descr.b_upStream = ( i_flags >> 1 )&0x01;
2399                 dec_descr.i_bufferSizeDB = IODGet3Bytes( &i_data, &p_data );
2400                 dec_descr.i_maxBitrate = IODGetDWord( &i_data, &p_data );
2401                 dec_descr.i_avgBitrate = IODGetDWord( &i_data, &p_data );
2402 #ifdef TS_DEBUG
2403                 fprintf( stderr, "\n*     * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication  );
2404                 fprintf( stderr, "\n*     * streamType:0x%x", dec_descr.i_streamType );
2405                 fprintf( stderr, "\n*     * upStream:%d", dec_descr.b_upStream );
2406                 fprintf( stderr, "\n*     * bufferSizeDB:%d", dec_descr.i_bufferSizeDB );
2407                 fprintf( stderr, "\n*     * maxBitrate:%d", dec_descr.i_maxBitrate );
2408                 fprintf( stderr, "\n*     * avgBitrate:%d", dec_descr.i_avgBitrate );
2409 #endif
2410                 if( i_decoderConfigDescr_length > 13 && IODGetByte( &i_data, &p_data ) == 0x05 )
2411                 {
2412                     int i;
2413                     dec_descr.i_decoder_specific_info_len =
2414                         IODDescriptorLength( &i_data, &p_data );
2415                     if( dec_descr.i_decoder_specific_info_len > 0 )
2416                     {
2417                         dec_descr.p_decoder_specific_info =
2418                             malloc( dec_descr.i_decoder_specific_info_len );
2419                     }
2420                     for( i = 0; i < dec_descr.i_decoder_specific_info_len; i++ )
2421                     {
2422                         dec_descr.p_decoder_specific_info[i] = IODGetByte( &i_data, &p_data );
2423                     }
2424                 }
2425                 else
2426                 {
2427                     dec_descr.i_decoder_specific_info_len = 0;
2428                     dec_descr.p_decoder_specific_info = NULL;
2429                 }
2430             }
2431 #undef  dec_descr
2432 #define sl_descr    es_descr.sl_descr
2433             {
2434                 int i_SLConfigDescr_length;
2435                 int i_predefined;
2436
2437                 if( IODGetByte( &i_data, &p_data ) != 0x06 )
2438                 {
2439 #ifdef TS_DEBUG
2440                     fprintf( stderr, "\n* ERR missing SLConfigDescr" );
2441 #endif
2442                     es_descr.b_ok = 0;
2443                     break;
2444                 }
2445                 i_SLConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
2446 #ifdef TS_DEBUG
2447                 fprintf( stderr, "\n*   - SLConfigDescr length:%d", i_SLConfigDescr_length );
2448 #endif
2449                 i_predefined = IODGetByte( &i_data, &p_data );
2450 #ifdef TS_DEBUG
2451                 fprintf( stderr, "\n*     * i_predefined:0x%x", i_predefined  );
2452 #endif
2453                 switch( i_predefined )
2454                 {
2455                 case 0x01:
2456                     {
2457                         sl_descr.b_useAccessUnitStartFlag   = 0;
2458                         sl_descr.b_useAccessUnitEndFlag     = 0;
2459                         sl_descr.b_useRandomAccessPointFlag = 0;
2460                         //sl_descr.b_useRandomAccessUnitsOnlyFlag = 0;
2461                         sl_descr.b_usePaddingFlag           = 0;
2462                         sl_descr.b_useTimeStampsFlags       = 0;
2463                         sl_descr.b_useIdleFlag              = 0;
2464                         sl_descr.b_durationFlag     = 0;    // FIXME FIXME
2465                         sl_descr.i_timeStampResolution      = 1000;
2466                         sl_descr.i_OCRResolution    = 0;    // FIXME FIXME
2467                         sl_descr.i_timeStampLength          = 32;
2468                         sl_descr.i_OCRLength        = 0;    // FIXME FIXME
2469                         sl_descr.i_AU_Length                = 0;
2470                         sl_descr.i_instantBitrateLength= 0; // FIXME FIXME
2471                         sl_descr.i_degradationPriorityLength= 0;
2472                         sl_descr.i_AU_seqNumLength          = 0;
2473                         sl_descr.i_packetSeqNumLength       = 0;
2474                         if( sl_descr.b_durationFlag )
2475                         {
2476                             sl_descr.i_timeScale            = 0;    // FIXME FIXME
2477                             sl_descr.i_accessUnitDuration   = 0;    // FIXME FIXME
2478                             sl_descr.i_compositionUnitDuration= 0;    // FIXME FIXME
2479                         }
2480                         if( !sl_descr.b_useTimeStampsFlags )
2481                         {
2482                             sl_descr.i_startDecodingTimeStamp   = 0;    // FIXME FIXME
2483                             sl_descr.i_startCompositionTimeStamp= 0;    // FIXME FIXME
2484                         }
2485                     }
2486                     break;
2487                 default:
2488 #ifdef TS_DEBUG
2489                     fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" );
2490 #endif
2491                     es_descr.b_ok = 0;
2492                     break;
2493                 }
2494             }
2495             break;
2496 #undef  sl_descr
2497 #undef  es_descr
2498         default:
2499 #ifdef TS_DEBUG
2500             fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length );
2501 #endif
2502             break;
2503         }
2504
2505         p_data = p_data_sav + i_length;
2506         i_data = i_data_sav - i_length;
2507         i_es_index++;
2508     }
2509 #ifdef TS_DEBUG
2510     fprintf( stderr, "\n*****************************\n" );
2511 #endif
2512     return p_iod;
2513 }
2514
2515 static void IODFree( iod_descriptor_t *p_iod )
2516 {
2517     int i;
2518
2519     if( p_iod->psz_url )
2520     {
2521         free( p_iod->psz_url );
2522         p_iod->psz_url = NULL;
2523         free( p_iod );
2524         return;
2525     }
2526
2527     for( i = 0; i < 255; i++ )
2528     {
2529 #define es_descr p_iod->es_descr[i]
2530         if( es_descr.b_ok )
2531         {
2532             if( es_descr.psz_url )
2533             {
2534                 free( es_descr.psz_url );
2535                 es_descr.psz_url = NULL;
2536             }
2537             else
2538             {
2539                 free( es_descr.dec_descr.p_decoder_specific_info );
2540                 es_descr.dec_descr.p_decoder_specific_info = NULL;
2541                 es_descr.dec_descr.i_decoder_specific_info_len = 0;
2542             }
2543         }
2544         es_descr.b_ok = 0;
2545 #undef  es_descr
2546     }
2547     free( p_iod );
2548 }
2549
2550 /****************************************************************************
2551  ****************************************************************************
2552  ** libdvbpsi callbacks
2553  ****************************************************************************
2554  ****************************************************************************/
2555 static bool ProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm )
2556 {
2557     demux_sys_t          *p_sys = p_demux->p_sys;
2558
2559     if( ( p_sys->i_current_program == -1 && p_sys->programs_list.i_count == 0 ) ||
2560         p_sys->i_current_program == 0 )
2561         return true;
2562     if( p_sys->i_current_program == i_pgrm )
2563         return true;
2564
2565     if( p_sys->programs_list.i_count != 0 )
2566     {
2567         for( int i = 0; i < p_sys->programs_list.i_count; i++ )
2568         {
2569             if( i_pgrm == p_sys->programs_list.p_values[i].i_int )
2570                 return true;
2571         }
2572     }
2573     return false;
2574 }
2575
2576 static void ValidateDVBMeta( demux_t *p_demux, int i_pid )
2577 {
2578     demux_sys_t *p_sys = p_demux->p_sys;
2579
2580     if( !p_sys->b_dvb_meta || ( i_pid != 0x11 && i_pid != 0x12 && i_pid != 0x14 ) )
2581         return;
2582
2583     msg_Warn( p_demux, "Switching to non DVB mode" );
2584
2585     /* This doesn't look like a DVB stream so don't try
2586      * parsing the SDT/EDT/TDT */
2587
2588     for( int i = 0x11; i <= 0x14; i++ )
2589     {
2590         if( i == 0x13 ) continue;
2591         ts_pid_t *p_pid = &p_sys->pid[i];
2592         if( p_pid->psi )
2593         {
2594             dvbpsi_DetachDemux( p_pid->psi->handle );
2595             free( p_pid->psi );
2596             p_pid->psi = NULL;
2597             p_pid->b_valid = false;
2598         }
2599         SetPIDFilter( p_demux, i, false );
2600     }
2601     p_sys->b_dvb_meta = false;
2602 }
2603
2604
2605 #ifdef TS_USE_DVB_SI
2606 /* FIXME same than dvbsi_to_utf8 from dvb access */
2607 static char *EITConvertToUTF8( const unsigned char *psz_instring,
2608                                size_t i_length,
2609                                bool b_broken )
2610 {
2611     const char *psz_encoding;
2612     char *psz_outstring;
2613     char psz_encbuf[sizeof( "ISO_8859-123" )];
2614     size_t i_in, i_out, offset = 1;
2615     vlc_iconv_t iconv_handle;
2616
2617     if( i_length < 1 ) return NULL;
2618     if( psz_instring[0] >= 0x20 )
2619     {
2620         /* According to ETSI EN 300 468 Annex A, this should be ISO6937,
2621          * but some broadcasters use different charset... */
2622         if( b_broken )
2623            psz_encoding = "ISO_8859-1";
2624         else
2625            psz_encoding = "ISO_6937";
2626
2627         offset = 0;
2628     }
2629     else switch( psz_instring[0] )
2630     {
2631     case 0x01:
2632         psz_encoding = "ISO_8859-5";
2633         break;
2634     case 0x02:
2635         psz_encoding = "ISO_8859-6";
2636         break;
2637     case 0x03:
2638         psz_encoding = "ISO_8859-7";
2639         break;
2640     case 0x04:
2641         psz_encoding = "ISO_8859-8";
2642         break;
2643     case 0x05:
2644         psz_encoding = "ISO_8859-9";
2645         break;
2646     case 0x06:
2647         psz_encoding = "ISO_8859-10";
2648         break;
2649     case 0x07:
2650         psz_encoding = "ISO_8859-11";
2651         break;
2652     case 0x08:
2653         psz_encoding = "ISO_8859-12";
2654         break;
2655     case 0x09:
2656         psz_encoding = "ISO_8859-13";
2657         break;
2658     case 0x0a:
2659         psz_encoding = "ISO_8859-14";
2660         break;
2661     case 0x0b:
2662         psz_encoding = "ISO_8859-15";
2663         break;
2664     case 0x10:
2665 #warning Is Latin-10 (psz_instring[2] == 16) really illegal?
2666         if( i_length < 3 || psz_instring[1] != 0x00 || psz_instring[2] > 15
2667          || psz_instring[2] == 0 )
2668         {
2669             psz_encoding = "UTF-8";
2670             offset = 0;
2671         }
2672         else
2673         {
2674             sprintf( psz_encbuf, "ISO_8859-%u", psz_instring[2] );
2675             psz_encoding = psz_encbuf;
2676             offset = 3;
2677         }
2678         break;
2679     case 0x11:
2680 #warning Is there a BOM or do we use a fixed endianess?
2681         psz_encoding = "UTF-16";
2682         break;
2683     case 0x12:
2684         psz_encoding = "KSC5601-1987";
2685         break;
2686     case 0x13:
2687         psz_encoding = "GB2312"; /* GB-2312-1980 */
2688         break;
2689     case 0x14:
2690         psz_encoding = "BIG-5";
2691         break;
2692     case 0x15:
2693         psz_encoding = "UTF-8";
2694         break;
2695     default:
2696         /* invalid */
2697         psz_encoding = "UTF-8";
2698         offset = 0;
2699     }
2700
2701     i_in = i_length - offset;
2702     i_out = i_in * 6 + 1;
2703
2704     psz_outstring = malloc( i_out );
2705     if( !psz_outstring )
2706     {
2707         return NULL;
2708     }
2709
2710     iconv_handle = vlc_iconv_open( "UTF-8", psz_encoding );
2711     if( iconv_handle == (vlc_iconv_t)(-1) )
2712     {
2713          /* Invalid character set (e.g. ISO_8859-12) */
2714          memcpy( psz_outstring, &psz_instring[offset], i_in );
2715          psz_outstring[i_in] = '\0';
2716          EnsureUTF8( psz_outstring );
2717     }
2718     else
2719     {
2720         const char *psz_in = (const char *)&psz_instring[offset];
2721         char *psz_out = psz_outstring;
2722
2723         while( vlc_iconv( iconv_handle, &psz_in, &i_in,
2724                           &psz_out, &i_out ) == (size_t)(-1) )
2725         {
2726             /* skip naughty byte. This may fail terribly for multibyte stuff,
2727              * but what can we do anyway? */
2728             psz_in++;
2729             i_in--;
2730             vlc_iconv( iconv_handle, NULL, NULL, NULL, NULL ); /* reset */
2731         }
2732         vlc_iconv_close( iconv_handle );
2733
2734         *psz_out = '\0';
2735
2736         /* Convert EIT-coded CR/LFs */
2737         unsigned char *pbuf = (unsigned char *)psz_outstring;
2738         for( ; pbuf < (unsigned char *)psz_out ; pbuf++)
2739         {
2740             if( pbuf[0] == 0xc2 && pbuf[1] == 0x8a )
2741             {
2742                 pbuf[0] = ' ';
2743                 pbuf[1] = '\n';
2744             }
2745         }
2746
2747
2748     }
2749     return psz_outstring;
2750 }
2751
2752 static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
2753 {
2754     demux_sys_t          *p_sys = p_demux->p_sys;
2755     ts_pid_t             *sdt = &p_sys->pid[0x11];
2756     dvbpsi_sdt_service_t *p_srv;
2757
2758     msg_Dbg( p_demux, "SDTCallBack called" );
2759
2760     if( sdt->psi->i_sdt_version != -1 &&
2761         ( !p_sdt->b_current_next ||
2762           p_sdt->i_version == sdt->psi->i_sdt_version ) )
2763     {
2764         dvbpsi_DeleteSDT( p_sdt );
2765         return;
2766     }
2767
2768     msg_Dbg( p_demux, "new SDT ts_id=%d version=%d current_next=%d "
2769              "network_id=%d",
2770              p_sdt->i_ts_id, p_sdt->i_version, p_sdt->b_current_next,
2771              p_sdt->i_network_id );
2772
2773     p_sys->b_broken_charset = false;
2774
2775     for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next )
2776     {
2777         vlc_meta_t          *p_meta;
2778         dvbpsi_descriptor_t *p_dr;
2779
2780         const char *psz_type = NULL;
2781         const char *psz_status = NULL;
2782
2783         msg_Dbg( p_demux, "  * service id=%d eit schedule=%d present=%d "
2784                  "running=%d free_ca=%d",
2785                  p_srv->i_service_id, p_srv->b_eit_schedule,
2786                  p_srv->b_eit_present, p_srv->i_running_status,
2787                  p_srv->b_free_ca );
2788
2789         p_meta = vlc_meta_New();
2790         for( p_dr = p_srv->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
2791         {
2792             if( p_dr->i_tag == 0x48 )
2793             {
2794                 static const char *ppsz_type[17] = {
2795                     "Reserved",
2796                     "Digital television service",
2797                     "Digital radio sound service",
2798                     "Teletext service",
2799                     "NVOD reference service",
2800                     "NVOD time-shifted service",
2801                     "Mosaic service",
2802                     "PAL coded signal",
2803                     "SECAM coded signal",
2804                     "D/D2-MAC",
2805                     "FM Radio",
2806                     "NTSC coded signal",
2807                     "Data broadcast service",
2808                     "Reserved for Common Interface Usage",
2809                     "RCS Map (see EN 301 790 [35])",
2810                     "RCS FLS (see EN 301 790 [35])",
2811                     "DVB MHP service"
2812                 };
2813                 dvbpsi_service_dr_t *pD = dvbpsi_DecodeServiceDr( p_dr );
2814                 char *str1 = NULL;
2815                 char *str2 = NULL;
2816
2817                 /* Workarounds for broadcasters with broken EPG */
2818
2819                 if( p_sdt->i_network_id == 133 )
2820                     p_sys->b_broken_charset = true;  /* SKY DE & BetaDigital use ISO8859-1 */
2821
2822                 /* List of providers using ISO8859-1 */
2823                 static const char ppsz_broken_providers[][8] = {
2824                     "CSAT",     /* CanalSat FR */
2825                     "GR1",      /* France televisions */
2826                     "MULTI4",   /* NT1 */
2827                     "MR5",      /* France 2/M6 HD */
2828                     ""
2829                 };
2830                 for( int i = 0; *ppsz_broken_providers[i]; i++ )
2831                 {
2832                     const size_t i_length = strlen(ppsz_broken_providers[i]);
2833                     if( pD->i_service_provider_name_length == i_length &&
2834                         !strncmp( pD->i_service_provider_name, ppsz_broken_providers[i], i_length ) )
2835                         p_sys->b_broken_charset = true;
2836                 }
2837
2838                 /* FIXME: Digital+ ES also uses ISO8859-1 */
2839
2840                 str1 = EITConvertToUTF8(pD->i_service_provider_name,
2841                                         pD->i_service_provider_name_length,
2842                                         p_sys->b_broken_charset );
2843                 str2 = EITConvertToUTF8(pD->i_service_name,
2844                                         pD->i_service_name_length,
2845                                         p_sys->b_broken_charset );
2846
2847                 msg_Dbg( p_demux, "    - type=%d provider=%s name=%s",
2848                          pD->i_service_type, str1, str2 );
2849
2850                 vlc_meta_SetTitle( p_meta, str2 );
2851                 vlc_meta_SetPublisher( p_meta, str1 );
2852                 if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 )
2853                     psz_type = ppsz_type[pD->i_service_type];
2854                 free( str1 );
2855                 free( str2 );
2856             }
2857         }
2858
2859         if( p_srv->i_running_status >= 0x01 && p_srv->i_running_status <= 0x04 )
2860         {
2861             static const char *ppsz_status[5] = {
2862                 "Unknown",
2863                 "Not running",
2864                 "Starts in a few seconds",
2865                 "Pausing",
2866                 "Running"
2867             };
2868             psz_status = ppsz_status[p_srv->i_running_status];
2869         }
2870
2871         if( psz_type )
2872             vlc_meta_AddExtra( p_meta, "Type", psz_type );
2873         if( psz_status )
2874             vlc_meta_AddExtra( p_meta, "Status", psz_status );
2875
2876         es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META,
2877                         p_srv->i_service_id, p_meta );
2878         vlc_meta_Delete( p_meta );
2879     }
2880
2881     sdt->psi->i_sdt_version = p_sdt->i_version;
2882     dvbpsi_DeleteSDT( p_sdt );
2883 }
2884
2885 /* i_year: year - 1900  i_month: 0-11  i_mday: 1-31 i_hour: 0-23 i_minute: 0-59 i_second: 0-59 */
2886 static int64_t vlc_timegm( int i_year, int i_month, int i_mday, int i_hour, int i_minute, int i_second )
2887 {
2888     static const int pn_day[12+1] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
2889     int64_t i_day;
2890     int i;
2891
2892     if( i_year < 70 ||
2893         i_month < 0 || i_month > 11 || i_mday < 1 || i_mday > 31 ||
2894         i_hour < 0 || i_hour > 23 || i_minute < 0 || i_minute > 59 || i_second < 0 || i_second > 59 )
2895         return -1;
2896
2897     /* Count the number of days */
2898     i_day = 365 * (i_year-70) + pn_day[i_month] + i_mday - 1;
2899 #define LEAP(y) ( ((y)%4) == 0 && (((y)%100) != 0 || ((y)%400) == 0) ? 1 : 0)
2900     for( i = 70; i < i_year; i++ )
2901         i_day += LEAP(1900+i);
2902     if( i_month > 1 )
2903         i_day += LEAP(1900+i_year);
2904 #undef LEAP
2905     /**/
2906     return ((24*i_day + i_hour)*60 + i_minute)*60 + i_second;
2907 }
2908
2909 static void EITDecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d )
2910 {
2911     const int yp = (int)( ( (double)i_mjd - 15078.2)/365.25 );
2912     const int mp = (int)( ((double)i_mjd - 14956.1 - (int)(yp * 365.25)) / 30.6001 );
2913     const int c = ( mp == 14 || mp == 15 ) ? 1 : 0;
2914
2915     *p_y = 1900 + yp + c*1;
2916     *p_m = mp - 1 - c*12;
2917     *p_d = i_mjd - 14956 - (int)(yp*365.25) - (int)(mp*30.6001);
2918 }
2919 #define CVT_FROM_BCD(v) ((((v) >> 4)&0xf)*10 + ((v)&0xf))
2920 static int64_t EITConvertStartTime( uint64_t i_date )
2921 {
2922     const int i_mjd = i_date >> 24;
2923     const int i_hour   = CVT_FROM_BCD(i_date >> 16);
2924     const int i_minute = CVT_FROM_BCD(i_date >>  8);
2925     const int i_second = CVT_FROM_BCD(i_date      );
2926     int i_year;
2927     int i_month;
2928     int i_day;
2929
2930     /* if all 40 bits are 1, the start is unknown */
2931     if( i_date == UINT64_C(0xffffffffff) )
2932         return -1;
2933
2934     EITDecodeMjd( i_mjd, &i_year, &i_month, &i_day );
2935     return vlc_timegm( i_year - 1900, i_month - 1, i_day, i_hour, i_minute, i_second );
2936 }
2937 static int EITConvertDuration( uint32_t i_duration )
2938 {
2939     return CVT_FROM_BCD(i_duration >> 16) * 3600 +
2940            CVT_FROM_BCD(i_duration >> 8 ) * 60 +
2941            CVT_FROM_BCD(i_duration      );
2942 }
2943 #undef CVT_FROM_BCD
2944
2945 #ifdef TS_USE_TDT
2946 static void TDTCallBack( demux_t *p_demux, dvbpsi_tot_t *p_tdt )
2947 {
2948     demux_sys_t        *p_sys = p_demux->p_sys;
2949
2950     p_sys->i_tdt_delta = CLOCK_FREQ * EITConvertStartTime( p_tdt->i_utc_time )
2951                          - mdate();
2952     dvbpsi_DeleteTOT(p_tdt);
2953 }
2954 #endif
2955
2956
2957 static void EITCallBack( demux_t *p_demux,
2958                          dvbpsi_eit_t *p_eit, bool b_current_following )
2959 {
2960     demux_sys_t        *p_sys = p_demux->p_sys;
2961     dvbpsi_eit_event_t *p_evt;
2962     vlc_epg_t *p_epg;
2963
2964     msg_Dbg( p_demux, "EITCallBack called" );
2965     if( !p_eit->b_current_next )
2966     {
2967         dvbpsi_DeleteEIT( p_eit );
2968         return;
2969     }
2970
2971     msg_Dbg( p_demux, "new EIT service_id=%d version=%d current_next=%d "
2972              "ts_id=%d network_id=%d segment_last_section_number=%d "
2973              "last_table_id=%d",
2974              p_eit->i_service_id, p_eit->i_version, p_eit->b_current_next,
2975              p_eit->i_ts_id, p_eit->i_network_id,
2976              p_eit->i_segment_last_section_number, p_eit->i_last_table_id );
2977
2978     p_epg = vlc_epg_New( NULL );
2979     for( p_evt = p_eit->p_first_event; p_evt; p_evt = p_evt->p_next )
2980     {
2981         dvbpsi_descriptor_t *p_dr;
2982         char                *psz_name = NULL;
2983         char                *psz_text = NULL;
2984         char                *psz_extra = strdup("");
2985         int64_t i_start;
2986         int i_duration;
2987
2988         i_start = EITConvertStartTime( p_evt->i_start_time );
2989         i_duration = EITConvertDuration( p_evt->i_duration );
2990
2991         msg_Dbg( p_demux, "  * event id=%d start_time:%d duration=%d "
2992                           "running=%d free_ca=%d",
2993                  p_evt->i_event_id, (int)i_start, (int)i_duration,
2994                  p_evt->i_running_status, p_evt->b_free_ca );
2995
2996         for( p_dr = p_evt->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
2997         {
2998             if( p_dr->i_tag == 0x4d )
2999             {
3000                 dvbpsi_short_event_dr_t *pE = dvbpsi_DecodeShortEventDr( p_dr );
3001
3002                 /* Only take first description, as we don't handle language-info
3003                    for epg atm*/
3004                 if( pE && psz_name == NULL)
3005                 {
3006                     psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length,
3007                                                  p_sys->b_broken_charset );
3008                     psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length,
3009                                                  p_sys->b_broken_charset );
3010                     msg_Dbg( p_demux, "    - short event lang=%3.3s '%s' : '%s'",
3011                              pE->i_iso_639_code, psz_name, psz_text );
3012                 }
3013             }
3014             else if( p_dr->i_tag == 0x4e )
3015             {
3016                 dvbpsi_extended_event_dr_t *pE = dvbpsi_DecodeExtendedEventDr( p_dr );
3017                 if( pE )
3018                 {
3019                     msg_Dbg( p_demux, "    - extended event lang=%3.3s [%d/%d]",
3020                              pE->i_iso_639_code,
3021                              pE->i_descriptor_number, pE->i_last_descriptor_number );
3022
3023                     if( pE->i_text_length > 0 )
3024                     {
3025                         char *psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length,
3026                                                            p_sys->b_broken_charset );
3027                         if( psz_text )
3028                         {
3029                             msg_Dbg( p_demux, "       - text='%s'", psz_text );
3030
3031                             psz_extra = xrealloc( psz_extra,
3032                                    strlen(psz_extra) + strlen(psz_text) + 1 );
3033                             strcat( psz_extra, psz_text );
3034                             free( psz_text );
3035                         }
3036                     }
3037
3038                     for( int i = 0; i < pE->i_entry_count; i++ )
3039                     {
3040                         char *psz_dsc = EITConvertToUTF8( pE->i_item_description[i],
3041                                                           pE->i_item_description_length[i],
3042                                                           p_sys->b_broken_charset );
3043                         char *psz_itm = EITConvertToUTF8( pE->i_item[i], pE->i_item_length[i],
3044                                                           p_sys->b_broken_charset );
3045
3046                         if( psz_dsc && psz_itm )
3047                         {
3048                             msg_Dbg( p_demux, "       - desc='%s' item='%s'", psz_dsc, psz_itm );
3049 #if 0
3050                             psz_extra = xrealloc( psz_extra,
3051                                          strlen(psz_extra) + strlen(psz_dsc) +
3052                                          strlen(psz_itm) + 3 + 1 );
3053                             strcat( psz_extra, "(" );
3054                             strcat( psz_extra, psz_dsc );
3055                             strcat( psz_extra, " " );
3056                             strcat( psz_extra, psz_itm );
3057                             strcat( psz_extra, ")" );
3058 #endif
3059                         }
3060                         free( psz_dsc );
3061                         free( psz_itm );
3062                     }
3063                 }
3064             }
3065             else
3066             {
3067                 msg_Dbg( p_demux, "    - tag=0x%x(%d)", p_dr->i_tag, p_dr->i_tag );
3068             }
3069         }
3070
3071         /* */
3072         if( i_start > 0 )
3073             vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text,
3074                               *psz_extra ? psz_extra : NULL );
3075
3076         /* Update "now playing" field */
3077         if( p_evt->i_running_status == 0x04 && i_start > 0 )
3078             vlc_epg_SetCurrent( p_epg, i_start );
3079
3080         free( psz_name );
3081         free( psz_text );
3082
3083         free( psz_extra );
3084     }
3085     if( p_epg->i_event > 0 )
3086     {
3087         if( b_current_following &&
3088             (  p_sys->i_current_program == -1 ||
3089                p_sys->i_current_program == p_eit->i_service_id ) )
3090         {
3091             p_sys->i_dvb_length = 0;
3092             p_sys->i_dvb_start = 0;
3093
3094             if( p_epg->p_current )
3095             {
3096                 p_sys->i_dvb_start = CLOCK_FREQ * p_epg->p_current->i_start;
3097                 p_sys->i_dvb_length = CLOCK_FREQ * p_epg->p_current->i_duration;
3098             }
3099         }
3100         es_out_Control( p_demux->out, ES_OUT_SET_GROUP_EPG, p_eit->i_service_id, p_epg );
3101     }
3102     vlc_epg_Delete( p_epg );
3103
3104     dvbpsi_DeleteEIT( p_eit );
3105 }
3106 static void EITCallBackCurrentFollowing( demux_t *p_demux, dvbpsi_eit_t *p_eit )
3107 {
3108     EITCallBack( p_demux, p_eit, true );
3109 }
3110 static void EITCallBackSchedule( demux_t *p_demux, dvbpsi_eit_t *p_eit )
3111 {
3112     EITCallBack( p_demux, p_eit, false );
3113 }
3114
3115 static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h,
3116                                  uint8_t  i_table_id, uint16_t i_extension )
3117 {
3118 #if 0
3119     msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
3120              i_table_id, i_table_id, i_extension, i_extension );
3121 #endif
3122     if( p_demux->p_sys->pid[0].psi->i_pat_version != -1 && i_table_id == 0x42 )
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
3127         dvbpsi_AttachSDT( h, i_table_id, i_extension,
3128                           (dvbpsi_sdt_callback)SDTCallBack, p_demux );
3129     }
3130     else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 &&
3131              ( i_table_id == 0x4e || /* Current/Following */
3132                (i_table_id >= 0x50 && i_table_id <= 0x5f) ) ) /* Schedule */
3133     {
3134         msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
3135                  i_table_id, i_table_id, i_extension, i_extension );
3136
3137         dvbpsi_eit_callback cb = i_table_id == 0x4e ?
3138                                     (dvbpsi_eit_callback)EITCallBackCurrentFollowing :
3139                                     (dvbpsi_eit_callback)EITCallBackSchedule;
3140         dvbpsi_AttachEIT( h, i_table_id, i_extension, cb, p_demux );
3141     }
3142 #ifdef TS_USE_TDT
3143     else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 &&
3144               i_table_id == 0x70 )  /* TDT */
3145     {
3146          msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
3147                  i_table_id, i_table_id, i_extension, i_extension );
3148          dvbpsi_AttachTOT( h, i_table_id, i_extension,
3149                            (dvbpsi_tot_callback)TDTCallBack, p_demux);
3150     }
3151 #endif
3152
3153 }
3154 #endif
3155
3156 /*****************************************************************************
3157  * PMT callback and helpers
3158  *****************************************************************************/
3159 static dvbpsi_descriptor_t *PMTEsFindDescriptor( const dvbpsi_pmt_es_t *p_es,
3160                                                  int i_tag )
3161 {
3162     dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;;
3163     while( p_dr && ( p_dr->i_tag != i_tag ) )
3164         p_dr = p_dr->p_next;
3165     return p_dr;
3166 }
3167 static bool PMTEsHasRegistration( demux_t *p_demux,
3168                                   const dvbpsi_pmt_es_t *p_es,
3169                                   const char *psz_tag )
3170 {
3171     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x05 );
3172     if( !p_dr )
3173         return false;
3174
3175     if( p_dr->i_length < 4 )
3176     {
3177         msg_Warn( p_demux, "invalid Registration Descriptor" );
3178         return false;
3179     }
3180
3181     assert( strlen(psz_tag) == 4 );
3182     return !memcmp( p_dr->p_data, psz_tag, 4 );
3183 }
3184 static void PMTSetupEsISO14496( demux_t *p_demux, ts_pid_t *pid,
3185                                 const ts_prg_psi_t *prg, const dvbpsi_pmt_es_t *p_es )
3186 {
3187     es_format_t *p_fmt = &pid->es->fmt;
3188
3189     /* MPEG-4 stream: search SL_DESCRIPTOR */
3190     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x1f );
3191
3192     if( p_dr && p_dr->i_length == 2 )
3193     {
3194         const int i_es_id = ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1];
3195
3196         msg_Warn( p_demux, "found SL_descriptor es_id=%d", i_es_id );
3197
3198         pid->es->p_mpeg4desc = NULL;
3199
3200         for( int i = 0; i < 255; i++ )
3201         {
3202             iod_descriptor_t *iod = prg->iod;
3203
3204             if( iod->es_descr[i].b_ok &&
3205                 iod->es_descr[i].i_es_id == i_es_id )
3206             {
3207                 pid->es->p_mpeg4desc = &iod->es_descr[i];
3208                 break;
3209             }
3210         }
3211     }
3212     if( !pid->es->p_mpeg4desc )
3213     {
3214         msg_Err( p_demux, "MPEG-4 descriptor not found" );
3215         return;
3216     }
3217
3218     const decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr;
3219     if( dcd->i_streamType == 0x04 )    /* VisualStream */
3220     {
3221         p_fmt->i_cat = VIDEO_ES;
3222         switch( dcd->i_objectTypeIndication )
3223         {
3224         case 0x0B: /* mpeg4 sub */
3225             p_fmt->i_cat = SPU_ES;
3226             p_fmt->i_codec = VLC_CODEC_SUBT;
3227             break;
3228
3229         case 0x20: /* mpeg4 */
3230             p_fmt->i_codec = VLC_CODEC_MP4V;
3231             break;
3232         case 0x21: /* h264 */
3233             p_fmt->i_codec = VLC_CODEC_H264;
3234             break;
3235         case 0x60:
3236         case 0x61:
3237         case 0x62:
3238         case 0x63:
3239         case 0x64:
3240         case 0x65: /* mpeg2 */
3241             p_fmt->i_codec = VLC_CODEC_MPGV;
3242             break;
3243         case 0x6a: /* mpeg1 */
3244             p_fmt->i_codec = VLC_CODEC_MPGV;
3245             break;
3246         case 0x6c: /* mpeg1 */
3247             p_fmt->i_codec = VLC_CODEC_JPEG;
3248             break;
3249         default:
3250             p_fmt->i_cat = UNKNOWN_ES;
3251             break;
3252         }
3253     }
3254     else if( dcd->i_streamType == 0x05 )    /* AudioStream */
3255     {
3256         p_fmt->i_cat = AUDIO_ES;
3257         switch( dcd->i_objectTypeIndication )
3258         {
3259         case 0x40: /* mpeg4 */
3260             p_fmt->i_codec = VLC_CODEC_MP4A;
3261             break;
3262         case 0x66:
3263         case 0x67:
3264         case 0x68: /* mpeg2 aac */
3265             p_fmt->i_codec = VLC_CODEC_MP4A;
3266             break;
3267         case 0x69: /* mpeg2 */
3268             p_fmt->i_codec = VLC_CODEC_MPGA;
3269             break;
3270         case 0x6b: /* mpeg1 */
3271             p_fmt->i_codec = VLC_CODEC_MPGA;
3272             break;
3273         default:
3274             p_fmt->i_cat = UNKNOWN_ES;
3275             break;
3276         }
3277     }
3278     else
3279     {
3280         p_fmt->i_cat = UNKNOWN_ES;
3281     }
3282
3283     if( p_fmt->i_cat != UNKNOWN_ES )
3284     {
3285         p_fmt->i_extra = dcd->i_decoder_specific_info_len;
3286         if( p_fmt->i_extra > 0 )
3287         {
3288             p_fmt->p_extra = malloc( p_fmt->i_extra );
3289             if( p_fmt->p_extra )
3290                 memcpy( p_fmt->p_extra,
3291                         dcd->p_decoder_specific_info,
3292                         p_fmt->i_extra );
3293             else
3294                 p_fmt->i_extra = 0;
3295         }
3296     }
3297 }
3298
3299 typedef struct
3300 {
3301     int  i_type;
3302     int  i_magazine;
3303     int  i_page;
3304     char p_iso639[3];
3305 } ts_teletext_page_t;
3306
3307 static void PMTSetupEsTeletext( demux_t *p_demux, ts_pid_t *pid,
3308                                 const dvbpsi_pmt_es_t *p_es )
3309 {
3310     es_format_t *p_fmt = &pid->es->fmt;
3311
3312     ts_teletext_page_t p_page[2 * 64 + 20];
3313     unsigned i_page = 0;
3314
3315     /* Gather pages informations */
3316 #if defined _DVBPSI_DR_56_H_ && \
3317     defined DVBPSI_VERSION && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5)
3318     for( unsigned i_tag_idx = 0; i_tag_idx < 2; i_tag_idx++ )
3319     {
3320         dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, i_tag_idx == 0 ? 0x46 : 0x56 );
3321         if( !p_dr )
3322             continue;
3323
3324         dvbpsi_teletext_dr_t *p_sub = dvbpsi_DecodeTeletextDr( p_dr );
3325         if( !p_sub )
3326             continue;
3327
3328         for( int i = 0; i < p_sub->i_pages_number; i++ )
3329         {
3330             const dvbpsi_teletextpage_t *p_src = &p_sub->p_pages[i];
3331
3332             if( p_src->i_teletext_type >= 0x06 )
3333                 continue;
3334
3335             assert( i_page < sizeof(p_page)/sizeof(*p_page) );
3336
3337             ts_teletext_page_t *p_dst = &p_page[i_page++];
3338
3339             p_dst->i_type = p_src->i_teletext_type;
3340             p_dst->i_magazine = p_src->i_teletext_magazine_number
3341                 ? p_src->i_teletext_magazine_number : 8;
3342             p_dst->i_page = p_src->i_teletext_page_number;
3343             memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 );
3344         }
3345     }
3346 #endif
3347
3348 #ifdef _DVBPSI_DR_59_H_
3349     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
3350     if( p_dr )
3351     {
3352         dvbpsi_subtitling_dr_t *p_sub = dvbpsi_DecodeSubtitlingDr( p_dr );
3353         for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ )
3354         {
3355             dvbpsi_subtitle_t *p_src = &p_sub->p_subtitle[i];
3356
3357             if( p_src->i_subtitling_type < 0x01 || p_src->i_subtitling_type > 0x03 )
3358                 continue;
3359
3360             assert( i_page < sizeof(p_page)/sizeof(*p_page) );
3361
3362             ts_teletext_page_t *p_dst = &p_page[i_page++];
3363
3364             switch( p_src->i_subtitling_type )
3365             {
3366             case 0x01:
3367                 p_dst->i_type = 0x02;
3368                 break;
3369             default:
3370                 p_dst->i_type = 0x03;
3371                 break;
3372             }
3373             /* FIXME check if it is the right split */
3374             p_dst->i_magazine = (p_src->i_composition_page_id >> 8)
3375                 ? (p_src->i_composition_page_id >> 8) : 8;
3376             p_dst->i_page = p_src->i_composition_page_id & 0xff;
3377             memcpy( p_dst->p_iso639, p_src->i_iso6392_language_code, 3 );
3378         }
3379     }
3380 #endif
3381
3382     /* */
3383     es_format_Init( p_fmt, SPU_ES, VLC_CODEC_TELETEXT );
3384
3385     if( !p_demux->p_sys->b_split_es || i_page <= 0 )
3386     {
3387         p_fmt->subs.teletext.i_magazine = -1;
3388         p_fmt->subs.teletext.i_page = 0;
3389         p_fmt->psz_description = strdup( vlc_gettext(ppsz_teletext_type[1]) );
3390
3391         dvbpsi_descriptor_t *p_dr;
3392         p_dr = PMTEsFindDescriptor( p_es, 0x46 );
3393         if( !p_dr )
3394             p_dr = PMTEsFindDescriptor( p_es, 0x56 );
3395
3396         if( !p_demux->p_sys->b_split_es && p_dr && p_dr->i_length > 0 )
3397         {
3398             /* Descriptor pass-through */
3399             p_fmt->p_extra = malloc( p_dr->i_length );
3400             if( p_fmt->p_extra )
3401             {
3402                 p_fmt->i_extra = p_dr->i_length;
3403                 memcpy( p_fmt->p_extra, p_dr->p_data, p_dr->i_length );
3404             }
3405         }
3406     }
3407     else
3408     {
3409         for( unsigned i = 0; i < i_page; i++ )
3410         {
3411             ts_es_t *p_es;
3412
3413             /* */
3414             if( i == 0 )
3415             {
3416                 p_es = pid->es;
3417             }
3418             else
3419             {
3420                 p_es = malloc( sizeof(*p_es) );
3421                 if( !p_es )
3422                     break;
3423
3424                 es_format_Copy( &p_es->fmt, &pid->es->fmt );
3425                 free( p_es->fmt.psz_language );
3426                 free( p_es->fmt.psz_description );
3427                 p_es->fmt.psz_language = NULL;
3428                 p_es->fmt.psz_description = NULL;
3429
3430                 p_es->id      = NULL;
3431                 p_es->p_pes   = NULL;
3432                 p_es->i_pes_size = 0;
3433                 p_es->i_pes_gathered = 0;
3434                 p_es->pp_last = &p_es->p_pes;
3435                 p_es->p_mpeg4desc = NULL;
3436                 p_es->b_gather = false;
3437
3438                 TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es );
3439             }
3440
3441             /* */
3442             const ts_teletext_page_t *p = &p_page[i];
3443             p_es->fmt.i_priority = (p->i_type == 0x02 || p->i_type == 0x05) ? 0 : -1;
3444             p_es->fmt.psz_language = strndup( p->p_iso639, 3 );
3445             p_es->fmt.psz_description = strdup(vlc_gettext(ppsz_teletext_type[p->i_type]));
3446             p_es->fmt.subs.teletext.i_magazine = p->i_magazine;
3447             p_es->fmt.subs.teletext.i_page = p->i_page;
3448
3449             msg_Dbg( p_demux,
3450                          "    * ttxt type=%s lan=%s page=%d%02x",
3451                          p_es->fmt.psz_description,
3452                          p_es->fmt.psz_language,
3453                          p->i_magazine, p->i_page );
3454         }
3455     }
3456 }
3457 static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid,
3458                                    const dvbpsi_pmt_es_t *p_es )
3459 {
3460     es_format_t *p_fmt = &pid->es->fmt;
3461
3462     es_format_Init( p_fmt, SPU_ES, VLC_CODEC_DVBS );
3463
3464     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
3465     int i_page = 0;
3466 #ifdef _DVBPSI_DR_59_H_
3467     dvbpsi_subtitling_dr_t *p_sub = dvbpsi_DecodeSubtitlingDr( p_dr );
3468     for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ )
3469     {
3470         const int i_type = p_sub->p_subtitle[i].i_subtitling_type;
3471         if( ( i_type >= 0x10 && i_type <= 0x14 ) ||
3472             ( i_type >= 0x20 && i_type <= 0x24 ) )
3473             i_page++;
3474     }
3475 #endif
3476
3477     if( !p_demux->p_sys->b_split_es  || i_page <= 0 )
3478     {
3479         p_fmt->subs.dvb.i_id = -1;
3480         p_fmt->psz_description = strdup( _("DVB subtitles") );
3481
3482         if( !p_demux->p_sys->b_split_es && p_dr && p_dr->i_length > 0 )
3483         {
3484             /* Descriptor pass-through */
3485             p_fmt->p_extra = malloc( p_dr->i_length );
3486             if( p_fmt->p_extra )
3487             {
3488                 p_fmt->i_extra = p_dr->i_length;
3489                 memcpy( p_fmt->p_extra, p_dr->p_data, p_dr->i_length );
3490             }
3491         }
3492     }
3493     else
3494     {
3495 #ifdef _DVBPSI_DR_59_H_
3496         for( int i = 0; i < p_sub->i_subtitles_number; i++ )
3497         {
3498             ts_es_t *p_es;
3499
3500             /* */
3501             if( i == 0 )
3502             {
3503                 p_es = pid->es;
3504             }
3505             else
3506             {
3507                 p_es = malloc( sizeof(*p_es) );
3508                 if( !p_es )
3509                     break;
3510
3511                 es_format_Copy( &p_es->fmt, &pid->es->fmt );
3512                 free( p_es->fmt.psz_language );
3513                 free( p_es->fmt.psz_description );
3514                 p_es->fmt.psz_language = NULL;
3515                 p_es->fmt.psz_description = NULL;
3516
3517                 p_es->id      = NULL;
3518                 p_es->p_pes   = NULL;
3519                 p_es->i_pes_size = 0;
3520                 p_es->i_pes_gathered = 0;
3521                 p_es->pp_last = &p_es->p_pes;
3522                 p_es->p_mpeg4desc = NULL;
3523                 p_es->b_gather = false;
3524
3525                 TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es );
3526             }
3527
3528             /* */
3529             const dvbpsi_subtitle_t *p = &p_sub->p_subtitle[i];
3530             p_es->fmt.psz_language = strndup( p->i_iso6392_language_code, 3 );
3531             switch( p->i_subtitling_type )
3532             {
3533             case 0x10: /* unspec. */
3534             case 0x11: /* 4:3 */
3535             case 0x12: /* 16:9 */
3536             case 0x13: /* 2.21:1 */
3537             case 0x14: /* HD monitor */
3538                 p_es->fmt.psz_description = strdup( _("DVB subtitles") );
3539                 break;
3540             case 0x20: /* Hearing impaired unspec. */
3541             case 0x21: /* h.i. 4:3 */
3542             case 0x22: /* h.i. 16:9 */
3543             case 0x23: /* h.i. 2.21:1 */
3544             case 0x24: /* h.i. HD monitor */
3545                 p_es->fmt.psz_description = strdup( _("DVB subtitles: hearing impaired") );
3546                 break;
3547             default:
3548                 break;
3549             }
3550
3551             /* Hack, FIXME */
3552             p_es->fmt.subs.dvb.i_id = ( p->i_composition_page_id <<  0 ) |
3553                                       ( p->i_ancillary_page_id   << 16 );
3554         }
3555 #endif
3556     }
3557 }
3558 static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid,
3559                             const dvbpsi_pmt_es_t *p_es )
3560 {
3561     es_format_t *p_fmt = &pid->es->fmt;
3562
3563     if( PMTEsHasRegistration( p_demux, p_es, "AC-3" ) ||
3564         PMTEsFindDescriptor( p_es, 0x6a ) ||
3565         PMTEsFindDescriptor( p_es, 0x81 ) )
3566     {
3567         p_fmt->i_cat = AUDIO_ES;
3568         p_fmt->i_codec = VLC_CODEC_A52;
3569     }
3570     else if( PMTEsFindDescriptor( p_es, 0x7a ) )
3571     {
3572         /* DVB with stream_type 0x06 (ETS EN 300 468) */
3573         p_fmt->i_cat = AUDIO_ES;
3574         p_fmt->i_codec = VLC_CODEC_EAC3;
3575     }
3576     else if( PMTEsHasRegistration( p_demux, p_es, "DTS1" ) ||
3577              PMTEsHasRegistration( p_demux, p_es, "DTS2" ) ||
3578              PMTEsHasRegistration( p_demux, p_es, "DTS3" ) ||
3579              PMTEsFindDescriptor( p_es, 0x73 ) )
3580     {
3581         /*registration descriptor(ETSI TS 101 154 Annex F)*/
3582         p_fmt->i_cat = AUDIO_ES;
3583         p_fmt->i_codec = VLC_CODEC_DTS;
3584     }
3585     else if( PMTEsHasRegistration( p_demux, p_es, "BSSD" ) )
3586     {
3587         p_fmt->i_cat = AUDIO_ES;
3588         p_fmt->b_packetized = true;
3589         p_fmt->i_codec = VLC_CODEC_302M;
3590     }
3591     else
3592     {
3593         /* Subtitle/Teletext/VBI fallbacks */
3594         dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x59 );
3595
3596 #ifdef _DVBPSI_DR_59_H_
3597         dvbpsi_subtitling_dr_t *p_sub;
3598         if( p_dr && ( p_sub = dvbpsi_DecodeSubtitlingDr( p_dr ) ) )
3599         {
3600             for( int i = 0; i < p_sub->i_subtitles_number; i++ )
3601             {
3602                 if( p_fmt->i_cat != UNKNOWN_ES )
3603                     break;
3604
3605                 switch( p_sub->p_subtitle[i].i_subtitling_type )
3606                 {
3607                 case 0x01: /* EBU Teletext subtitles */
3608                 case 0x02: /* Associated EBU Teletext */
3609                 case 0x03: /* VBI data */
3610                     PMTSetupEsTeletext( p_demux, pid, p_es );
3611                     break;
3612                 case 0x10: /* DVB Subtitle (normal) with no monitor AR critical */
3613                 case 0x11: /*                 ...   on 4:3 AR monitor */
3614                 case 0x12: /*                 ...   on 16:9 AR monitor */
3615                 case 0x13: /*                 ...   on 2.21:1 AR monitor */
3616                 case 0x14: /*                 ...   for display on a high definition monitor */
3617                 case 0x20: /* DVB Subtitle (impaired) with no monitor AR critical */
3618                 case 0x21: /*                 ...   on 4:3 AR monitor */
3619                 case 0x22: /*                 ...   on 16:9 AR monitor */
3620                 case 0x23: /*                 ...   on 2.21:1 AR monitor */
3621                 case 0x24: /*                 ...   for display on a high definition monitor */
3622                     PMTSetupEsDvbSubtitle( p_demux, pid, p_es );
3623                     break;
3624                 default:
3625                     msg_Err( p_demux, "Unrecognized DVB subtitle type (0x%x)",
3626                              p_sub->p_subtitle[i].i_subtitling_type );
3627                     break;
3628                 }
3629             }
3630         }
3631 #else
3632         if( p_fmt->i_cat == UNKNOWN_ES && p_dr )
3633             PMTSetupEsDvbSubtitle( p_demux, pid, p_es );
3634 #endif
3635         if( p_fmt->i_cat == UNKNOWN_ES &&
3636             ( PMTEsFindDescriptor( p_es, 0x45 ) ||  /* VBI Data descriptor */
3637               PMTEsFindDescriptor( p_es, 0x46 ) ||  /* VBI Teletext descriptor */
3638               PMTEsFindDescriptor( p_es, 0x56 ) ) ) /* EBU Teletext descriptor */
3639         {
3640             /* Teletext/VBI */
3641             PMTSetupEsTeletext( p_demux, pid, p_es );
3642         }
3643     }
3644
3645 #ifdef _DVBPSI_DR_52_H_
3646     /* FIXME is it useful ? */
3647     if( PMTEsFindDescriptor( p_es, 0x52 ) )
3648     {
3649         dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x52 );
3650         dvbpsi_stream_identifier_dr_t *p_si = dvbpsi_DecodeStreamIdentifierDr( p_dr );
3651
3652         msg_Dbg( p_demux, "    * Stream Component Identifier: %d", p_si->i_component_tag );
3653     }
3654 #endif
3655 }
3656
3657 static void PMTSetupEs0xEA( 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, "VC-1" ) )
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 VC-1 (SMPTE rp227) */
3670     p_fmt->i_cat = VIDEO_ES;
3671     p_fmt->i_codec = VLC_CODEC_VC1;
3672
3673     /* XXX With Simple and Main profile the SEQUENCE
3674      * header is modified: video width and height are
3675      * inserted just after the start code as 2 int16_t
3676      * The packetizer will take care of that. */
3677 }
3678
3679 static void PMTSetupEs0xD1( demux_t *p_demux, ts_pid_t *pid,
3680                            const dvbpsi_pmt_es_t *p_es )
3681 {
3682     /* Registration Descriptor */
3683     if( !PMTEsHasRegistration( p_demux, p_es, "drac" ) )
3684     {
3685         msg_Err( p_demux, "Registration descriptor not found or invalid" );
3686         return;
3687     }
3688
3689     es_format_t *p_fmt = &pid->es->fmt;
3690
3691     /* registration descriptor for Dirac
3692      * (backwards compatable with VC-2 (SMPTE Sxxxx:2008)) */
3693     p_fmt->i_cat = VIDEO_ES;
3694     p_fmt->i_codec = VLC_CODEC_DIRAC;
3695 }
3696
3697 static void PMTSetupEs0xA0( demux_t *p_demux, ts_pid_t *pid,
3698                            const dvbpsi_pmt_es_t *p_es )
3699 {
3700     /* MSCODEC sent by vlc */
3701     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0xa0 );
3702     if( !p_dr || p_dr->i_length < 10 )
3703     {
3704         msg_Warn( p_demux,
3705                   "private MSCODEC (vlc) without bih private descriptor" );
3706         return;
3707     }
3708
3709     es_format_t *p_fmt = &pid->es->fmt;
3710     p_fmt->i_cat = VIDEO_ES;
3711     p_fmt->i_codec = VLC_FOURCC( p_dr->p_data[0], p_dr->p_data[1],
3712                                  p_dr->p_data[2], p_dr->p_data[3] );
3713     p_fmt->video.i_width = GetWBE( &p_dr->p_data[4] );
3714     p_fmt->video.i_height = GetWBE( &p_dr->p_data[6] );
3715     p_fmt->i_extra = GetWBE( &p_dr->p_data[8] );
3716
3717     if( p_fmt->i_extra > 0 )
3718     {
3719         p_fmt->p_extra = malloc( p_fmt->i_extra );
3720         if( p_fmt->p_extra )
3721             memcpy( p_fmt->p_extra, &p_dr->p_data[10],
3722                     __MIN( p_fmt->i_extra, p_dr->i_length - 10 ) );
3723         else
3724             p_fmt->i_extra = 0;
3725     }
3726     /* For such stream we will gather them ourself and don't launch a
3727      * packetizer.
3728      * Yes it's ugly but it's the only way to have DIV3 working */
3729     p_fmt->b_packetized = true;
3730 }
3731
3732 static void PMTSetupEsHDMV( demux_t *p_demux, ts_pid_t *pid,
3733                            const dvbpsi_pmt_es_t *p_es )
3734 {
3735     VLC_UNUSED(p_demux);
3736     es_format_t *p_fmt = &pid->es->fmt;
3737
3738     /* Blu-Ray mapping */
3739     switch( p_es->i_type )
3740     {
3741     case 0x80:
3742         p_fmt->i_cat = AUDIO_ES;
3743         p_fmt->i_codec = VLC_CODEC_BD_LPCM;
3744         break;
3745     case 0x82:
3746     case 0x85: /* DTS-HD High resolution audio */
3747     case 0x86: /* DTS-HD Master audio */
3748     case 0xA2: /* Secondary DTS audio */
3749         p_fmt->i_cat = AUDIO_ES;
3750         p_fmt->i_codec = VLC_CODEC_DTS;
3751         break;
3752
3753     case 0x83: /* TrueHD AC3 */
3754         p_fmt->i_cat = AUDIO_ES;
3755         p_fmt->i_codec = VLC_CODEC_TRUEHD;
3756         break;
3757
3758     case 0x84: /* E-AC3 */
3759     case 0xA1: /* Secondary E-AC3 */
3760         p_fmt->i_cat = AUDIO_ES;
3761         p_fmt->i_codec = VLC_CODEC_EAC3;
3762         break;
3763     case 0x90: /* Presentation graphics */
3764         p_fmt->i_cat = SPU_ES;
3765         p_fmt->i_codec = VLC_CODEC_BD_PG;
3766         break;
3767     case 0x91: /* Interactive graphics */
3768     case 0x92: /* Subtitle */
3769     default:
3770         break;
3771     }
3772 }
3773
3774 static void PMTSetupEsRegistration( demux_t *p_demux, ts_pid_t *pid,
3775                                     const dvbpsi_pmt_es_t *p_es )
3776 {
3777     static const struct
3778     {
3779         char         psz_tag[5];
3780         int          i_cat;
3781         vlc_fourcc_t i_codec;
3782     } p_regs[] = {
3783         { "AC-3", AUDIO_ES, VLC_CODEC_A52   },
3784         { "DTS1", AUDIO_ES, VLC_CODEC_DTS   },
3785         { "DTS2", AUDIO_ES, VLC_CODEC_DTS   },
3786         { "DTS3", AUDIO_ES, VLC_CODEC_DTS   },
3787         { "BSSD", AUDIO_ES, VLC_CODEC_302M  },
3788         { "VC-1", VIDEO_ES, VLC_CODEC_VC1   },
3789         { "drac", VIDEO_ES, VLC_CODEC_DIRAC },
3790         { "", UNKNOWN_ES, 0 }
3791     };
3792     es_format_t *p_fmt = &pid->es->fmt;
3793
3794     for( int i = 0; p_regs[i].i_cat != UNKNOWN_ES; i++ )
3795     {
3796         if( PMTEsHasRegistration( p_demux, p_es, p_regs[i].psz_tag ) )
3797         {
3798             p_fmt->i_cat   = p_regs[i].i_cat;
3799             p_fmt->i_codec = p_regs[i].i_codec;
3800             break;
3801         }
3802     }
3803 }
3804
3805 static void PMTParseEsIso639( demux_t *p_demux, ts_pid_t *pid,
3806                               const dvbpsi_pmt_es_t *p_es )
3807 {
3808     /* get language descriptor */
3809     dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x0a );
3810
3811     if( !p_dr )
3812         return;
3813
3814     dvbpsi_iso639_dr_t *p_decoded = dvbpsi_DecodeISO639Dr( p_dr );
3815     if( !p_decoded )
3816     {
3817         msg_Err( p_demux, "Failed to decode a ISO 639 descriptor" );
3818         return;
3819     }
3820
3821 #if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2)
3822     pid->es->fmt.psz_language = malloc( 4 );
3823     if( pid->es->fmt.psz_language )
3824     {
3825         memcpy( pid->es->fmt.psz_language,
3826                 p_decoded->code[0].iso_639_code, 3 );
3827         pid->es->fmt.psz_language[3] = 0;
3828         msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language);
3829     }
3830     switch( p_decoded->code[0].i_audio_type )
3831     {
3832     case 0:
3833         pid->es->fmt.psz_description = NULL;
3834         break;
3835     case 1:
3836         pid->es->fmt.psz_description =
3837             strdup(_("clean effects"));
3838         break;
3839     case 2:
3840         pid->es->fmt.psz_description =
3841             strdup(_("hearing impaired"));
3842         break;
3843     case 3:
3844         pid->es->fmt.psz_description =
3845             strdup(_("visual impaired commentary"));
3846         break;
3847     default:
3848         msg_Dbg( p_demux, "unknown audio type: %d",
3849                  p_decoded->code[0].i_audio_type);
3850         pid->es->fmt.psz_description = NULL;
3851         break;
3852     }
3853     pid->es->fmt.i_extra_languages = p_decoded->i_code_count-1;
3854     if( pid->es->fmt.i_extra_languages > 0 )
3855         pid->es->fmt.p_extra_languages =
3856             malloc( sizeof(*pid->es->fmt.p_extra_languages) *
3857                     pid->es->fmt.i_extra_languages );
3858     if( pid->es->fmt.p_extra_languages )
3859     {
3860         for( int i = 0; i < pid->es->fmt.i_extra_languages; i++ )
3861         {
3862             msg_Dbg( p_demux, "bang" );
3863             pid->es->fmt.p_extra_languages[i].psz_language =
3864                 malloc(4);
3865             if( pid->es->fmt.p_extra_languages[i].psz_language )
3866             {
3867                 memcpy( pid->es->fmt.p_extra_languages[i].psz_language,
3868                     p_decoded->code[i+1].iso_639_code, 3 );
3869                 pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0';
3870             }
3871             switch( p_decoded->code[i].i_audio_type )
3872             {
3873             case 0:
3874                 pid->es->fmt.p_extra_languages[i].psz_description =
3875                     NULL;
3876                 break;
3877             case 1:
3878                 pid->es->fmt.p_extra_languages[i].psz_description =
3879                     strdup(_("clean effects"));
3880                 break;
3881             case 2:
3882                 pid->es->fmt.p_extra_languages[i].psz_description =
3883                     strdup(_("hearing impaired"));
3884                 break;
3885             case 3:
3886                 pid->es->fmt.p_extra_languages[i].psz_description =
3887                     strdup(_("visual impaired commentary"));
3888                 break;
3889             default:
3890                 msg_Dbg( p_demux, "unknown audio type: %d",
3891                         p_decoded->code[i].i_audio_type);
3892                 pid->es->fmt.psz_description = NULL;
3893                 break;
3894             }
3895
3896         }
3897     }
3898 #else
3899     pid->es->fmt.psz_language = malloc( 4 );
3900     if( pid->es->fmt.psz_language )
3901     {
3902         memcpy( pid->es->fmt.psz_language,
3903                 p_decoded->i_iso_639_code, 3 );
3904         pid->es->fmt.psz_language[3] = 0;
3905     }
3906 #endif
3907 }
3908
3909 static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
3910 {
3911     demux_sys_t          *p_sys = p_demux->p_sys;
3912     dvbpsi_descriptor_t  *p_dr;
3913     dvbpsi_pmt_es_t      *p_es;
3914
3915     ts_pid_t             *pmt = NULL;
3916     ts_prg_psi_t         *prg = NULL;
3917
3918     ts_pid_t             **pp_clean = NULL;
3919     int                  i_clean = 0;
3920     bool                 b_hdmv = false;
3921
3922     msg_Dbg( p_demux, "PMTCallBack called" );
3923
3924     /* First find this PMT declared in PAT */
3925     for( int i = 0; i < p_sys->i_pmt; i++ )
3926     {
3927         int i_prg;
3928         for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
3929         {
3930             const int i_pmt_number = p_sys->pmt[i]->psi->prg[i_prg]->i_number;
3931             if( i_pmt_number != TS_USER_PMT_NUMBER && i_pmt_number == p_pmt->i_program_number )
3932             {
3933                 pmt = p_sys->pmt[i];
3934                 prg = p_sys->pmt[i]->psi->prg[i_prg];
3935                 break;
3936             }
3937         }
3938         if( pmt )
3939             break;
3940     }
3941
3942     if( pmt == NULL )
3943     {
3944         msg_Warn( p_demux, "unreferenced program (broken stream)" );
3945         dvbpsi_DeletePMT(p_pmt);
3946         return;
3947     }
3948
3949     if( prg->i_version != -1 &&
3950         ( !p_pmt->b_current_next || prg->i_version == p_pmt->i_version ) )
3951     {
3952         dvbpsi_DeletePMT( p_pmt );
3953         return;
3954     }
3955
3956     /* Clean this program (remove all es) */
3957     for( int i = 0; i < 8192; i++ )
3958     {
3959         ts_pid_t *pid = &p_sys->pid[i];
3960
3961         if( pid->b_valid && pid->p_owner == pmt->psi &&
3962             pid->i_owner_number == prg->i_number && pid->psi == NULL )
3963         {
3964             TAB_APPEND( i_clean, pp_clean, pid );
3965         }
3966     }
3967     if( prg->iod )
3968     {
3969         IODFree( prg->iod );
3970         prg->iod = NULL;
3971     }
3972
3973     msg_Dbg( p_demux, "new PMT program number=%d version=%d pid_pcr=%d",
3974              p_pmt->i_program_number, p_pmt->i_version, p_pmt->i_pcr_pid );
3975     prg->i_pid_pcr = p_pmt->i_pcr_pid;
3976     prg->i_version = p_pmt->i_version;
3977
3978     ValidateDVBMeta( p_demux, prg->i_pid_pcr );
3979     if( ProgramIsSelected( p_demux, prg->i_number ) )
3980     {
3981         /* Set demux filter */
3982         SetPIDFilter( p_demux, prg->i_pid_pcr, true );
3983     }
3984     else
3985     {
3986         msg_Warn( p_demux, "skipping program (not selected)" );
3987         dvbpsi_DeletePMT(p_pmt);
3988         return;
3989     }
3990
3991     /* Parse descriptor */
3992     for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next )
3993     {
3994         if( p_dr->i_tag == 0x1d )
3995         {
3996             /* We have found an IOD descriptor */
3997             msg_Dbg( p_demux, " * descriptor : IOD (0x1d)" );
3998
3999             prg->iod = IODNew( p_dr->i_length, p_dr->p_data );
4000         }
4001         else if( p_dr->i_tag == 0x9 )
4002         {
4003             uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8)
4004                                 | p_dr->p_data[1];
4005             msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", i_sysid );
4006         }
4007         else if( p_dr->i_tag == 0x05 )
4008         {
4009             /* Registration Descriptor */
4010             if( p_dr->i_length != 4 )
4011             {
4012                 msg_Warn( p_demux, "invalid Registration Descriptor" );
4013             }
4014             else
4015             {
4016                 msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data );
4017                 if( !memcmp( p_dr->p_data, "HDMV", 4 ) )
4018                 {
4019                     /* Blu-Ray */
4020                     b_hdmv = true;
4021                 }
4022             }
4023         }
4024         else
4025         {
4026             msg_Dbg( p_demux, " * descriptor : unknown (0x%x)", p_dr->i_tag );
4027         }
4028     }
4029
4030     for( p_es = p_pmt->p_first_es; p_es != NULL; p_es = p_es->p_next )
4031     {
4032         ts_pid_t tmp_pid, *old_pid = 0, *pid = &tmp_pid;
4033
4034         /* Find out if the PID was already declared */
4035         for( int i = 0; i < i_clean; i++ )
4036         {
4037             if( pp_clean[i] == &p_sys->pid[p_es->i_pid] )
4038             {
4039                 old_pid = pp_clean[i];
4040                 break;
4041             }
4042         }
4043         ValidateDVBMeta( p_demux, p_es->i_pid );
4044
4045         if( !old_pid && p_sys->pid[p_es->i_pid].b_valid )
4046         {
4047             msg_Warn( p_demux, "pmt error: pid=%d already defined",
4048                       p_es->i_pid );
4049             continue;
4050         }
4051
4052         for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
4053              p_dr = p_dr->p_next )
4054         {
4055             msg_Dbg( p_demux, "  * es pid=%d type=%d dr->i_tag=0x%x",
4056                      p_es->i_pid, p_es->i_type, p_dr->i_tag );
4057         }
4058
4059         PIDInit( pid, false, pmt->psi );
4060         PIDFillFormat( pid, p_es->i_type );
4061         pid->i_owner_number = prg->i_number;
4062         pid->i_pid          = p_es->i_pid;
4063         pid->b_seen         = p_sys->pid[p_es->i_pid].b_seen;
4064
4065         if( p_es->i_type == 0x10 || p_es->i_type == 0x11 ||
4066             p_es->i_type == 0x12 || p_es->i_type == 0x0f )
4067         {
4068             PMTSetupEsISO14496( p_demux, pid, prg, p_es );
4069         }
4070         else if( p_es->i_type == 0x06 )
4071         {
4072             PMTSetupEs0x06(  p_demux, pid, p_es );
4073         }
4074         else if( p_es->i_type == 0xEA )
4075         {
4076             PMTSetupEs0xEA( p_demux, pid, p_es );
4077         }
4078         else if( p_es->i_type == 0xd1 )
4079         {
4080             PMTSetupEs0xD1( p_demux, pid, p_es );
4081         }
4082         else if( p_es->i_type == 0xa0 )
4083         {
4084             PMTSetupEs0xA0( p_demux, pid, p_es );
4085         }
4086         else if( b_hdmv )
4087         {
4088             PMTSetupEsHDMV( p_demux, pid, p_es );
4089         }
4090         else if( p_es->i_type >= 0x80 )
4091         {
4092             PMTSetupEsRegistration( p_demux, pid, p_es );
4093         }
4094
4095         if( pid->es->fmt.i_cat == AUDIO_ES ||
4096             ( pid->es->fmt.i_cat == SPU_ES &&
4097               pid->es->fmt.i_codec != VLC_CODEC_DVBS &&
4098               pid->es->fmt.i_codec != VLC_CODEC_TELETEXT ) )
4099         {
4100             PMTParseEsIso639( p_demux, pid, p_es );
4101         }
4102
4103         pid->es->fmt.i_group = p_pmt->i_program_number;
4104         for( int i = 0; i < pid->i_extra_es; i++ )
4105             pid->extra_es[i]->fmt.i_group = p_pmt->i_program_number;
4106
4107         if( pid->es->fmt.i_cat == UNKNOWN_ES )
4108         {
4109             msg_Dbg( p_demux, "  * es pid=%d type=%d *unknown*",
4110                      p_es->i_pid, p_es->i_type );
4111         }
4112         else if( !p_sys->b_udp_out )
4113         {
4114             msg_Dbg( p_demux, "  * es pid=%d type=%d fcc=%4.4s",
4115                      p_es->i_pid, p_es->i_type, (char*)&pid->es->fmt.i_codec );
4116
4117             if( p_sys->b_es_id_pid ) pid->es->fmt.i_id = p_es->i_pid;
4118
4119             /* Check if we can avoid restarting the ES */
4120             if( old_pid &&
4121                 pid->es->fmt.i_codec == old_pid->es->fmt.i_codec &&
4122                 pid->es->fmt.i_extra == old_pid->es->fmt.i_extra &&
4123                 pid->es->fmt.i_extra == 0 &&
4124                 pid->i_extra_es == old_pid->i_extra_es &&
4125                 ( ( !pid->es->fmt.psz_language &&
4126                     !old_pid->es->fmt.psz_language ) ||
4127                   ( pid->es->fmt.psz_language &&
4128                     old_pid->es->fmt.psz_language &&
4129                     !strcmp( pid->es->fmt.psz_language,
4130                              old_pid->es->fmt.psz_language ) ) ) )
4131             {
4132                 pid->es->id = old_pid->es->id;
4133                 old_pid->es->id = NULL;
4134                 for( int i = 0; i < pid->i_extra_es; i++ )
4135                 {
4136                     pid->extra_es[i]->id = old_pid->extra_es[i]->id;
4137                     old_pid->extra_es[i]->id = NULL;
4138                 }
4139             }
4140             else
4141             {
4142                 if( old_pid )
4143                 {
4144                     PIDClean( p_demux, old_pid );
4145                     TAB_REMOVE( i_clean, pp_clean, old_pid );
4146                     old_pid = 0;
4147                 }
4148
4149                 pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt );
4150                 for( int i = 0; i < pid->i_extra_es; i++ )
4151                 {
4152                     pid->extra_es[i]->id =
4153                         es_out_Add( p_demux->out, &pid->extra_es[i]->fmt );
4154                 }
4155                 p_sys->i_pmt_es += 1 + pid->i_extra_es;
4156             }
4157         }
4158
4159         /* Add ES to the list */
4160         if( old_pid )
4161         {
4162             PIDClean( p_demux, old_pid );
4163             TAB_REMOVE( i_clean, pp_clean, old_pid );
4164         }
4165         p_sys->pid[p_es->i_pid] = *pid;
4166
4167         p_dr = PMTEsFindDescriptor( p_es, 0x09 );
4168         if( p_dr && p_dr->i_length >= 2 )
4169         {
4170             uint16_t i_sysid = (p_dr->p_data[0] << 8) | p_dr->p_data[1];
4171             msg_Dbg( p_demux, "   * descriptor : CA (0x9) SysID 0x%x",
4172                      i_sysid );
4173         }
4174
4175         if( ProgramIsSelected( p_demux, prg->i_number ) &&
4176             ( pid->es->id != NULL || p_sys->b_udp_out ) )
4177         {
4178             /* Set demux filter */
4179             SetPIDFilter( p_demux, p_es->i_pid, true );
4180         }
4181     }
4182
4183     /* Set CAM descrambling */
4184     if( !ProgramIsSelected( p_demux, prg->i_number )
4185      || stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
4186                         ACCESS_SET_PRIVATE_ID_CA, p_pmt ) != VLC_SUCCESS )
4187         dvbpsi_DeletePMT( p_pmt );
4188
4189     for( int i = 0; i < i_clean; i++ )
4190     {
4191         if( ProgramIsSelected( p_demux, prg->i_number ) )
4192         {
4193             SetPIDFilter( p_demux, pp_clean[i]->i_pid, false );
4194         }
4195
4196         PIDClean( p_demux, pp_clean[i] );
4197     }
4198     if( i_clean )
4199         free( pp_clean );
4200 }
4201
4202 static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
4203 {
4204     demux_sys_t          *p_sys = p_demux->p_sys;
4205     dvbpsi_pat_program_t *p_program;
4206     ts_pid_t             *pat = &p_sys->pid[0];
4207
4208     msg_Dbg( p_demux, "PATCallBack called" );
4209
4210     if( ( pat->psi->i_pat_version != -1 &&
4211             ( !p_pat->b_current_next ||
4212               p_pat->i_version == pat->psi->i_pat_version ) ) ||
4213         p_sys->b_user_pmt )
4214     {
4215         dvbpsi_DeletePAT( p_pat );
4216         return;
4217     }
4218
4219     msg_Dbg( p_demux, "new PAT ts_id=%d version=%d current_next=%d",
4220              p_pat->i_ts_id, p_pat->i_version, p_pat->b_current_next );
4221
4222     /* Clean old */
4223     if( p_sys->i_pmt > 0 )
4224     {
4225         int      i_pmt_rm = 0;
4226         ts_pid_t **pmt_rm = NULL;
4227
4228         /* Search pmt to be deleted */
4229         for( int i = 0; i < p_sys->i_pmt; i++ )
4230         {
4231             ts_pid_t *pmt = p_sys->pmt[i];
4232             bool b_keep = false;
4233
4234             for( p_program = p_pat->p_first_program; p_program != NULL;
4235                  p_program = p_program->p_next )
4236             {
4237                 if( p_program->i_pid == pmt->i_pid )
4238                 {
4239                     for( int i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
4240                     {
4241                         if( p_program->i_number ==
4242                             pmt->psi->prg[i_prg]->i_number )
4243                         {
4244                             b_keep = true;
4245                             break;
4246                         }
4247                     }
4248                     if( b_keep )
4249                         break;
4250                 }
4251             }
4252
4253             if( !b_keep )
4254             {
4255                 TAB_APPEND( i_pmt_rm, pmt_rm, pmt );
4256             }
4257         }
4258
4259         /* Delete all ES attached to thoses PMT */
4260         for( int i = 2; i < 8192; i++ )
4261         {
4262             ts_pid_t *pid = &p_sys->pid[i];
4263
4264             if( !pid->b_valid || pid->psi )
4265                 continue;
4266
4267             for( int j = 0; j < i_pmt_rm && pid->b_valid; j++ )
4268             {
4269                 for( int i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
4270                 {
4271                     /* We only remove es that aren't defined by extra pmt */
4272                     if( pid->p_owner->prg[i_prg]->i_pid_pmt != pmt_rm[j]->i_pid )
4273                         continue;
4274
4275                     if( pid->es->id )
4276                         SetPIDFilter( p_demux, i, false );
4277
4278                     PIDClean( p_demux, pid );
4279                     break;
4280                 }
4281             }
4282         }
4283
4284         /* Delete PMT pid */
4285         for( int i = 0; i < i_pmt_rm; i++ )
4286         {
4287             SetPIDFilter( p_demux, pmt_rm[i]->i_pid, false );
4288
4289             for( int i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ )
4290             {
4291                 const int i_number = pmt_rm[i]->psi->prg[i_prg]->i_number;
4292                 es_out_Control( p_demux->out, ES_OUT_DEL_GROUP, i_number );
4293             }
4294
4295             PIDClean( p_demux, &p_sys->pid[pmt_rm[i]->i_pid] );
4296             TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] );
4297         }
4298
4299         free( pmt_rm );
4300     }
4301
4302     /* now create programs */
4303     for( p_program = p_pat->p_first_program; p_program != NULL;
4304          p_program = p_program->p_next )
4305     {
4306         msg_Dbg( p_demux, "  * number=%d pid=%d", p_program->i_number,
4307                  p_program->i_pid );
4308         if( p_program->i_number != 0 )
4309         {
4310             ts_pid_t *pmt = &p_sys->pid[p_program->i_pid];
4311             bool b_add = true;
4312
4313             ValidateDVBMeta( p_demux, p_program->i_pid );
4314
4315             if( pmt->b_valid )
4316             {
4317                 int i_prg;
4318                 for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
4319                 {
4320                     if( pmt->psi->prg[i_prg]->i_number == p_program->i_number )
4321                     {
4322                         b_add = false;
4323                         break;
4324                     }
4325                 }
4326             }
4327             else
4328             {
4329                 TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt );
4330             }
4331
4332             if( b_add )
4333             {
4334                 PIDInit( pmt, true, pat->psi );
4335                 pmt->psi->prg[pmt->psi->i_prg-1]->handle =
4336                     dvbpsi_AttachPMT( p_program->i_number,
4337                                       (dvbpsi_pmt_callback)PMTCallBack,
4338                                       p_demux );
4339                 pmt->psi->prg[pmt->psi->i_prg-1]->i_number =
4340                     p_program->i_number;
4341                 pmt->psi->prg[pmt->psi->i_prg-1]->i_pid_pmt =
4342                     p_program->i_pid;
4343
4344                 /* Now select PID at access level */
4345                 if( ProgramIsSelected( p_demux, p_program->i_number ) )
4346                 {
4347                     if( p_sys->i_current_program == 0 )
4348                         p_sys->i_current_program = p_program->i_number;
4349
4350                     if( SetPIDFilter( p_demux, p_program->i_pid, true ) )
4351                         p_sys->b_access_control = false;
4352                 }
4353             }
4354         }
4355     }
4356     pat->psi->i_pat_version = p_pat->i_version;
4357
4358     dvbpsi_DeletePAT( p_pat );
4359 }