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