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