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