]> git.sesse.net Git - vlc/blob - modules/demux/ts.c
Small cleanup
[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,
883                             ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid,
884                             VLC_FALSE );
885         }
886
887     }
888
889     if( p_sys->b_udp_out )
890     {
891         net_Close( p_sys->fd );
892         free( p_sys->buffer );
893     }
894     if( p_sys->csa )
895     {
896         csa_Delete( p_sys->csa );
897     }
898
899     if( p_sys->i_pmt ) free( p_sys->pmt );
900
901     if ( p_sys->p_programs_list )
902     {
903         vlc_value_t val;
904         val.p_list = p_sys->p_programs_list;
905         var_Change( p_demux, "programs", VLC_VAR_FREELIST, &val, NULL );
906     }
907
908     /* If in dump mode, then close the file */
909     if( p_sys->b_file_out )
910     {
911         msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)",
912                   p_sys->psz_file, p_sys->i_write / 1024 );
913
914         if( p_sys->p_file != stdout )
915         {
916             fclose( p_sys->p_file );
917             p_sys->p_file = NULL;
918         }
919
920         free( p_sys->buffer );
921     }
922
923     free( p_sys->psz_file );
924     p_sys->psz_file = NULL;
925
926     free( p_sys );
927 }
928
929 /*****************************************************************************
930  * DemuxFile:
931  *****************************************************************************/
932 static int DemuxFile( demux_t *p_demux )
933 {
934     demux_sys_t *p_sys = p_demux->p_sys;
935     uint8_t     *p_buffer = p_sys->buffer; /* Put first on sync byte */
936     int i_diff= 0;
937     int i_data= 0;
938     int i_pos = 0;
939     int i_bufsize = p_sys->i_packet_size * p_sys->i_ts_read;
940
941     i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize );
942     if( (i_data <= 0) && (i_data < p_sys->i_packet_size) )
943     {
944         msg_Dbg( p_demux, "error reading malformed packets" );
945         return i_data;
946     }
947
948     /* Test continuity counter */
949     while( i_pos < i_data )
950     {
951         ts_pid_t    *p_pid;   /* point to a PID structure */
952         vlc_bool_t b_payload; /* indicates a packet with payload */
953         vlc_bool_t b_adaptation; /* adaptation field */
954         int i_cc  = 0;        /* continuity counter */
955
956         if( p_sys->buffer[i_pos] != 0x47 )
957         {
958             msg_Warn( p_demux, "lost sync" );
959             while( !p_demux->b_die && (i_pos < i_data) )
960             {
961                 i_pos++;
962                 if( p_sys->buffer[i_pos] == 0x47 )
963                     break;
964             }
965             if( !p_demux->b_die )
966                 msg_Warn( p_demux, "sync found" );
967         }
968
969         /* continuous when (one of this):
970          * diff == 1
971          * diff == 0 and payload == 0
972          * diff == 0 and duplicate packet (playload != 0) <- should we
973          *   test the content ?
974          */
975         i_cc  = p_buffer[i_pos+3]&0x0f;
976         b_payload = p_buffer[i_pos+3]&0x10;
977         b_adaptation = p_buffer[i_pos+3]&0x20;
978
979         /* Get the PID */
980         p_pid = &p_sys->pid[ ((p_buffer[i_pos+1]&0x1f)<<8)|p_buffer[i_pos+2] ];
981
982         /* Detect discontinuity indicator in adaptation field */
983         if( b_adaptation && p_buffer[i_pos + 4] > 0 )
984         {
985             if( p_buffer[i_pos+5]&0x80 )
986                 msg_Warn( p_demux, "discontinuity indicator (pid=%d) ", p_pid->i_pid );
987             if( p_buffer[i_pos+5]&0x40 )
988                 msg_Warn( p_demux, "random access indicator (pid=%d) ", p_pid->i_pid );
989         }
990
991         i_diff = ( i_cc - p_pid->i_cc )&0x0f;
992         if( b_payload && i_diff == 1 )
993         {
994             p_pid->i_cc = ( p_pid->i_cc + 1 ) & 0xf;
995         }
996         else
997         {
998             if( p_pid->i_cc == 0xff )
999             {
1000                 msg_Warn( p_demux, "first packet for pid=%d cc=0x%x",
1001                         p_pid->i_pid, i_cc );
1002                 p_pid->i_cc = i_cc;
1003             }
1004             else if( i_diff != 0 )
1005             {
1006                 /* FIXME what to do when discontinuity_indicator is set ? */
1007                 msg_Warn( p_demux, "transport error detected 0x%x instead of 0x%x",
1008                           i_cc, ( p_pid->i_cc + 1 )&0x0f );
1009
1010                 p_pid->i_cc = i_cc;
1011                 /* Mark transport error in the TS packet. */
1012                 p_buffer[i_pos+1] |= 0x80;
1013             }
1014         }
1015
1016         /* Test if user wants to decrypt it first */
1017         if( p_sys->csa )
1018             csa_Decrypt( p_demux->p_sys->csa, &p_buffer[i_pos], p_demux->p_sys->i_csa_pkt_size );
1019
1020         i_pos += p_sys->i_packet_size;
1021     }
1022
1023     /* Then write */
1024     i_data = fwrite( p_sys->buffer, 1, i_data, p_sys->p_file );
1025     if( i_data < 0 )
1026     {
1027         msg_Err( p_demux, "failed to write data" );
1028         return -1;
1029     }
1030 #if 0
1031     msg_Dbg( p_demux, "dumped %d bytes", i_data );
1032 #endif
1033
1034     p_sys->i_write += i_data;
1035     return 1;
1036 }
1037
1038 /*****************************************************************************
1039  * Demux:
1040  *****************************************************************************/
1041 static int Demux( demux_t *p_demux )
1042 {
1043     demux_sys_t *p_sys = p_demux->p_sys;
1044     int          i_pkt;
1045
1046     /* We read at most 100 TS packet or until a frame is completed */
1047     for( i_pkt = 0; i_pkt < p_sys->i_ts_read; i_pkt++ )
1048     {
1049         vlc_bool_t  b_frame = VLC_FALSE;
1050         block_t     *p_pkt;
1051         ts_pid_t    *p_pid;
1052
1053         /* Get a new TS packet */
1054         if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) )
1055         {
1056             msg_Dbg( p_demux, "eof ?" );
1057             return 0;
1058         }
1059
1060         /* Check sync byte and re-sync if needed */
1061         if( p_pkt->p_buffer[0] != 0x47 )
1062         {
1063             msg_Warn( p_demux, "lost synchro" );
1064             block_Release( p_pkt );
1065
1066             while( !p_demux->b_die )
1067             {
1068                 uint8_t *p_peek;
1069                 int i_peek, i_skip = 0;
1070
1071                 i_peek = stream_Peek( p_demux->s, &p_peek,
1072                                       p_sys->i_packet_size * 10 );
1073                 if( i_peek < p_sys->i_packet_size + 1 )
1074                 {
1075                     msg_Dbg( p_demux, "eof ?" );
1076                     return 0;
1077                 }
1078
1079                 while( i_skip < i_peek - p_sys->i_packet_size )
1080                 {
1081                     if( p_peek[i_skip] == 0x47 &&
1082                         p_peek[i_skip + p_sys->i_packet_size] == 0x47 )
1083                     {
1084                         break;
1085                     }
1086                     i_skip++;
1087                 }
1088
1089                 msg_Dbg( p_demux, "skipping %d bytes of garbage", i_skip );
1090                 stream_Read( p_demux->s, NULL, i_skip );
1091
1092                 if( i_skip < i_peek - p_sys->i_packet_size )
1093                 {
1094                     break;
1095                 }
1096             }
1097
1098             if( !( p_pkt = stream_Block( p_demux->s, p_sys->i_packet_size ) ) )
1099             {
1100                 msg_Dbg( p_demux, "eof ?" );
1101                 return 0;
1102             }
1103         }
1104
1105         if( p_sys->b_udp_out )
1106         {
1107             memcpy( &p_sys->buffer[i_pkt * p_sys->i_packet_size],
1108                     p_pkt->p_buffer, p_sys->i_packet_size );
1109         }
1110
1111         /* Parse the TS packet */
1112         p_pid = &p_sys->pid[PIDGet( p_pkt )];
1113
1114         if( p_pid->b_valid )
1115         {
1116             if( p_pid->psi )
1117             {
1118                 if( p_pid->i_pid == 0 || p_pid->i_pid == 0x11 || p_pid->i_pid == 0x12 )
1119                 {
1120                     dvbpsi_PushPacket( p_pid->psi->handle, p_pkt->p_buffer );
1121                 }
1122                 else
1123                 {
1124                     int i_prg;
1125                     for( i_prg = 0; i_prg < p_pid->psi->i_prg; i_prg++ )
1126                     {
1127                         dvbpsi_PushPacket( p_pid->psi->prg[i_prg]->handle,
1128                                            p_pkt->p_buffer );
1129                     }
1130                 }
1131                 block_Release( p_pkt );
1132             }
1133             else if( !p_sys->b_udp_out )
1134             {
1135                 b_frame = GatherPES( p_demux, p_pid, p_pkt );
1136             }
1137             else
1138             {
1139                 PCRHandle( p_demux, p_pid, p_pkt );
1140                 block_Release( p_pkt );
1141             }
1142         }
1143         else
1144         {
1145             if( !p_pid->b_seen )
1146             {
1147                 msg_Dbg( p_demux, "pid[%d] unknown", p_pid->i_pid );
1148             }
1149             /* We have to handle PCR if present */
1150             PCRHandle( p_demux, p_pid, p_pkt );
1151             block_Release( p_pkt );
1152         }
1153         p_pid->b_seen = VLC_TRUE;
1154
1155         if( b_frame )
1156         {
1157             break;
1158         }
1159     }
1160
1161     if( p_sys->b_udp_out )
1162     {
1163         /* Send the complete block */
1164         net_Write( p_demux, p_sys->fd, NULL, p_sys->buffer,
1165                    p_sys->i_ts_read * p_sys->i_packet_size );
1166     }
1167
1168     return 1;
1169 }
1170
1171 /*****************************************************************************
1172  * Control:
1173  *****************************************************************************/
1174 static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_length )
1175 {
1176     demux_sys_t *p_sys = p_demux->p_sys;
1177     if( pi_length )
1178         *pi_length = 0;
1179     if( pi_time )
1180         *pi_time = 0;
1181
1182 #ifdef HAVE_TIME_H
1183     if( p_sys->b_dvb_control && p_sys->i_dvb_length > 0 )
1184     {
1185         /* FIXME we should not use time() but read the date from the tdt */
1186         const time_t t = time( NULL );
1187         if( p_sys->i_dvb_start <= t && t < p_sys->i_dvb_start + p_sys->i_dvb_length )
1188         {
1189             if( pi_length )
1190                 *pi_length = p_sys->i_dvb_length * I64C(1000000);
1191             if( pi_time )
1192                 *pi_time   = (t - p_sys->i_dvb_start) * I64C(1000000);
1193             return VLC_SUCCESS;
1194         }
1195     }
1196 #endif
1197     return VLC_EGENERIC;
1198 }
1199
1200 static int Control( demux_t *p_demux, int i_query, va_list args )
1201 {
1202     demux_sys_t *p_sys = p_demux->p_sys;
1203     double f, *pf;
1204     int64_t i64;
1205     int64_t *pi64;
1206     int i_int;
1207
1208     if( p_sys->b_file_out )
1209         return demux2_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
1210
1211     switch( i_query )
1212     {
1213         case DEMUX_GET_POSITION:
1214             pf = (double*) va_arg( args, double* );
1215             i64 = stream_Size( p_demux->s );
1216             if( i64 > 0 )
1217             {
1218                 *pf = (double)stream_Tell( p_demux->s ) / (double)i64;
1219             }
1220             else
1221             {
1222                 int64_t i_time, i_length;
1223                 if( !DVBEventInformation( p_demux, &i_time, &i_length ) && i_length > 0 )
1224                     *pf = (double)i_time/(double)i_length;
1225                 else
1226                     *pf = 0.0;
1227             }
1228             return VLC_SUCCESS;
1229         case DEMUX_SET_POSITION:
1230             f = (double) va_arg( args, double );
1231             i64 = stream_Size( p_demux->s );
1232
1233             es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
1234             if( stream_Seek( p_demux->s, (int64_t)(i64 * f) ) )
1235             {
1236                 return VLC_EGENERIC;
1237             }
1238             return VLC_SUCCESS;
1239 #if 0
1240
1241         case DEMUX_GET_TIME:
1242             pi64 = (int64_t*)va_arg( args, int64_t * );
1243             if( p_sys->i_time < 0 )
1244             {
1245                 *pi64 = 0;
1246                 return VLC_EGENERIC;
1247             }
1248             *pi64 = p_sys->i_time;
1249             return VLC_SUCCESS;
1250
1251         case DEMUX_GET_LENGTH:
1252             pi64 = (int64_t*)va_arg( args, int64_t * );
1253             if( p_sys->i_mux_rate > 0 )
1254             {
1255                 *pi64 = I64C(1000000) * ( stream_Size( p_demux->s ) / 50 ) /
1256                         p_sys->i_mux_rate;
1257                 return VLC_SUCCESS;
1258             }
1259             *pi64 = 0;
1260             return VLC_EGENERIC;
1261 #else
1262         case DEMUX_GET_TIME:
1263             pi64 = (int64_t*)va_arg( args, int64_t * );
1264             if( DVBEventInformation( p_demux, pi64, NULL ) )
1265                 *pi64 = 0;
1266             return VLC_SUCCESS;
1267
1268         case DEMUX_GET_LENGTH:
1269             pi64 = (int64_t*)va_arg( args, int64_t * );
1270             if( DVBEventInformation( p_demux, NULL, pi64 ) )
1271                 *pi64 = 0;
1272             return VLC_SUCCESS;
1273 #endif
1274         case DEMUX_SET_GROUP:
1275         {
1276             uint16_t i_vpid = 0, i_apid1 = 0, i_apid2 = 0, i_apid3 = 0;
1277             ts_prg_psi_t *p_prg = NULL;
1278             vlc_list_t *p_list;
1279
1280             i_int = (int)va_arg( args, int );
1281             p_list = (vlc_list_t *)va_arg( args, vlc_list_t * );
1282             msg_Dbg( p_demux, "DEMUX_SET_GROUP %d %p", i_int, p_list );
1283
1284             if( p_sys->b_dvb_control && i_int > 0 && i_int != p_sys->i_dvb_program )
1285             {
1286                 int i_pmt_pid = -1;
1287                 int i;
1288
1289                 /* Search pmt to be unselected */
1290                 for( i = 0; i < p_sys->i_pmt; i++ )
1291                 {
1292                     ts_pid_t *pmt = p_sys->pmt[i];
1293                     int i_prg;
1294
1295                     for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
1296                     {
1297                         if( pmt->psi->prg[i_prg]->i_number == p_sys->i_dvb_program )
1298                         {
1299                             i_pmt_pid = p_sys->pmt[i]->i_pid;
1300                             break;
1301                         }
1302                     }
1303                     if( i_pmt_pid > 0 ) break;
1304                 }
1305
1306                 if( i_pmt_pid > 0 )
1307                 {
1308                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1309                                     ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
1310                                     VLC_FALSE );
1311                     /* All ES */
1312                     for( i = 2; i < 8192; i++ )
1313                     {
1314                         ts_pid_t *pid = &p_sys->pid[i];
1315                         int i_prg;
1316
1317                         if( !pid->b_valid || pid->psi ) continue;
1318
1319                         for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
1320                         {
1321                             if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
1322                             {
1323                                 /* We only remove es that aren't defined by extra pmt */
1324                                 stream_Control( p_demux->s,
1325                                                 STREAM_CONTROL_ACCESS,
1326                                                 ACCESS_SET_PRIVATE_ID_STATE,
1327                                                 i, VLC_FALSE );
1328                                 break;
1329                             }
1330                         }
1331                     }
1332                 }
1333
1334                 /* select new program */
1335                 p_sys->i_dvb_program = i_int;
1336                 i_pmt_pid = -1;
1337                 for( i = 0; i < p_sys->i_pmt; i++ )
1338                 {
1339                     ts_pid_t *pmt = p_sys->pmt[i];
1340                     int i_prg;
1341
1342                     for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
1343                     {
1344                         if( pmt->psi->prg[i_prg]->i_number == i_int )
1345                         {
1346                             i_pmt_pid = p_sys->pmt[i]->i_pid;
1347                             p_prg = p_sys->pmt[i]->psi->prg[i_prg];
1348                             break;
1349                         }
1350                     }
1351                     if( i_pmt_pid > 0 ) break;
1352                 }
1353                 if( i_pmt_pid > 0 )
1354                 {
1355                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1356                                     ACCESS_SET_PRIVATE_ID_STATE, i_pmt_pid,
1357                                     VLC_TRUE );
1358                     stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
1359                                     ACCESS_SET_PRIVATE_ID_STATE, p_prg->i_pid_pcr,
1360                                     VLC_TRUE );
1361
1362                     for( i = 2; i < 8192; i++ )
1363                     {
1364                         ts_pid_t *pid = &p_sys->pid[i];
1365                         int i_prg;
1366
1367                         if( !pid->b_valid || pid->psi ) continue;
1368
1369                         for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
1370                         {
1371                             if( pid->p_owner->prg[i_prg]->i_pid_pmt == i_pmt_pid && pid->es->id )
1372                             {
1373                                 if ( pid->es->fmt.i_cat == VIDEO_ES && !i_vpid )
1374                                     i_vpid = i;
1375                                 if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid1 )
1376                                     i_apid1 = i;
1377                                 else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid2 )
1378                                     i_apid2 = i;
1379                                 else if ( pid->es->fmt.i_cat == AUDIO_ES && !i_apid3 )
1380                                     i_apid3 = i;
1381
1382                                 stream_Control( p_demux->s,
1383                                                 STREAM_CONTROL_ACCESS,
1384                                                 ACCESS_SET_PRIVATE_ID_STATE,
1385                                                 i, VLC_TRUE );
1386                                 break;
1387                             }
1388                         }
1389                     }
1390                 }
1391             }
1392             else
1393             {
1394                 p_sys->i_dvb_program = -1;
1395                 p_sys->p_programs_list = p_list;
1396             }
1397             return VLC_SUCCESS;
1398         }
1399
1400         case DEMUX_GET_FPS:
1401         case DEMUX_SET_TIME:
1402         default:
1403             return VLC_EGENERIC;
1404     }
1405 }
1406
1407 static void PIDInit( ts_pid_t *pid, vlc_bool_t b_psi, ts_psi_t *p_owner )
1408 {
1409     vlc_bool_t b_old_valid = pid->b_valid;
1410
1411     pid->b_valid    = VLC_TRUE;
1412     pid->i_cc       = 0xff;
1413     pid->p_owner    = p_owner;
1414     pid->i_owner_number = 0;
1415
1416     TAB_INIT( pid->i_extra_es, pid->extra_es );
1417
1418     if( b_psi )
1419     {
1420         pid->es  = NULL;
1421
1422         if( !b_old_valid )
1423         {
1424             pid->psi = malloc( sizeof( ts_psi_t ) );
1425             pid->psi->handle= NULL;
1426             pid->psi->i_prg = 0;
1427             pid->psi->prg   = NULL;
1428         }
1429         pid->psi->i_pat_version  = -1;
1430         pid->psi->i_sdt_version  = -1;
1431         if( p_owner )
1432         {
1433             ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) );
1434             /* PMT */
1435             prg->i_version  = -1;
1436             prg->i_number   = -1;
1437             prg->i_pid_pcr  = -1;
1438             prg->i_pid_pmt  = -1;
1439             prg->iod        = NULL;
1440             prg->handle     = NULL;
1441
1442             TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg );
1443         }
1444     }
1445     else
1446     {
1447         pid->psi = NULL;
1448         pid->es  = malloc( sizeof( ts_es_t ) );
1449
1450         es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 );
1451         pid->es->id      = NULL;
1452         pid->es->p_pes   = NULL;
1453         pid->es->i_pes_size= 0;
1454         pid->es->i_pes_gathered= 0;
1455         pid->es->pp_last = &pid->es->p_pes;
1456         pid->es->p_mpeg4desc = NULL;
1457         pid->es->b_gather = VLC_FALSE;
1458     }
1459 }
1460
1461 static void PIDClean( es_out_t *out, ts_pid_t *pid )
1462 {
1463     if( pid->psi )
1464     {
1465         int i;
1466
1467         if( pid->psi->handle ) dvbpsi_DetachPMT( pid->psi->handle );
1468         for( i = 0; i < pid->psi->i_prg; i++ )
1469         {
1470             if( pid->psi->prg[i]->iod )
1471                 IODFree( pid->psi->prg[i]->iod );
1472             if( pid->psi->prg[i]->handle )
1473                 dvbpsi_DetachPMT( pid->psi->prg[i]->handle );
1474             free( pid->psi->prg[i] );
1475         }
1476         if( pid->psi->prg ) free( pid->psi->prg );
1477         free( pid->psi );
1478     }
1479     else
1480     {
1481         int i;
1482
1483         if( pid->es->id )
1484             es_out_Del( out, pid->es->id );
1485
1486         if( pid->es->p_pes )
1487             block_ChainRelease( pid->es->p_pes );
1488
1489         es_format_Clean( &pid->es->fmt );
1490
1491         free( pid->es );
1492
1493         for( i = 0; i < pid->i_extra_es; i++ )
1494         {
1495             if( pid->extra_es[i]->id )
1496                 es_out_Del( out, pid->extra_es[i]->id );
1497
1498             if( pid->extra_es[i]->p_pes )
1499                 block_ChainRelease( pid->extra_es[i]->p_pes );
1500
1501             es_format_Clean( &pid->extra_es[i]->fmt );
1502
1503             free( pid->extra_es[i] );
1504         }
1505         if( pid->i_extra_es ) free( pid->extra_es );
1506     }
1507
1508     pid->b_valid = VLC_FALSE;
1509 }
1510
1511 /****************************************************************************
1512  * gathering stuff
1513  ****************************************************************************/
1514 static void ParsePES( demux_t *p_demux, ts_pid_t *pid )
1515 {
1516     block_t *p_pes = pid->es->p_pes;
1517     uint8_t header[30];
1518     int     i_pes_size = 0;
1519     int     i_skip = 0;
1520     mtime_t i_dts = -1;
1521     mtime_t i_pts = -1;
1522     mtime_t i_length = 0;
1523     int i_max;
1524
1525     /* remove the pes from pid */
1526     pid->es->p_pes = NULL;
1527     pid->es->i_pes_size= 0;
1528     pid->es->i_pes_gathered= 0;
1529     pid->es->pp_last = &pid->es->p_pes;
1530
1531     /* FIXME find real max size */
1532     i_max = block_ChainExtract( p_pes, header, 30 );
1533
1534
1535     if( header[0] != 0 || header[1] != 0 || header[2] != 1 )
1536     {
1537         if( !p_demux->p_sys->b_silent )
1538             msg_Warn( p_demux, "invalid header [0x%x:%x:%x:%x] (pid: %d)",
1539                       header[0], header[1],header[2],header[3], pid->i_pid );
1540         block_ChainRelease( p_pes );
1541         return;
1542     }
1543
1544     /* TODO check size */
1545     switch( header[3] )
1546     {
1547         case 0xBC:  /* Program stream map */
1548         case 0xBE:  /* Padding */
1549         case 0xBF:  /* Private stream 2 */
1550         case 0xB0:  /* ECM */
1551         case 0xB1:  /* EMM */
1552         case 0xFF:  /* Program stream directory */
1553         case 0xF2:  /* DSMCC stream */
1554         case 0xF8:  /* ITU-T H.222.1 type E stream */
1555             i_skip = 6;
1556             break;
1557         default:
1558             if( ( header[6]&0xC0 ) == 0x80 )
1559             {
1560                 /* mpeg2 PES */
1561                 i_skip = header[8] + 9;
1562
1563                 if( header[7]&0x80 )    /* has pts */
1564                 {
1565                     i_pts = ((mtime_t)(header[ 9]&0x0e ) << 29)|
1566                              (mtime_t)(header[10] << 22)|
1567                             ((mtime_t)(header[11]&0xfe) << 14)|
1568                              (mtime_t)(header[12] << 7)|
1569                              (mtime_t)(header[13] >> 1);
1570
1571                     if( header[7]&0x40 )    /* has dts */
1572                     {
1573                          i_dts = ((mtime_t)(header[14]&0x0e ) << 29)|
1574                                  (mtime_t)(header[15] << 22)|
1575                                 ((mtime_t)(header[16]&0xfe) << 14)|
1576                                  (mtime_t)(header[17] << 7)|
1577                                  (mtime_t)(header[18] >> 1);
1578                     }
1579                 }
1580             }
1581             else
1582             {
1583                 i_skip = 6;
1584                 while( i_skip < 23 && header[i_skip] == 0xff )
1585                 {
1586                     i_skip++;
1587                 }
1588                 if( i_skip == 23 )
1589                 {
1590                     msg_Err( p_demux, "too much MPEG-1 stuffing" );
1591                     block_ChainRelease( p_pes );
1592                     return;
1593                 }
1594                 if( ( header[i_skip] & 0xC0 ) == 0x40 )
1595                 {
1596                     i_skip += 2;
1597                 }
1598
1599                 if(  header[i_skip]&0x20 )
1600                 {
1601                      i_pts = ((mtime_t)(header[i_skip]&0x0e ) << 29)|
1602                               (mtime_t)(header[i_skip+1] << 22)|
1603                              ((mtime_t)(header[i_skip+2]&0xfe) << 14)|
1604                               (mtime_t)(header[i_skip+3] << 7)|
1605                               (mtime_t)(header[i_skip+4] >> 1);
1606
1607                     if( header[i_skip]&0x10 )    /* has dts */
1608                     {
1609                          i_dts = ((mtime_t)(header[i_skip+5]&0x0e ) << 29)|
1610                                   (mtime_t)(header[i_skip+6] << 22)|
1611                                  ((mtime_t)(header[i_skip+7]&0xfe) << 14)|
1612                                   (mtime_t)(header[i_skip+8] << 7)|
1613                                   (mtime_t)(header[i_skip+9] >> 1);
1614                          i_skip += 10;
1615                     }
1616                     else
1617                     {
1618                         i_skip += 5;
1619                     }
1620                 }
1621                 else
1622                 {
1623                     i_skip += 1;
1624                 }
1625             }
1626             break;
1627     }
1628
1629     if( pid->es->fmt.i_codec == VLC_FOURCC( 'a', '5', '2', 'b' ) ||
1630         pid->es->fmt.i_codec == VLC_FOURCC( 'd', 't', 's', 'b' ) )
1631     {
1632         i_skip += 4;
1633     }
1634     else if( pid->es->fmt.i_codec == VLC_FOURCC( 'l', 'p', 'c', 'b' ) ||
1635              pid->es->fmt.i_codec == VLC_FOURCC( 's', 'p', 'u', 'b' ) ||
1636              pid->es->fmt.i_codec == VLC_FOURCC( 's', 'd', 'd', 'b' ) )
1637     {
1638         i_skip += 1;
1639     }
1640     else if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) &&
1641              pid->es->p_mpeg4desc )
1642     {
1643         decoder_config_descriptor_t *dcd = &pid->es->p_mpeg4desc->dec_descr;
1644
1645         if( dcd->i_decoder_specific_info_len > 2 &&
1646             dcd->p_decoder_specific_info[0] == 0x10 &&
1647             ( dcd->p_decoder_specific_info[1]&0x10 ) )
1648         {
1649             /* display length */
1650             if( p_pes->i_buffer + 2 <= i_skip )
1651             {
1652                 i_length = GetWBE( &p_pes->p_buffer[i_skip] );
1653             }
1654
1655             i_skip += 2;
1656         }
1657         if( p_pes->i_buffer + 2 <= i_skip )
1658         {
1659             i_pes_size = GetWBE( &p_pes->p_buffer[i_skip] );
1660         }
1661         /* */
1662         i_skip += 2;
1663     }
1664     else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
1665         i_skip = 0; /* FIXME hack for zvbi support, breaks telx decoder */
1666
1667     /* skip header */
1668     while( p_pes && i_skip > 0 )
1669     {
1670         if( p_pes->i_buffer <= i_skip )
1671         {
1672             block_t *p_next = p_pes->p_next;
1673
1674             i_skip -= p_pes->i_buffer;
1675             block_Release( p_pes );
1676             p_pes = p_next;
1677         }
1678         else
1679         {
1680             p_pes->i_buffer -= i_skip;
1681             p_pes->p_buffer += i_skip;
1682             break;
1683         }
1684     }
1685
1686     /* ISO/IEC 13818-1 2.7.5: if no pts and no dts, then dts == pts */
1687     if( i_pts >= 0 && i_dts < 0 )
1688         i_dts = i_pts;
1689
1690     if( p_pes )
1691     {
1692         block_t *p_block;
1693         int i;
1694
1695         if( i_dts >= 0 )
1696         {
1697             p_pes->i_dts = i_dts * 100 / 9;
1698         }
1699         if( i_pts >= 0 )
1700         {
1701             p_pes->i_pts = i_pts * 100 / 9;
1702         }
1703         p_pes->i_length = i_length * 100 / 9;
1704
1705         p_block = block_ChainGather( p_pes );
1706         if( pid->es->fmt.i_codec == VLC_FOURCC( 's', 'u', 'b', 't' ) )
1707         {
1708             if( i_pes_size > 0 && p_block->i_buffer > i_pes_size )
1709             {
1710                 p_block->i_buffer = i_pes_size;
1711             }
1712             /* Append a \0 */
1713             p_block = block_Realloc( p_block, 0, p_block->i_buffer + 1 );
1714             p_block->p_buffer[p_block->i_buffer -1] = '\0';
1715         }
1716
1717         for( i = 0; i < pid->i_extra_es; i++ )
1718         {
1719             es_out_Send( p_demux->out, pid->extra_es[i]->id,
1720                          block_Duplicate( p_block ) );
1721         }
1722
1723         es_out_Send( p_demux->out, pid->es->id, p_block );
1724     }
1725     else
1726     {
1727         msg_Warn( p_demux, "empty pes" );
1728     }
1729 }
1730
1731 static void PCRHandle( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
1732 {
1733     demux_sys_t   *p_sys = p_demux->p_sys;
1734     const uint8_t *p = p_bk->p_buffer;
1735
1736     if( ( p[3]&0x20 ) && /* adaptation */
1737         ( p[5]&0x10 ) &&
1738         ( p[4] >= 7 ) )
1739     {
1740         int i;
1741         mtime_t i_pcr;  /* 33 bits */
1742
1743         i_pcr = ( (mtime_t)p[6] << 25 ) |
1744                 ( (mtime_t)p[7] << 17 ) |
1745                 ( (mtime_t)p[8] << 9 ) |
1746                 ( (mtime_t)p[9] << 1 ) |
1747                 ( (mtime_t)p[10] >> 7 );
1748
1749         /* Search program and set the PCR */
1750         for( i = 0; i < p_sys->i_pmt; i++ )
1751         {
1752             int i_prg;
1753             for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
1754             {
1755                 if( pid->i_pid == p_sys->pmt[i]->psi->prg[i_prg]->i_pid_pcr )
1756                 {
1757                     es_out_Control( p_demux->out, ES_OUT_SET_GROUP_PCR,
1758                                     (int)p_sys->pmt[i]->psi->prg[i_prg]->i_number,
1759                                     (int64_t)(i_pcr * 100 / 9) );
1760                 }
1761             }
1762         }
1763     }
1764 }
1765
1766 static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
1767 {
1768     const uint8_t    *p = p_bk->p_buffer;
1769     const vlc_bool_t b_unit_start = p[1]&0x40;
1770     const vlc_bool_t b_adaptation = p[3]&0x20;
1771     const vlc_bool_t b_payload    = p[3]&0x10;
1772     const int        i_cc         = p[3]&0x0f;   /* continuity counter */
1773     vlc_bool_t       b_discontinuity = VLC_FALSE;/* discontinuity */    
1774
1775     /* transport_scrambling_control is ignored */
1776     int         i_skip = 0;
1777     vlc_bool_t  i_ret  = VLC_FALSE;
1778     int         i_diff;
1779
1780 #if 0
1781     msg_Dbg( p_demux, "pid=%d unit_start=%d adaptation=%d payload=%d "
1782              "cc=0x%x", pid->i_pid, b_unit_start, b_adaptation,
1783              b_payload, i_cc );
1784 #endif
1785
1786     /* For now, ignore additional error correction
1787      * TODO: handle Reed-Solomon 204,188 error correction */
1788     p_bk->i_buffer = TS_PACKET_SIZE_188;
1789
1790     if( p[1]&0x80 )
1791     {
1792         msg_Dbg( p_demux, "transport_error_indicator set (pid=%d)",
1793                  pid->i_pid );
1794         if( pid->es->p_pes ) //&& pid->es->fmt.i_cat == VIDEO_ES )
1795             pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
1796     }
1797
1798     if( p_demux->p_sys->csa )
1799     {
1800         csa_Decrypt( p_demux->p_sys->csa, p_bk->p_buffer, p_demux->p_sys->i_csa_pkt_size );
1801     }
1802
1803     if( !b_adaptation )
1804     {
1805         /* We don't have any adaptation_field, so payload starts
1806          * immediately after the 4 byte TS header */
1807         i_skip = 4;
1808     }
1809     else
1810     {
1811         /* p[4] is adaptation_field_length minus one */
1812         i_skip = 5 + p[4];
1813         if( p[4] > 0 )
1814         {
1815             /* discontinuity indicator found in stream */
1816             b_discontinuity = (p[5]&0x80) ? VLC_TRUE : VLC_FALSE;
1817             if( b_discontinuity && pid->es->p_pes )
1818             {
1819                 msg_Warn( p_demux, "discontinuity indicator (pid=%d) ",
1820                             pid->i_pid );
1821                 /* pid->es->p_pes->i_flags |= BLOCK_FLAG_DISCONTINUITY; */
1822             }
1823 #if 0
1824             if( p[5]&0x40 )
1825                 msg_Dbg( p_demux, "random access indicator (pid=%d) ", pid->i_pid );
1826 #endif
1827         }
1828     }
1829
1830     /* Test continuity counter */
1831     /* continuous when (one of this):
1832         * diff == 1
1833         * diff == 0 and payload == 0
1834         * diff == 0 and duplicate packet (playload != 0) <- should we
1835         *   test the content ?
1836      */
1837     i_diff = ( i_cc - pid->i_cc )&0x0f;
1838     if( b_payload && i_diff == 1 )
1839     {
1840         pid->i_cc = ( pid->i_cc + 1 ) & 0xf;
1841     }
1842     else
1843     {
1844         if( pid->i_cc == 0xff )
1845         {
1846             msg_Warn( p_demux, "first packet for pid=%d cc=0x%x",
1847                       pid->i_pid, i_cc );
1848             pid->i_cc = i_cc;
1849         }
1850         else if( i_diff != 0 && !b_discontinuity )
1851         {
1852             msg_Warn( p_demux, "discontinuity received 0x%x instead of 0x%x (pid=%d)",
1853                       i_cc, ( pid->i_cc + 1 )&0x0f, pid->i_pid );
1854
1855             pid->i_cc = i_cc;
1856             if( pid->es->p_pes && pid->es->fmt.i_cat != VIDEO_ES )
1857             {
1858                 /* Small video artifacts are usually better then
1859                  * dropping full frames */
1860                 pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
1861             }
1862         }
1863     }
1864
1865     PCRHandle( p_demux, pid, p_bk );
1866
1867     if( i_skip >= 188 || pid->es->id == NULL || p_demux->p_sys->b_udp_out )
1868     {
1869         block_Release( p_bk );
1870         return i_ret;
1871     }
1872
1873     /* We have to gather it */
1874     p_bk->p_buffer += i_skip;
1875     p_bk->i_buffer -= i_skip;
1876
1877     if( b_unit_start )
1878     {
1879         if( pid->es->p_pes )
1880         {
1881             ParsePES( p_demux, pid );
1882             i_ret = VLC_TRUE;
1883         }
1884
1885         block_ChainLastAppend( &pid->es->pp_last, p_bk );
1886         if( p_bk->i_buffer > 6 )
1887         {
1888             pid->es->i_pes_size = GetWBE( &p_bk->p_buffer[4] );
1889             if( pid->es->i_pes_size > 0 )
1890             {
1891                 pid->es->i_pes_size += 6;
1892             }
1893         }
1894         pid->es->i_pes_gathered += p_bk->i_buffer;
1895         if( pid->es->i_pes_size > 0 &&
1896             pid->es->i_pes_gathered >= pid->es->i_pes_size )
1897         {
1898             ParsePES( p_demux, pid );
1899             i_ret = VLC_TRUE;
1900         }
1901     }
1902     else
1903     {
1904         if( pid->es->p_pes == NULL )
1905         {
1906             /* msg_Dbg( p_demux, "broken packet" ); */
1907             block_Release( p_bk );
1908         }
1909         else
1910         {
1911             block_ChainLastAppend( &pid->es->pp_last, p_bk );
1912             pid->es->i_pes_gathered += p_bk->i_buffer;
1913             if( pid->es->i_pes_size > 0 &&
1914                 pid->es->i_pes_gathered >= pid->es->i_pes_size )
1915             {
1916                 ParsePES( p_demux, pid );
1917                 i_ret = VLC_TRUE;
1918             }
1919         }
1920     }
1921
1922     return i_ret;
1923 }
1924
1925 static int PIDFillFormat( ts_pid_t *pid, int i_stream_type )
1926 {
1927     es_format_t *fmt = &pid->es->fmt;
1928
1929     switch( i_stream_type )
1930     {
1931         case 0x01:  /* MPEG-1 video */
1932         case 0x02:  /* MPEG-2 video */
1933         case 0x80:  /* MPEG-2 MOTO video */
1934             es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', 'g', 'v' ) );
1935             break;
1936         case 0x03:  /* MPEG-1 audio */
1937         case 0x04:  /* MPEG-2 audio */
1938             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', 'g', 'a' ) );
1939             break;
1940         case 0x11:  /* MPEG4 (audio) */
1941         case 0x0f:  /* ISO/IEC 13818-7 Audio with ADTS transport syntax */
1942             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', '4', 'a' ) );
1943             break;
1944         case 0x10:  /* MPEG4 (video) */
1945             es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) );
1946             pid->es->b_gather = VLC_TRUE;
1947             break;
1948         case 0x1B:  /* H264 <- check transport syntax/needed descriptor */
1949             es_format_Init( fmt, VIDEO_ES, VLC_FOURCC( 'h', '2', '6', '4' ) );
1950             break;
1951
1952         case 0x81:  /* A52 (audio) */
1953             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', ' ' ) );
1954             break;
1955         case 0x82:  /* DVD_SPU (sub) */
1956             es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', ' ' ) );
1957             break;
1958         case 0x83:  /* LPCM (audio) */
1959             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'l', 'p', 'c', 'm' ) );
1960             break;
1961         case 0x84:  /* SDDS (audio) */
1962             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 's' ) );
1963             break;
1964         case 0x85:  /* DTS (audio) */
1965             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'd', 't', 's', ' ' ) );
1966             break;
1967
1968         case 0x91:  /* A52 vls (audio) */
1969             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', 'b' ) );
1970             break;
1971         case 0x92:  /* DVD_SPU vls (sub) */
1972             es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', 'b' ) );
1973             break;
1974
1975         case 0x94:  /* SDDS (audio) */
1976             es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 'b' ) );
1977             break;
1978
1979         case 0xa0:  /* MSCODEC vlc (video) (fixed later) */
1980             es_format_Init( fmt, UNKNOWN_ES, 0 );
1981             pid->es->b_gather = VLC_TRUE;
1982             break;
1983
1984         case 0x06:  /* PES_PRIVATE  (fixed later) */
1985         case 0x12:  /* MPEG-4 generic (sub/scene/...) (fixed later) */
1986         case 0xEA:  /* Privately managed ES (VC-1) (fixed later */
1987         default:
1988             es_format_Init( fmt, UNKNOWN_ES, 0 );
1989             break;
1990     }
1991
1992     /* PES packets usually contain truncated frames */
1993     fmt->b_packetized = VLC_FALSE;
1994
1995     return fmt->i_cat == UNKNOWN_ES ? VLC_EGENERIC : VLC_SUCCESS ;
1996 }
1997
1998 /*****************************************************************************
1999  * MP4 specific functions (IOD parser)
2000  *****************************************************************************/
2001 static int  IODDescriptorLength( int *pi_data, uint8_t **pp_data )
2002 {
2003     unsigned int i_b;
2004     unsigned int i_len = 0;
2005     do
2006     {
2007         i_b = **pp_data;
2008         (*pp_data)++;
2009         (*pi_data)--;
2010         i_len = ( i_len << 7 ) + ( i_b&0x7f );
2011
2012     } while( i_b&0x80 );
2013
2014     return( i_len );
2015 }
2016
2017 static int IODGetByte( int *pi_data, uint8_t **pp_data )
2018 {
2019     if( *pi_data > 0 )
2020     {
2021         const int i_b = **pp_data;
2022         (*pp_data)++;
2023         (*pi_data)--;
2024         return( i_b );
2025     }
2026     return( 0 );
2027 }
2028
2029 static int IODGetWord( 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     return( ( i1 << 8 ) | i2 );
2034 }
2035
2036 static int IODGet3Bytes( int *pi_data, uint8_t **pp_data )
2037 {
2038     const int i1 = IODGetByte( pi_data, pp_data );
2039     const int i2 = IODGetByte( pi_data, pp_data );
2040     const int i3 = IODGetByte( pi_data, pp_data );
2041
2042     return( ( i1 << 16 ) | ( i2 << 8) | i3 );
2043 }
2044
2045 static uint32_t IODGetDWord( int *pi_data, uint8_t **pp_data )
2046 {
2047     const uint32_t i1 = IODGetWord( pi_data, pp_data );
2048     const uint32_t i2 = IODGetWord( pi_data, pp_data );
2049     return( ( i1 << 16 ) | i2 );
2050 }
2051
2052 static char* IODGetURL( int *pi_data, uint8_t **pp_data )
2053 {
2054     char *url;
2055     int i_url_len, i;
2056
2057     i_url_len = IODGetByte( pi_data, pp_data );
2058     url = malloc( i_url_len + 1 );
2059     for( i = 0; i < i_url_len; i++ )
2060     {
2061         url[i] = IODGetByte( pi_data, pp_data );
2062     }
2063     url[i_url_len] = '\0';
2064     return( url );
2065 }
2066
2067 static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
2068 {
2069     iod_descriptor_t *p_iod;
2070     int i;
2071     int i_es_index;
2072     uint8_t     i_flags, i_iod_tag, byte1, byte2, byte3;
2073     vlc_bool_t  b_url;
2074     int         i_iod_length;
2075
2076     p_iod = malloc( sizeof( iod_descriptor_t ) );
2077     memset( p_iod, 0, sizeof( iod_descriptor_t ) );
2078
2079 #ifdef TS_DEBUG
2080     fprintf( stderr, "\n************ IOD ************" );
2081 #endif
2082     for( i = 0; i < 255; i++ )
2083     {
2084         p_iod->es_descr[i].b_ok = 0;
2085     }
2086     i_es_index = 0;
2087
2088     if( i_data < 3 )
2089     {
2090         return p_iod;
2091     }
2092
2093     byte1 = IODGetByte( &i_data, &p_data );
2094     byte2 = IODGetByte( &i_data, &p_data );
2095     byte3 = IODGetByte( &i_data, &p_data );
2096     if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor
2097     {
2098         p_iod->i_iod_label_scope = 0x11;
2099         p_iod->i_iod_label = byte1;
2100         i_iod_tag = byte2;
2101     }
2102     else  //correct implementation of the IOD_descriptor
2103     {
2104         p_iod->i_iod_label_scope = byte1;
2105         p_iod->i_iod_label = byte2;
2106         i_iod_tag = byte3;
2107     }
2108 #ifdef TS_DEBUG
2109     fprintf( stderr, "\n* iod_label:%d", p_iod->i_iod_label );
2110     fprintf( stderr, "\n* ===========" );
2111     fprintf( stderr, "\n* tag:0x%x", i_iod_tag );
2112 #endif
2113     if( i_iod_tag != 0x02 )
2114     {
2115 #ifdef TS_DEBUG
2116         fprintf( stderr, "\n ERR: tag %02x != 0x02", i_iod_tag );
2117 #endif
2118         return p_iod;
2119     }
2120
2121     i_iod_length = IODDescriptorLength( &i_data, &p_data );
2122 #ifdef TS_DEBUG
2123     fprintf( stderr, "\n* length:%d", i_iod_length );
2124 #endif
2125     if( i_iod_length > i_data )
2126     {
2127         i_iod_length = i_data;
2128     }
2129
2130     p_iod->i_od_id = ( IODGetByte( &i_data, &p_data ) << 2 );
2131     i_flags = IODGetByte( &i_data, &p_data );
2132     p_iod->i_od_id |= i_flags >> 6;
2133     b_url = ( i_flags >> 5  )&0x01;
2134 #ifdef TS_DEBUG
2135     fprintf( stderr, "\n* od_id:%d", p_iod->i_od_id );
2136     fprintf( stderr, "\n* url flag:%d", b_url );
2137     fprintf( stderr, "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 );
2138 #endif
2139     if( b_url )
2140     {
2141         p_iod->psz_url = IODGetURL( &i_data, &p_data );
2142 #ifdef TS_DEBUG
2143         fprintf( stderr, "\n* url string:%s", p_iod->psz_url );
2144         fprintf( stderr, "\n*****************************\n" );
2145 #endif
2146         return p_iod;
2147     }
2148     else
2149     {
2150         p_iod->psz_url = NULL;
2151     }
2152
2153     p_iod->i_ODProfileLevelIndication = IODGetByte( &i_data, &p_data );
2154     p_iod->i_sceneProfileLevelIndication = IODGetByte( &i_data, &p_data );
2155     p_iod->i_audioProfileLevelIndication = IODGetByte( &i_data, &p_data );
2156     p_iod->i_visualProfileLevelIndication = IODGetByte( &i_data, &p_data );
2157     p_iod->i_graphicsProfileLevelIndication = IODGetByte( &i_data, &p_data );
2158 #ifdef TS_DEBUG
2159     fprintf( stderr, "\n* ODProfileLevelIndication:%d", p_iod->i_ODProfileLevelIndication );
2160     fprintf( stderr, "\n* sceneProfileLevelIndication:%d", p_iod->i_sceneProfileLevelIndication );
2161     fprintf( stderr, "\n* audioProfileLevelIndication:%d", p_iod->i_audioProfileLevelIndication );
2162     fprintf( stderr, "\n* visualProfileLevelIndication:%d", p_iod->i_visualProfileLevelIndication );
2163     fprintf( stderr, "\n* graphicsProfileLevelIndication:%d", p_iod->i_graphicsProfileLevelIndication );
2164 #endif
2165
2166     while( i_data > 0 && i_es_index < 255)
2167     {
2168         int i_tag, i_length;
2169         int     i_data_sav;
2170         uint8_t *p_data_sav;
2171
2172         i_tag = IODGetByte( &i_data, &p_data );
2173         i_length = IODDescriptorLength( &i_data, &p_data );
2174
2175         i_data_sav = i_data;
2176         p_data_sav = p_data;
2177
2178         i_data = i_length;
2179
2180         switch( i_tag )
2181         {
2182             case 0x03:
2183                 {
2184 #define es_descr    p_iod->es_descr[i_es_index]
2185                     int i_decoderConfigDescr_length;
2186 #ifdef TS_DEBUG
2187                     fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length );
2188 #endif
2189                     es_descr.b_ok = 1;
2190
2191                     es_descr.i_es_id = IODGetWord( &i_data, &p_data );
2192                     i_flags = IODGetByte( &i_data, &p_data );
2193                     es_descr.b_streamDependenceFlag = ( i_flags >> 7 )&0x01;
2194                     b_url = ( i_flags >> 6 )&0x01;
2195                     es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01;
2196                     es_descr.i_streamPriority = i_flags & 0x1f;
2197 #ifdef TS_DEBUG
2198                     fprintf( stderr, "\n*   * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag );
2199                     fprintf( stderr, "\n*   * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag );
2200                     fprintf( stderr, "\n*   * streamPriority:%d", es_descr.i_streamPriority );
2201 #endif
2202                     if( es_descr.b_streamDependenceFlag )
2203                     {
2204                         es_descr.i_dependOn_es_id = IODGetWord( &i_data, &p_data );
2205 #ifdef TS_DEBUG
2206                         fprintf( stderr, "\n*   * dependOn_es_id:%d", es_descr.i_dependOn_es_id );
2207 #endif
2208                     }
2209
2210                     if( b_url )
2211                     {
2212                         es_descr.psz_url = IODGetURL( &i_data, &p_data );
2213 #ifdef TS_DEBUG
2214                         fprintf( stderr, "\n* url string:%s", es_descr.psz_url );
2215 #endif
2216                     }
2217                     else
2218                     {
2219                         es_descr.psz_url = NULL;
2220                     }
2221
2222                     if( es_descr.b_OCRStreamFlag )
2223                     {
2224                         es_descr.i_OCR_es_id = IODGetWord( &i_data, &p_data );
2225 #ifdef TS_DEBUG
2226                         fprintf( stderr, "\n*   * OCR_es_id:%d", es_descr.i_OCR_es_id );
2227 #endif
2228                     }
2229
2230                     if( IODGetByte( &i_data, &p_data ) != 0x04 )
2231                     {
2232 #ifdef TS_DEBUG
2233                         fprintf( stderr, "\n* ERR missing DecoderConfigDescr" );
2234 #endif
2235                         es_descr.b_ok = 0;
2236                         break;
2237                     }
2238                     i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
2239 #ifdef TS_DEBUG
2240                     fprintf( stderr, "\n*   - DecoderConfigDesc length:%d", i_decoderConfigDescr_length );
2241 #endif
2242 #define dec_descr   es_descr.dec_descr
2243                     dec_descr.i_objectTypeIndication = IODGetByte( &i_data, &p_data );
2244                     i_flags = IODGetByte( &i_data, &p_data );
2245                     dec_descr.i_streamType = i_flags >> 2;
2246                     dec_descr.b_upStream = ( i_flags >> 1 )&0x01;
2247                     dec_descr.i_bufferSizeDB = IODGet3Bytes( &i_data, &p_data );
2248                     dec_descr.i_maxBitrate = IODGetDWord( &i_data, &p_data );
2249                     dec_descr.i_avgBitrate = IODGetDWord( &i_data, &p_data );
2250 #ifdef TS_DEBUG
2251                     fprintf( stderr, "\n*     * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication  );
2252                     fprintf( stderr, "\n*     * streamType:0x%x", dec_descr.i_streamType );
2253                     fprintf( stderr, "\n*     * upStream:%d", dec_descr.b_upStream );
2254                     fprintf( stderr, "\n*     * bufferSizeDB:%d", dec_descr.i_bufferSizeDB );
2255                     fprintf( stderr, "\n*     * maxBitrate:%d", dec_descr.i_maxBitrate );
2256                     fprintf( stderr, "\n*     * avgBitrate:%d", dec_descr.i_avgBitrate );
2257 #endif
2258                     if( i_decoderConfigDescr_length > 13 && IODGetByte( &i_data, &p_data ) == 0x05 )
2259                     {
2260                         int i;
2261                         dec_descr.i_decoder_specific_info_len =
2262                             IODDescriptorLength( &i_data, &p_data );
2263                         if( dec_descr.i_decoder_specific_info_len > 0 )
2264                         {
2265                             dec_descr.p_decoder_specific_info =
2266                                 malloc( dec_descr.i_decoder_specific_info_len );
2267                         }
2268                         for( i = 0; i < dec_descr.i_decoder_specific_info_len; i++ )
2269                         {
2270                             dec_descr.p_decoder_specific_info[i] = IODGetByte( &i_data, &p_data );
2271                         }
2272                     }
2273                     else
2274                     {
2275                         dec_descr.i_decoder_specific_info_len = 0;
2276                         dec_descr.p_decoder_specific_info = NULL;
2277                     }
2278                 }
2279 #undef  dec_descr
2280 #define sl_descr    es_descr.sl_descr
2281                 {
2282                     int i_SLConfigDescr_length;
2283                     int i_predefined;
2284
2285                     if( IODGetByte( &i_data, &p_data ) != 0x06 )
2286                     {
2287 #ifdef TS_DEBUG
2288                         fprintf( stderr, "\n* ERR missing SLConfigDescr" );
2289 #endif
2290                         es_descr.b_ok = 0;
2291                         break;
2292                     }
2293                     i_SLConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
2294 #ifdef TS_DEBUG
2295                     fprintf( stderr, "\n*   - SLConfigDescr length:%d", i_SLConfigDescr_length );
2296 #endif
2297                     i_predefined = IODGetByte( &i_data, &p_data );
2298 #ifdef TS_DEBUG
2299                     fprintf( stderr, "\n*     * i_predefined:0x%x", i_predefined  );
2300 #endif
2301                     switch( i_predefined )
2302                     {
2303                         case 0x01:
2304                             {
2305                                 sl_descr.b_useAccessUnitStartFlag   = 0;
2306                                 sl_descr.b_useAccessUnitEndFlag     = 0;
2307                                 sl_descr.b_useRandomAccessPointFlag = 0;
2308                                 //sl_descr.b_useRandomAccessUnitsOnlyFlag = 0;
2309                                 sl_descr.b_usePaddingFlag           = 0;
2310                                 sl_descr.b_useTimeStampsFlags       = 0;
2311                                 sl_descr.b_useIdleFlag              = 0;
2312                                 sl_descr.b_durationFlag     = 0;    // FIXME FIXME
2313                                 sl_descr.i_timeStampResolution      = 1000;
2314                                 sl_descr.i_OCRResolution    = 0;    // FIXME FIXME
2315                                 sl_descr.i_timeStampLength          = 32;
2316                                 sl_descr.i_OCRLength        = 0;    // FIXME FIXME
2317                                 sl_descr.i_AU_Length                = 0;
2318                                 sl_descr.i_instantBitrateLength= 0; // FIXME FIXME
2319                                 sl_descr.i_degradationPriorityLength= 0;
2320                                 sl_descr.i_AU_seqNumLength          = 0;
2321                                 sl_descr.i_packetSeqNumLength       = 0;
2322                                 if( sl_descr.b_durationFlag )
2323                                 {
2324                                     sl_descr.i_timeScale            = 0;    // FIXME FIXME
2325                                     sl_descr.i_accessUnitDuration   = 0;    // FIXME FIXME
2326                                     sl_descr.i_compositionUnitDuration= 0;    // FIXME FIXME
2327                                 }
2328                                 if( !sl_descr.b_useTimeStampsFlags )
2329                                 {
2330                                     sl_descr.i_startDecodingTimeStamp   = 0;    // FIXME FIXME
2331                                     sl_descr.i_startCompositionTimeStamp= 0;    // FIXME FIXME
2332                                 }
2333                             }
2334                             break;
2335                         default:
2336 #ifdef TS_DEBUG
2337                             fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" );
2338 #endif
2339                             es_descr.b_ok = 0;
2340                             break;
2341                     }
2342                 }
2343                 break;
2344 #undef  sl_descr
2345 #undef  es_descr
2346             default:
2347 #ifdef TS_DEBUG
2348                 fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length );
2349 #endif
2350                 break;
2351         }
2352
2353         p_data = p_data_sav + i_length;
2354         i_data = i_data_sav - i_length;
2355         i_es_index++;
2356     }
2357 #ifdef TS_DEBUG
2358     fprintf( stderr, "\n*****************************\n" );
2359 #endif
2360     return p_iod;
2361 }
2362
2363 static void IODFree( iod_descriptor_t *p_iod )
2364 {
2365     int i;
2366
2367     if( p_iod->psz_url )
2368     {
2369         free( p_iod->psz_url );
2370         p_iod->psz_url = NULL;
2371         free( p_iod );
2372         return;
2373     }
2374
2375     for( i = 0; i < 255; i++ )
2376     {
2377 #define es_descr p_iod->es_descr[i]
2378         if( es_descr.b_ok )
2379         {
2380             if( es_descr.psz_url )
2381             {
2382                 free( es_descr.psz_url );
2383                 es_descr.psz_url = NULL;
2384             }
2385             else
2386             {
2387                 if( es_descr.dec_descr.p_decoder_specific_info != NULL )
2388                 {
2389                     free( es_descr.dec_descr.p_decoder_specific_info );
2390                     es_descr.dec_descr.p_decoder_specific_info = NULL;
2391                     es_descr.dec_descr.i_decoder_specific_info_len = 0;
2392                 }
2393             }
2394         }
2395         es_descr.b_ok = 0;
2396 #undef  es_descr
2397     }
2398     free( p_iod );
2399 }
2400
2401 /****************************************************************************
2402  ****************************************************************************
2403  ** libdvbpsi callbacks
2404  ****************************************************************************
2405  ****************************************************************************/
2406 static vlc_bool_t DVBProgramIsSelected( demux_t *p_demux, uint16_t i_pgrm )
2407 {
2408     demux_sys_t          *p_sys = p_demux->p_sys;
2409
2410     if ( !p_sys->b_dvb_control ) return VLC_FALSE;
2411     if ( (p_sys->i_dvb_program == -1 && p_sys->p_programs_list == NULL)
2412            || p_sys->i_dvb_program == 0 )
2413         return VLC_TRUE;
2414     if ( p_sys->i_dvb_program == i_pgrm ) return VLC_TRUE;
2415
2416     if ( p_sys->p_programs_list != NULL )
2417     {
2418         int i;
2419         for ( i = 0; i < p_sys->p_programs_list->i_count; i++ )
2420         {
2421             if ( i_pgrm == p_sys->p_programs_list->p_values[i].i_int )
2422                 return VLC_TRUE;
2423         }
2424     }
2425     return VLC_FALSE;
2426 }
2427
2428 #ifdef TS_USE_DVB_SI
2429 static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
2430 {
2431     demux_sys_t          *p_sys = p_demux->p_sys;
2432     ts_pid_t             *sdt = &p_sys->pid[0x11];
2433     dvbpsi_sdt_service_t *p_srv;
2434
2435     msg_Dbg( p_demux, "SDTCallBack called" );
2436
2437     if( sdt->psi->i_sdt_version != -1 &&
2438         ( !p_sdt->b_current_next ||
2439           p_sdt->i_version == sdt->psi->i_sdt_version ) )
2440     {
2441         dvbpsi_DeleteSDT( p_sdt );
2442         return;
2443     }
2444
2445     msg_Dbg( p_demux, "new SDT ts_id=%d version=%d current_next=%d "
2446              "network_id=%d",
2447              p_sdt->i_ts_id, p_sdt->i_version, p_sdt->b_current_next,
2448              p_sdt->i_network_id );
2449
2450     for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next )
2451     {
2452         vlc_meta_t          *p_meta;
2453         dvbpsi_descriptor_t *p_dr;
2454
2455         const char *psz_type = NULL;
2456         const char *psz_status = NULL;
2457
2458         msg_Dbg( p_demux, "  * service id=%d eit schedule=%d present=%d "
2459                  "running=%d free_ca=%d",
2460                  p_srv->i_service_id, p_srv->b_eit_schedule,
2461                  p_srv->b_eit_present, p_srv->i_running_status,
2462                  p_srv->b_free_ca );
2463
2464         if( p_sys->i_dvb_program != -1 && p_sys->i_dvb_program != p_srv->i_service_id )
2465             continue;
2466
2467         p_meta = vlc_meta_New();
2468         for( p_dr = p_srv->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
2469         {
2470             if( p_dr->i_tag == 0x48 )
2471             {
2472                 static const char *ppsz_type[17] = {
2473                     "Reserved",
2474                     "Digital television service",
2475                     "Digital radio sound service",
2476                     "Teletext service",
2477                     "NVOD reference service",
2478                     "NVOD time-shifted service",
2479                     "Mosaic service",
2480                     "PAL coded signal",
2481                     "SECAM coded signal",
2482                     "D/D2-MAC",
2483                     "FM Radio",
2484                     "NTSC coded signal",
2485                     "Data broadcast service",
2486                     "Reserved for Common Interface Usage",
2487                     "RCS Map (see EN 301 790 [35])",
2488                     "RCS FLS (see EN 301 790 [35])",
2489                     "DVB MHP service"
2490                 };
2491                 dvbpsi_service_dr_t *pD = dvbpsi_DecodeServiceDr( p_dr );
2492                 char str1[257];
2493                 char str2[257];
2494
2495                 memcpy( str1, pD->i_service_provider_name,
2496                         pD->i_service_provider_name_length );
2497                 str1[pD->i_service_provider_name_length] = '\0';
2498                 memcpy( str2, pD->i_service_name, pD->i_service_name_length );
2499                 str2[pD->i_service_name_length] = '\0';
2500
2501                 msg_Dbg( p_demux, "    - type=%d provider=%s name=%s",
2502                          pD->i_service_type, str1, str2 );
2503
2504                 vlc_meta_SetTitle( p_meta, str2 );
2505                 vlc_meta_SetPublisher( p_meta, str1 );
2506                 if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 )
2507                     psz_type = ppsz_type[pD->i_service_type];
2508             }
2509         }
2510
2511         if( p_srv->i_running_status >= 0x01 && p_srv->i_running_status <= 0x04 )
2512         {
2513             static const char *ppsz_status[5] = {
2514                 "Unknown",
2515                 "Not running",
2516                 "Starts in a few seconds",
2517                 "Pausing",
2518                 "Running"
2519             };
2520             psz_status = ppsz_status[p_srv->i_running_status];
2521         }
2522
2523         if( psz_type )
2524             vlc_meta_AddExtra( p_meta, "Type", psz_type );
2525         if( psz_status )
2526             vlc_meta_AddExtra( p_meta, "Status", psz_status );
2527
2528         es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META,
2529                         p_srv->i_service_id, p_meta );
2530         vlc_meta_Delete( p_meta );
2531     }
2532
2533     sdt->psi->i_sdt_version = p_sdt->i_version;
2534     dvbpsi_DeleteSDT( p_sdt );
2535 }
2536
2537 /* i_year: year - 1900  i_month: 0-11  i_mday: 1-31 i_hour: 0-23 i_minute: 0-59 i_second: 0-59 */
2538 static int64_t vlc_timegm( int i_year, int i_month, int i_mday, int i_hour, int i_minute, int i_second )
2539 {
2540     static const int pn_day[12+1] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
2541     int64_t i_day;
2542     int i;
2543
2544     if( i_year < 70 ||
2545         i_month < 0 || i_month > 11 || i_mday < 1 || i_mday > 31 ||
2546         i_hour < 0 || i_hour > 23 || i_minute < 0 || i_minute > 59 || i_second < 0 || i_second > 59 )
2547         return -1;
2548
2549     /* Count the number of days */
2550     i_day = 365 * (i_year-70) + pn_day[i_month] + i_mday - 1;
2551 #define LEAP(y) ( ((y)%4) == 0 && (((y)%100) != 0 || ((y)%400) == 0) ? 1 : 0)
2552     for( i = 70; i < i_year; i++ )
2553         i_day += LEAP(1900+i);
2554     if( i_month > 1 )
2555         i_day += LEAP(1900+i_year);
2556 #undef LEAP
2557     /**/
2558     return ((24*i_day + i_hour)*60 + i_minute)*60 + i_second;
2559 }
2560
2561 static void EITDecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d )
2562 {
2563     const int yp = (int)( ( (double)i_mjd - 15078.2)/365.25 );
2564     const int mp = (int)( ((double)i_mjd - 14956.1 - (int)(yp * 365.25)) / 30.6001 );
2565     const int c = ( mp == 14 || mp == 15 ) ? 1 : 0;
2566
2567     *p_y = 1900 + yp + c*1;
2568     *p_m = mp - 1 + c*12;
2569     *p_d = i_mjd - 14956 - (int)(yp*365.25) - (int)(mp*30.6001);
2570 }
2571 #define CVT_FROM_BCD(v) ((((v) >> 4)&0xf)*10 + ((v)&0xf))
2572 static int64_t EITConvertStartTime( uint64_t i_date )
2573 {
2574     const int i_mjd = i_date >> 24;
2575     const int i_hour   = CVT_FROM_BCD(i_date >> 16);
2576     const int i_minute = CVT_FROM_BCD(i_date >>  8);
2577     const int i_second = CVT_FROM_BCD(i_date      );
2578     int i_year;
2579     int i_month;
2580     int i_day;
2581
2582     /* if all 40 bits are 1, the start is unknown */
2583     if( i_date == UINT64_C(0xffffffffff) )
2584         return -1;
2585
2586     EITDecodeMjd( i_mjd, &i_year, &i_month, &i_day );
2587     return vlc_timegm( i_year - 1900, i_month - 1, i_day, i_hour, i_minute, i_second );
2588 }
2589 static int EITConvertDuration( uint32_t i_duration )
2590 {
2591     return CVT_FROM_BCD(i_duration >> 16) * 3600 + 
2592            CVT_FROM_BCD(i_duration >> 8 ) * 60 +
2593            CVT_FROM_BCD(i_duration      );
2594 }
2595 #undef CVT_FROM_BCD
2596
2597 static inline char *FixUTF8( char *p )
2598 {
2599     EnsureUTF8( p );
2600     return p;
2601 }
2602 /* FIXME same than dvbsi_to_utf8 from dvb access */
2603 static char *EITConvertToUTF8( unsigned char *psz_instring, size_t i_length )
2604 {
2605     const char *psz_encoding;
2606     const unsigned char *psz_stringstart, *psz_outstring;
2607     char *psz_tmp;
2608     char psz_encbuf[12];
2609     size_t i_in, i_out;
2610     vlc_iconv_t iconv_handle;
2611     if( i_length < 1 ) return NULL;
2612     if( psz_instring[0] >= 0x20 )
2613     {
2614         psz_stringstart = psz_instring;
2615         psz_encoding = "ISO_8859-1"; /* should be ISO6937 according to spec, but this seems to be the one used */
2616     }
2617     else switch( psz_instring[0] )
2618     {
2619     case 0x01:
2620         psz_stringstart = &psz_instring[1];
2621         psz_encoding = "ISO_8859-5";
2622         break;
2623     case 0x02:
2624         psz_stringstart = &psz_instring[1];
2625         psz_encoding = "ISO_8859-6";
2626         break;
2627     case 0x03:
2628         psz_stringstart = &psz_instring[1];
2629         psz_encoding = "ISO_8859-7";
2630         break;
2631     case 0x04:
2632         psz_stringstart = &psz_instring[1];
2633         psz_encoding = "ISO_8859-8";
2634         break;
2635     case 0x05:
2636         psz_stringstart = &psz_instring[1];
2637         psz_encoding = "ISO_8859-9";
2638         break;
2639     case 0x06:
2640         psz_stringstart = &psz_instring[1];
2641         psz_encoding = "ISO_8859-10";
2642         break;
2643     case 0x07:
2644         psz_stringstart = &psz_instring[1];
2645         psz_encoding = "ISO_8859-11";
2646         break;
2647     case 0x08:
2648         psz_stringstart = &psz_instring[1]; /*possibly reserved?*/
2649         psz_encoding = "ISO_8859-12";
2650         break;
2651     case 0x09:
2652         psz_stringstart = &psz_instring[1];
2653         psz_encoding = "ISO_8859-13";
2654         break;
2655     case 0x0a:
2656         psz_stringstart = &psz_instring[1];
2657         psz_encoding = "ISO_8859-14";
2658         break;
2659     case 0x0b:
2660         psz_stringstart = &psz_instring[1];
2661         psz_encoding = "ISO_8859-15";
2662         break;
2663     case 0x10:
2664         if( i_length < 3 || psz_instring[1] != '\0' || psz_instring[2] > 0x0f
2665             || psz_instring[2] == 0 )
2666             return FixUTF8(strndup(psz_instring,i_length));
2667         sprintf( psz_encbuf, "ISO_8859-%d", psz_instring[2] );
2668         psz_stringstart = &psz_instring[3];
2669         psz_encoding = psz_encbuf;
2670         break;
2671     case 0x11:
2672         psz_stringstart = &psz_instring[1];
2673         psz_encoding = "UTF-16";
2674         break;
2675     case 0x12:
2676         psz_stringstart = &psz_instring[1];
2677         psz_encoding = "KSC5601-1987";
2678         break;
2679     case 0x13:
2680         psz_stringstart = &psz_instring[1];
2681         psz_encoding = "GB2312";/*GB-2312-1980 */
2682         break;
2683     case 0x14:
2684         psz_stringstart = &psz_instring[1];
2685         psz_encoding = "BIG-5";
2686         break;
2687     case 0x15:
2688         return FixUTF8(strndup(&psz_instring[1],i_length-1));
2689         break;
2690     default:
2691         /* invalid */
2692         return FixUTF8(strndup(psz_instring,i_length));
2693     }
2694     iconv_handle = vlc_iconv_open( "UTF-8", psz_encoding );
2695     i_in = i_length - (psz_stringstart - psz_instring );
2696     i_out = i_in * 6;
2697     psz_outstring = psz_tmp = (char*)malloc( i_out * sizeof(char) + 1 );
2698     vlc_iconv( iconv_handle, &psz_stringstart, &i_in, &psz_tmp, &i_out );
2699     vlc_iconv_close( iconv_handle );
2700     *psz_tmp = '\0';
2701     return psz_outstring;
2702 }
2703
2704 static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
2705 {
2706     demux_sys_t        *p_sys = p_demux->p_sys;
2707     dvbpsi_eit_event_t *p_evt;
2708     vlc_epg_t *p_epg;
2709
2710     msg_Dbg( p_demux, "EITCallBack called" );
2711     if( !p_eit->b_current_next || ( p_sys->i_dvb_program != -1 && p_sys->i_dvb_program != p_eit->i_service_id ) )
2712     {
2713         dvbpsi_DeleteEIT( p_eit );
2714         return;
2715     }
2716
2717     msg_Dbg( p_demux, "new EIT service_id=%d version=%d current_next=%d "
2718              "ts_id=%d network_id=%d segment_last_section_number=%d "
2719              "last_table_id=%d",
2720              p_eit->i_service_id, p_eit->i_version, p_eit->b_current_next,
2721              p_eit->i_ts_id, p_eit->i_network_id,
2722              p_eit->i_segment_last_section_number, p_eit->i_last_table_id );
2723
2724     p_epg = vlc_epg_New( NULL );
2725     for( p_evt = p_eit->p_first_event; p_evt; p_evt = p_evt->p_next )
2726     {
2727         dvbpsi_descriptor_t *p_dr;
2728         char                *psz_name = NULL;
2729         char                *psz_text = NULL;
2730         char                *psz_extra = strdup("");
2731         int64_t i_start;
2732         int i_duration;
2733
2734         i_start = EITConvertStartTime( p_evt->i_start_time );
2735         i_duration = EITConvertDuration( p_evt->i_duration );
2736
2737         msg_Dbg( p_demux, "  * event id=%d start_time:%d duration=%d "
2738                           "running=%d free_ca=%d",
2739                  p_evt->i_event_id, (int)i_start, (int)i_duration,
2740                  p_evt->i_running_status, p_evt->b_free_ca );
2741
2742         for( p_dr = p_evt->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
2743         {
2744             if( p_dr->i_tag == 0x4d )
2745             {
2746                 dvbpsi_short_event_dr_t *pE = dvbpsi_DecodeShortEventDr( p_dr );
2747
2748                 if( pE )
2749                 {
2750                     psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length);
2751                     psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length );
2752                     msg_Dbg( p_demux, "    - short event lang=%3.3s '%s' : '%s'",
2753                              pE->i_iso_639_code, psz_name, psz_text );
2754                 }
2755             }
2756             else if( p_dr->i_tag == 0x4e )
2757             {
2758                 dvbpsi_extended_event_dr_t *pE = dvbpsi_DecodeExtendedEventDr( p_dr );
2759                 if( pE )
2760                 {
2761                     int i;
2762                     msg_Dbg( p_demux, "    - extended event lang=%3.3s [%d/%d]",
2763                              pE->i_iso_639_code,
2764                              pE->i_descriptor_number, pE->i_last_descriptor_number );
2765
2766                     if( pE->i_text_length > 0 )
2767                     {
2768                         char *psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length );
2769                         msg_Dbg( p_demux, "       - text='%s'", psz_text );
2770
2771                         psz_extra = realloc( psz_extra, strlen(psz_extra) + strlen(psz_text) + 1 );
2772                         strcat( psz_extra, psz_text );
2773                         free( psz_text );
2774                     }
2775
2776                     for( i = 0; i < pE->i_entry_count; i++ )
2777                     {
2778                         char *psz_dsc = EITConvertToUTF8( pE->i_item_description[i],
2779                                                           pE->i_item_description_length[i] );
2780                         char *psz_itm = EITConvertToUTF8( pE->i_item[i], pE->i_item_length[i] );
2781
2782                         if( psz_dsc && psz_itm )
2783                         {
2784                             msg_Dbg( p_demux, "       - desc='%s' item='%s'", psz_dsc, psz_itm );
2785
2786                             psz_extra = realloc( psz_extra, strlen(psz_extra) + strlen(psz_dsc) + strlen(psz_itm) + 3 + 1 );
2787                             strcat( psz_extra, "(" );
2788                             strcat( psz_extra, psz_dsc );
2789                             strcat( psz_extra, " " );
2790                             strcat( psz_extra, psz_itm );
2791                             strcat( psz_extra, ")" );
2792                         }
2793                         if( psz_dsc )
2794                             free( psz_dsc );
2795                         if( psz_itm )
2796                             free( psz_itm );
2797                     }
2798                 }
2799             }
2800             else
2801             {
2802                 msg_Dbg( p_demux, "    - tag=0x%x(%d)", p_dr->i_tag, p_dr->i_tag );
2803             }
2804         }
2805
2806         /* */
2807         if( i_start > 0 )
2808             vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text, psz_extra );
2809
2810         /* Update "now playing" field */
2811         if( p_evt->i_running_status == 0x04 && i_start > 0 )
2812             vlc_epg_SetCurrent( p_epg, i_start );
2813
2814         if( psz_name )
2815             free( psz_name );
2816         if( psz_text )
2817             free( psz_text );
2818
2819         free( psz_extra );
2820     }
2821     if( p_epg->i_event > 0 )
2822     {
2823         if( p_eit->i_service_id == p_sys->i_dvb_program )
2824         {
2825             p_sys->i_dvb_length = 0;
2826             p_sys->i_dvb_start = 0;
2827
2828             if( p_epg->p_current )
2829             {
2830                 p_sys->i_dvb_start = p_epg->p_current->i_start;
2831                 p_sys->i_dvb_length = p_epg->p_current->i_duration;
2832             }
2833         }
2834         es_out_Control( p_demux->out, ES_OUT_SET_GROUP_EPG, p_eit->i_service_id, p_epg );
2835     }
2836     vlc_epg_Delete( p_epg );
2837
2838     dvbpsi_DeleteEIT( p_eit );
2839 }
2840
2841 static void PSINewTableCallBack( demux_t *p_demux, dvbpsi_handle h,
2842                                  uint8_t  i_table_id, uint16_t i_extension )
2843 {
2844 #if 0
2845     msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
2846              i_table_id, i_table_id, i_extension, i_extension );
2847 #endif
2848     if( p_demux->p_sys->pid[0].psi->i_pat_version != -1 && i_table_id == 0x42 )
2849     {
2850         msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
2851                  i_table_id, i_table_id, i_extension, i_extension );
2852
2853         dvbpsi_AttachSDT( h, i_table_id, i_extension,
2854                           (dvbpsi_sdt_callback)SDTCallBack, p_demux );
2855     }
2856     else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 &&
2857              ( i_table_id == 0x4e || /* Current/Following */
2858                (i_table_id >= 0x50 && i_table_id <= 0x5f) ) ) /* Schedule */
2859     {
2860         msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
2861                  i_table_id, i_table_id, i_extension, i_extension );
2862
2863         dvbpsi_AttachEIT( h, i_table_id, i_extension,
2864                           (dvbpsi_eit_callback)EITCallBack, p_demux );
2865     }
2866 }
2867 #endif
2868
2869 static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
2870 {
2871     demux_sys_t          *p_sys = p_demux->p_sys;
2872     dvbpsi_descriptor_t  *p_dr;
2873     dvbpsi_pmt_es_t      *p_es;
2874
2875     ts_pid_t             *pmt = NULL;
2876     ts_prg_psi_t         *prg = NULL;
2877
2878     ts_pid_t             **pp_clean = NULL;
2879     int                  i_clean = 0, i;
2880
2881     msg_Dbg( p_demux, "PMTCallBack called" );
2882
2883     /* First find this PMT declared in PAT */
2884     for( i = 0; i < p_sys->i_pmt; i++ )
2885     {
2886         int i_prg;
2887         for( i_prg = 0; i_prg < p_sys->pmt[i]->psi->i_prg; i_prg++ )
2888         {
2889             if( p_sys->pmt[i]->psi->prg[i_prg]->i_number ==
2890                 p_pmt->i_program_number )
2891             {
2892                 pmt = p_sys->pmt[i];
2893                 prg = p_sys->pmt[i]->psi->prg[i_prg];
2894                 break;
2895             }
2896         }
2897         if( pmt ) break;
2898     }
2899
2900     if( pmt == NULL )
2901     {
2902         msg_Warn( p_demux, "unreferenced program (broken stream)" );
2903         dvbpsi_DeletePMT(p_pmt);
2904         return;
2905     }
2906
2907     if( prg->i_version != -1 &&
2908         ( !p_pmt->b_current_next || prg->i_version == p_pmt->i_version ) )
2909     {
2910         dvbpsi_DeletePMT( p_pmt );
2911         return;
2912     }
2913
2914     /* Clean this program (remove all es) */
2915     for( i = 0; i < 8192; i++ )
2916     {
2917         ts_pid_t *pid = &p_sys->pid[i];
2918
2919         if( pid->b_valid && pid->p_owner == pmt->psi &&
2920             pid->i_owner_number == prg->i_number && pid->psi == NULL )
2921         {
2922             TAB_APPEND( i_clean, pp_clean, pid );
2923         }
2924     }
2925     if( prg->iod )
2926     {
2927         IODFree( prg->iod );
2928         prg->iod = NULL;
2929     }
2930
2931     msg_Dbg( p_demux, "new PMT program number=%d version=%d pid_pcr=%d",
2932              p_pmt->i_program_number, p_pmt->i_version, p_pmt->i_pcr_pid );
2933     prg->i_pid_pcr = p_pmt->i_pcr_pid;
2934     prg->i_version = p_pmt->i_version;
2935
2936     if( DVBProgramIsSelected( p_demux, prg->i_number ) )
2937     {
2938         /* Set demux filter */
2939         stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
2940                         ACCESS_SET_PRIVATE_ID_STATE, prg->i_pid_pcr,
2941                         VLC_TRUE );
2942     }
2943     else if ( p_sys->b_dvb_control )
2944     {
2945         msg_Warn( p_demux, "skipping program (not selected)" );
2946         dvbpsi_DeletePMT(p_pmt);
2947         return;
2948     }
2949
2950     /* Parse descriptor */
2951     for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next )
2952     {
2953         if( p_dr->i_tag == 0x1d )
2954         {
2955             /* We have found an IOD descriptor */
2956             msg_Dbg( p_demux, " * descriptor : IOD (0x1d)" );
2957
2958             prg->iod = IODNew( p_dr->i_length, p_dr->p_data );
2959         }
2960         else if( p_dr->i_tag == 0x9 )
2961         {
2962             uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8)
2963                                 | p_dr->p_data[1];
2964             msg_Dbg( p_demux, " * descriptor : CA (0x9) SysID 0x%x", i_sysid );
2965         }
2966         else
2967         {
2968             msg_Dbg( p_demux, " * descriptor : unknown (0x%x)", p_dr->i_tag );
2969         }
2970     }
2971
2972     for( p_es = p_pmt->p_first_es; p_es != NULL; p_es = p_es->p_next )
2973     {
2974         ts_pid_t tmp_pid, *old_pid = 0, *pid = &tmp_pid;
2975
2976         /* Find out if the PID was already declared */
2977         for( i = 0; i < i_clean; i++ )
2978         {
2979             if( pp_clean[i] == &p_sys->pid[p_es->i_pid] )
2980             {
2981                 old_pid = pp_clean[i];
2982                 break;
2983             }
2984         }
2985
2986         if( !old_pid && p_sys->pid[p_es->i_pid].b_valid )
2987         {
2988             ts_pid_t *pid = &p_sys->pid[p_es->i_pid];
2989             if( ( pid->i_pid == 0x11 /* SDT */ ||
2990                   pid->i_pid == 0x12 /* EDT */ ) && pid->psi )
2991             {
2992                 /* This doesn't look like a DVB stream so don't try
2993                  * parsing the SDT/EDT */
2994                 dvbpsi_DetachDemux( pid->psi->handle );
2995                 free( pid->psi );
2996                 pid->psi = 0;
2997             }
2998             else
2999             {
3000                 msg_Warn( p_demux, "pmt error: pid=%d already defined",
3001                           p_es->i_pid );
3002                 continue;
3003             }
3004         }
3005
3006         PIDInit( pid, VLC_FALSE, pmt->psi );
3007         PIDFillFormat( pid, p_es->i_type );
3008         pid->i_owner_number = prg->i_number;
3009         pid->i_pid          = p_es->i_pid;
3010         pid->b_seen         = p_sys->pid[p_es->i_pid].b_seen;
3011
3012         if( p_es->i_type == 0x10 || p_es->i_type == 0x11 ||
3013             p_es->i_type == 0x12 )
3014         {
3015             /* MPEG-4 stream: search SL_DESCRIPTOR */
3016             dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;;
3017
3018             while( p_dr && ( p_dr->i_tag != 0x1f ) ) p_dr = p_dr->p_next;
3019
3020             if( p_dr && p_dr->i_length == 2 )
3021             {
3022                 int i_es_id = ( p_dr->p_data[0] << 8 ) | p_dr->p_data[1];
3023
3024                 msg_Warn( p_demux, "found SL_descriptor es_id=%d", i_es_id );
3025
3026                 pid->es->p_mpeg4desc = NULL;
3027
3028                 for( i = 0; i < 255; i++ )
3029                 {
3030                     iod_descriptor_t *iod = prg->iod;
3031
3032                     if( iod->es_descr[i].b_ok &&
3033                         iod->es_descr[i].i_es_id == i_es_id )
3034                     {
3035                         pid->es->p_mpeg4desc = &iod->es_descr[i];
3036                         break;
3037                     }
3038                 }
3039             }
3040
3041             if( pid->es->p_mpeg4desc != NULL )
3042             {
3043                 decoder_config_descriptor_t *dcd =
3044                     &pid->es->p_mpeg4desc->dec_descr;
3045
3046                 if( dcd->i_streamType == 0x04 )    /* VisualStream */
3047                 {
3048                     pid->es->fmt.i_cat = VIDEO_ES;
3049                     switch( dcd->i_objectTypeIndication )
3050                     {
3051                     case 0x0B: /* mpeg4 sub */
3052                         pid->es->fmt.i_cat = SPU_ES;
3053                         pid->es->fmt.i_codec = VLC_FOURCC('s','u','b','t');
3054                         break;
3055
3056                     case 0x20: /* mpeg4 */
3057                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','v');
3058                         break;
3059                     case 0x21: /* h264 */
3060                         pid->es->fmt.i_codec = VLC_FOURCC('h','2','6','4');
3061                         break;
3062                     case 0x60:
3063                     case 0x61:
3064                     case 0x62:
3065                     case 0x63:
3066                     case 0x64:
3067                     case 0x65: /* mpeg2 */
3068                         pid->es->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
3069                         break;
3070                     case 0x6a: /* mpeg1 */
3071                         pid->es->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
3072                         break;
3073                     case 0x6c: /* mpeg1 */
3074                         pid->es->fmt.i_codec = VLC_FOURCC( 'j','p','e','g' );
3075                         break;
3076                     default:
3077                         pid->es->fmt.i_cat = UNKNOWN_ES;
3078                         break;
3079                     }
3080                 }
3081                 else if( dcd->i_streamType == 0x05 )    /* AudioStream */
3082                 {
3083                     pid->es->fmt.i_cat = AUDIO_ES;
3084                     switch( dcd->i_objectTypeIndication )
3085                     {
3086                     case 0x40: /* mpeg4 */
3087                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','a');
3088                         break;
3089                     case 0x66:
3090                     case 0x67:
3091                     case 0x68: /* mpeg2 aac */
3092                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','4','a');
3093                         break;
3094                     case 0x69: /* mpeg2 */
3095                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','g','a');
3096                         break;
3097                     case 0x6b: /* mpeg1 */
3098                         pid->es->fmt.i_codec = VLC_FOURCC('m','p','g','a');
3099                         break;
3100                     default:
3101                         pid->es->fmt.i_cat = UNKNOWN_ES;
3102                         break;
3103                     }
3104                 }
3105                 else
3106                 {
3107                     pid->es->fmt.i_cat = UNKNOWN_ES;
3108                 }
3109
3110                 if( pid->es->fmt.i_cat != UNKNOWN_ES )
3111                 {
3112                     pid->es->fmt.i_extra = dcd->i_decoder_specific_info_len;
3113                     if( pid->es->fmt.i_extra > 0 )
3114                     {
3115                         pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra );
3116                         memcpy( pid->es->fmt.p_extra,
3117                                 dcd->p_decoder_specific_info,
3118                                 pid->es->fmt.i_extra );
3119                     }
3120                 }
3121             }
3122         }
3123         else if( p_es->i_type == 0x06 )
3124         {
3125             dvbpsi_descriptor_t *p_dr;
3126
3127             for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
3128                  p_dr = p_dr->p_next )
3129             {
3130                 msg_Dbg( p_demux, "  * es pid=%d type=%d dr->i_tag=0x%x",
3131                          p_es->i_pid, p_es->i_type, p_dr->i_tag );
3132
3133                 if( p_dr->i_tag == 0x05 )
3134                 {
3135                     /* Registration Descriptor */
3136                     if( p_dr->i_length != 4 )
3137                     {
3138                         msg_Warn( p_demux, "invalid Registration Descriptor" );
3139                     }
3140                     else
3141                     {
3142                         if( !memcmp( p_dr->p_data, "AC-3", 4 ) )
3143                         {
3144                             /* ATSC with stream_type 0x81 (but this descriptor
3145                              * is then not mandatory */
3146                             pid->es->fmt.i_cat = AUDIO_ES;
3147                             pid->es->fmt.i_codec = VLC_FOURCC('a','5','2',' ');
3148                         }
3149                         else if( !memcmp( p_dr->p_data, "DTS1", 4 ) ||
3150                                  !memcmp( p_dr->p_data, "DTS2", 4 ) ||
3151                                  !memcmp( p_dr->p_data, "DTS3", 4 ) )
3152                         {
3153                            /*registration descriptor(ETSI TS 101 154 Annex F)*/
3154                             pid->es->fmt.i_cat = AUDIO_ES;
3155                             pid->es->fmt.i_codec = VLC_FOURCC('d','t','s',' ');
3156                         }
3157                         else if( !memcmp( p_dr->p_data, "BSSD", 4 ) )
3158                         {
3159                             pid->es->fmt.i_cat = AUDIO_ES;
3160                             pid->es->fmt.i_codec = VLC_FOURCC('l','p','c','m');
3161                         }
3162                         else
3163                         {
3164                             msg_Warn( p_demux,
3165                                       "unknown Registration Descriptor (%4.4s)",
3166                                       p_dr->p_data );
3167                         }
3168                     }
3169
3170                 }
3171                 else if( p_dr->i_tag == 0x6a )
3172                 {
3173                     /* DVB with stream_type 0x06 */
3174                     pid->es->fmt.i_cat = AUDIO_ES;
3175                     pid->es->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
3176                 }
3177                 else if( p_dr->i_tag == 0x73 )
3178                 {
3179                     /* DTS audio descriptor (ETSI TS 101 154 Annex F) */
3180                     msg_Dbg( p_demux, "    * DTS audio descriptor not decoded" );
3181                     pid->es->fmt.i_cat = AUDIO_ES;
3182                     pid->es->fmt.i_codec = VLC_FOURCC( 'd', 't', 's', ' ' );
3183                 }
3184                 else if( p_dr->i_tag == 0x45 )
3185                 {
3186                     msg_Dbg( p_demux, "    * VBI Data descriptor" );
3187                     /* FIXME : store the information somewhere */
3188                 }
3189                 else if( p_dr->i_tag == 0x46 )
3190                 {
3191                     msg_Dbg( p_demux, "    * VBI Teletext descriptor" );
3192                     /* FIXME : store the information somewhere */
3193                 }
3194 #ifdef _DVBPSI_DR_52_H_
3195                 else if( p_dr->i_tag == 0x52 )
3196                 {
3197                     dvbpsi_stream_identifier_dr_t *si;
3198                     si = dvbpsi_DecodeStreamIdentifierDr( p_dr );
3199
3200                     msg_Dbg( p_demux, "    * Stream Component Identifier: %d", si->i_component_tag );
3201                 }
3202 #endif
3203                 else if( p_dr->i_tag == 0x56 )
3204                 {
3205                     msg_Dbg( p_demux, "    * EBU Teletext descriptor" );
3206                     pid->es->fmt.i_cat = SPU_ES;
3207                     pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' );
3208                     pid->es->fmt.i_extra = p_dr->i_length;
3209                     pid->es->fmt.p_extra = malloc( p_dr->i_length );
3210                     memcpy( pid->es->fmt.p_extra, p_dr->p_data,
3211                             p_dr->i_length );
3212
3213 #if defined _DVBPSI_DR_56_H_ && defined DVBPSI_VERSION \
3214                     && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5)
3215                     pid->es->fmt.i_group = p_pmt->i_program_number;
3216
3217                     /* In stream output mode, only enable descriptor
3218                      * pass-through. */
3219                     if( !p_demux->out->b_sout )
3220                     {
3221                         uint16_t n, i = 0;
3222                         dvbpsi_teletext_dr_t *sub;
3223
3224                         sub = dvbpsi_DecodeTeletextDr( p_dr );
3225                         if( !sub ) continue;
3226
3227                         /* Each subtitle ES contains n languages,
3228                          * We are going to create n ES for the n tracks */
3229                         for( n = 0; n < sub->i_pages_number; n++ )
3230                         {
3231                             dvbpsi_teletextpage_t *p_page = &sub->p_pages[n];
3232                             if( p_page->i_teletext_type == 0x2
3233                                  || p_page->i_teletext_type == 0x5 )
3234                             {
3235                                 ts_es_t *p_es;
3236
3237                                 if( i == 0 )
3238                                 {
3239                                     p_es = pid->es;
3240                                 }
3241                                 else
3242                                 {
3243                                     p_es = malloc( sizeof( ts_es_t ) );
3244
3245                                     es_format_Copy( &p_es->fmt, &pid->es->fmt );
3246                                     free( p_es->fmt.psz_language ); p_es->fmt.psz_language = NULL;
3247                                     free( p_es->fmt.psz_description ); p_es->fmt.psz_description = NULL;
3248
3249                                     p_es->id = NULL;
3250                                     p_es->p_pes = NULL;
3251                                     p_es->i_pes_size = 0;
3252                                     p_es->i_pes_gathered = 0;
3253                                     p_es->pp_last = &p_es->p_pes;
3254                                     p_es->p_mpeg4desc = NULL;
3255
3256                                     TAB_APPEND( pid->i_extra_es, pid->extra_es,
3257                                                 p_es );
3258                                 }
3259
3260                                 p_es->fmt.psz_language = malloc( 4 );
3261                                 memcpy( p_es->fmt.psz_language,
3262                                         p_page->i_iso6392_language_code, 3 );
3263                                 p_es->fmt.psz_language[3] = 0;
3264
3265                                 switch( p_page->i_teletext_type )
3266                                 {
3267                                 case 0x2:
3268                                     p_es->fmt.psz_description =
3269                                         strdup(_("Teletext subtitles"));
3270                                     msg_Dbg( p_demux,
3271                                              "    * sub lan=%s page=%d%x",
3272                                              p_es->fmt.psz_language,
3273                                              p_page->i_teletext_magazine_number,
3274                                              p_page->i_teletext_page_number );
3275                                     break;
3276
3277                                 case 0x5:
3278                                     p_es->fmt.psz_description =
3279                                         strdup(_("Teletext hearing impaired subtitles"));
3280                                     msg_Dbg( p_demux,
3281                                              "    * hearing impaired lan=%s page=%d%x",
3282                                              p_es->fmt.psz_language,
3283                                              p_page->i_teletext_magazine_number,
3284                                              p_page->i_teletext_page_number );
3285                                     break;
3286                                 default:
3287                                     break;
3288                                 }
3289
3290                                 p_es->fmt.subs.dvb.i_id =
3291                                     p_page->i_teletext_page_number;
3292                                 /* Hack, FIXME */
3293                                 p_es->fmt.subs.dvb.i_id |=
3294                                 ((int)p_page->i_teletext_magazine_number << 16);
3295
3296                                 i++;
3297                             }
3298                         }
3299
3300                         if( !i )
3301                             pid->es->fmt.i_cat = UNKNOWN_ES;
3302                     }
3303                     else
3304 #endif  /* defined _DVBPSI_DR_56_H_  && DVBPSI_VERSION(0,1,6) */
3305                     {
3306                         pid->es->fmt.subs.dvb.i_id = -1;
3307                         pid->es->fmt.psz_description = strdup( "Teletext" );
3308                     }
3309                 }
3310                 else if( p_dr->i_tag == 0x59 )
3311                 {
3312                     /* DVB subtitles */
3313                     pid->es->fmt.i_cat = SPU_ES;
3314                     pid->es->fmt.i_codec = VLC_FOURCC( 'd', 'v', 'b', 's' );
3315                     pid->es->fmt.i_extra = p_dr->i_length;
3316                     pid->es->fmt.p_extra = malloc( p_dr->i_length );
3317                     memcpy( pid->es->fmt.p_extra, p_dr->p_data,
3318                             p_dr->i_length );
3319
3320 #ifdef _DVBPSI_DR_59_H_
3321                     pid->es->fmt.i_group = p_pmt->i_program_number;
3322
3323                     /* In stream output mode, only enable descriptor
3324                      * pass-through. */
3325                     if( !p_demux->out->b_sout )
3326                     {
3327                         uint16_t n, i = 0;
3328                         dvbpsi_subtitling_dr_t *sub;
3329
3330                         sub = dvbpsi_DecodeSubtitlingDr( p_dr );
3331                         if( !sub ) continue;
3332
3333                         for( n = 0; n < sub->i_subtitles_number; n++ )
3334                         {
3335                             dvbpsi_subtitle_t *p_sub = &sub->p_subtitle[n];
3336                             ts_es_t *p_es;
3337
3338                             if( i == 0 )
3339                             {
3340                                 p_es = pid->es;
3341                             }
3342                             else
3343                             {
3344                                 p_es = malloc( sizeof( ts_es_t ) );
3345
3346                                 es_format_Copy( &p_es->fmt, &pid->es->fmt );
3347                                 free( p_es->fmt.psz_language ); p_es->fmt.psz_language = NULL;
3348                                 free( p_es->fmt.psz_description ); p_es->fmt.psz_description = NULL;
3349
3350                                 p_es->id = NULL;
3351                                 p_es->p_pes = NULL;
3352                                 p_es->i_pes_size = 0;
3353                                 p_es->i_pes_gathered = 0;
3354                                 p_es->pp_last = &p_es->p_pes;
3355                                 p_es->p_mpeg4desc = NULL;
3356
3357                                 TAB_APPEND( pid->i_extra_es, pid->extra_es,
3358                                             p_es );
3359                             }
3360
3361                             p_es->fmt.psz_language = malloc( 4 );
3362                             memcpy( p_es->fmt.psz_language,
3363                                     p_sub->i_iso6392_language_code, 3 );
3364                             p_es->fmt.psz_language[3] = 0;
3365
3366                             switch( p_sub->i_subtitling_type )
3367                             {
3368                             case 0x10:
3369                                 p_es->fmt.psz_description =
3370                                     strdup(_("subtitles"));
3371                                 break;
3372                             case 0x11:
3373                                 p_es->fmt.psz_description =
3374                                     strdup(_("4:3 subtitles"));
3375                                 break;
3376                             case 0x12:
3377                                 p_es->fmt.psz_description =
3378                                     strdup(_("16:9 subtitles"));
3379                                 break;
3380                             case 0x13:
3381                                 p_es->fmt.psz_description =
3382                                     strdup(_("2.21:1 subtitles"));
3383                                 break;
3384                             case 0x20:
3385                                 p_es->fmt.psz_description =
3386                                     strdup(_("hearing impaired"));
3387                                 break;
3388                             case 0x21:
3389                                 p_es->fmt.psz_description =
3390                                     strdup(_("4:3 hearing impaired"));
3391                                 break;
3392                             case 0x22:
3393                                 p_es->fmt.psz_description =
3394                                     strdup(_("16:9 hearing impaired"));
3395                                 break;
3396                             case 0x23:
3397                                 p_es->fmt.psz_description =
3398                                     strdup(_("2.21:1 hearing impaired"));
3399                                 break;
3400                             default:
3401                                 break;
3402                             }
3403
3404                             p_es->fmt.subs.dvb.i_id =
3405                                 p_sub->i_composition_page_id;
3406                             /* Hack, FIXME */
3407                             p_es->fmt.subs.dvb.i_id |=
3408                               ((int)p_sub->i_ancillary_page_id << 16);
3409
3410                             i++;
3411                         }
3412
3413                         if( !i )
3414                             pid->es->fmt.i_cat = UNKNOWN_ES;
3415                     }
3416                     else
3417 #endif /* _DVBPSI_DR_59_H_ */
3418                     {
3419                         pid->es->fmt.subs.dvb.i_id = -1;
3420                         pid->es->fmt.psz_description = strdup( "DVB subtitles" );
3421                     }
3422                 }
3423             }
3424         }
3425         else if( p_es->i_type == 0xEA )
3426         {
3427             dvbpsi_descriptor_t *p_dr;
3428
3429             for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
3430                  p_dr = p_dr->p_next )
3431             {
3432                 msg_Dbg( p_demux, "  * es pid=%d type=%d dr->i_tag=0x%x",
3433                          p_es->i_pid, p_es->i_type, p_dr->i_tag );
3434
3435                 if( p_dr->i_tag == 0x05 )
3436                 {
3437                     /* Registration Descriptor */
3438                     if( p_dr->i_length < 4 ) // XXX VC-1 has extended this descriptor with sub-descriptor
3439                     {
3440                         msg_Warn( p_demux, "invalid Registration Descriptor" );
3441                     }
3442                     else
3443                     {
3444                         if( !memcmp( p_dr->p_data, "VC-1", 4 ) )
3445                         {
3446                             /* registration descriptor for VC-1 (SMPTE rp227) */
3447                             pid->es->fmt.i_cat = VIDEO_ES;
3448                             pid->es->fmt.i_codec = VLC_FOURCC('W','V','C','1');
3449
3450                             /* XXX With Simple and Main profile the SEQUENCE
3451                              * header is modified: video width and height are
3452                              * inserted just after the start code as 2 int16_t
3453                              * The packetizer will take care of that. */
3454                         }
3455                         else
3456                         {
3457                             msg_Warn( p_demux,
3458                                       "unknown Registration Descriptor (%4.4s)",
3459                                       p_dr->p_data );
3460                         }
3461                     }
3462                 }
3463             }
3464         }
3465         else if( p_es->i_type == 0xa0 )
3466         {
3467             /* MSCODEC sent by vlc */
3468             dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
3469
3470             while( p_dr && ( p_dr->i_tag != 0xa0 ) ) p_dr = p_dr->p_next;
3471
3472             if( p_dr && p_dr->i_length >= 8 )
3473             {
3474                 pid->es->fmt.i_cat = VIDEO_ES;
3475                 pid->es->fmt.i_codec =
3476                     VLC_FOURCC( p_dr->p_data[0], p_dr->p_data[1],
3477                                 p_dr->p_data[2], p_dr->p_data[3] );
3478                 pid->es->fmt.video.i_width =
3479                     ( p_dr->p_data[4] << 8 ) | p_dr->p_data[5];
3480                 pid->es->fmt.video.i_height =
3481                     ( p_dr->p_data[6] << 8 ) | p_dr->p_data[7];
3482                 pid->es->fmt.i_extra = 
3483                     (p_dr->p_data[8] << 8) | p_dr->p_data[9];
3484
3485                 if( pid->es->fmt.i_extra > 0 )
3486                 {
3487                     pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra );
3488                     memcpy( pid->es->fmt.p_extra, &p_dr->p_data[10],
3489                             pid->es->fmt.i_extra );
3490                 }
3491             }
3492             else
3493             {
3494                 msg_Warn( p_demux, "private MSCODEC (vlc) without bih private "
3495                           "descriptor" );
3496             }
3497             /* For such stream we will gather them ourself and don't launch a
3498              * packetizer.
3499              * Yes it's ugly but it's the only way to have DIV3 working */
3500             pid->es->fmt.b_packetized = VLC_TRUE;
3501         }
3502
3503         if( pid->es->fmt.i_cat == AUDIO_ES ||
3504             ( pid->es->fmt.i_cat == SPU_ES &&
3505               pid->es->fmt.i_codec != VLC_FOURCC('d','v','b','s') &&
3506               pid->es->fmt.i_codec != VLC_FOURCC('t','e','l','x') ) )
3507         {
3508             /* get language descriptor */
3509             dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
3510             while( p_dr && ( p_dr->i_tag != 0x0a ) ) p_dr = p_dr->p_next;
3511
3512             if( p_dr )
3513             {
3514                 dvbpsi_iso639_dr_t *p_decoded = dvbpsi_DecodeISO639Dr( p_dr );
3515
3516                 if( p_decoded )
3517                 {
3518 #if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2)
3519                     pid->es->fmt.psz_language = malloc( 4 );
3520                     memcpy( pid->es->fmt.psz_language,
3521                             p_decoded->code[0].iso_639_code, 3 );
3522                     pid->es->fmt.psz_language[3] = 0;
3523                     msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language);
3524                     switch( p_decoded->code[0].i_audio_type ) {
3525                     case 0:
3526                         pid->es->fmt.psz_description = NULL;
3527                         break;
3528                     case 1:
3529                         pid->es->fmt.psz_description =
3530                             strdup(_("clean effects"));
3531                         break;
3532                     case 2:
3533                         pid->es->fmt.psz_description =
3534                             strdup(_("hearing impaired"));
3535                         break;
3536                     case 3:
3537                         pid->es->fmt.psz_description =
3538                             strdup(_("visual impaired commentary"));
3539                         break;
3540                     default:
3541                         msg_Dbg( p_demux, "unknown audio type: %d",
3542                                  p_decoded->code[0].i_audio_type);
3543                         pid->es->fmt.psz_description = NULL;
3544                         break;
3545                     }
3546                     pid->es->fmt.i_extra_languages = p_decoded->i_code_count-1;
3547                     if( pid->es->fmt.i_extra_languages > 0 )
3548                         pid->es->fmt.p_extra_languages =
3549                             malloc( sizeof(*pid->es->fmt.p_extra_languages) *
3550                                     pid->es->fmt.i_extra_languages );
3551                     for( i = 0; i < pid->es->fmt.i_extra_languages; i++ ) {
3552                         msg_Dbg( p_demux, "bang" );
3553                         pid->es->fmt.p_extra_languages[i].psz_language =
3554                             malloc(4);
3555                         memcpy(pid->es->fmt.p_extra_languages[i].psz_language,
3556                                p_decoded->code[i+1].iso_639_code, 3 );
3557                         pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0';
3558                         switch( p_decoded->code[i].i_audio_type ) {
3559                         case 0:
3560                             pid->es->fmt.p_extra_languages[i].psz_description =
3561                                 NULL;
3562                             break;
3563                         case 1:
3564                             pid->es->fmt.p_extra_languages[i].psz_description =
3565                                 strdup(_("clean effects"));
3566                             break;
3567                         case 2:
3568                             pid->es->fmt.p_extra_languages[i].psz_description =
3569                                 strdup(_("hearing impaired"));
3570                             break;
3571                         case 3:
3572                             pid->es->fmt.p_extra_languages[i].psz_description =
3573                                 strdup(_("visual impaired commentary"));
3574                             break;
3575                         default:
3576                             msg_Dbg( p_demux, "unknown audio type: %d",
3577                                      p_decoded->code[i].i_audio_type);
3578                             pid->es->fmt.psz_description = NULL;
3579                             break;
3580                         }
3581
3582                     }
3583 #else
3584                     pid->es->fmt.psz_language = malloc( 4 );
3585                     memcpy( pid->es->fmt.psz_language,
3586                             p_decoded->i_iso_639_code, 3 );
3587                     pid->es->fmt.psz_language[3] = 0;
3588 #endif
3589                 }
3590             }
3591         }
3592
3593         pid->es->fmt.i_group = p_pmt->i_program_number;
3594         if( pid->es->fmt.i_cat == UNKNOWN_ES )
3595         {
3596             msg_Dbg( p_demux, "  * es pid=%d type=%d *unknown*",
3597                      p_es->i_pid, p_es->i_type );
3598         }
3599         else if( !p_sys->b_udp_out )
3600         {
3601             msg_Dbg( p_demux, "  * es pid=%d type=%d fcc=%4.4s",
3602                      p_es->i_pid, p_es->i_type, (char*)&pid->es->fmt.i_codec );
3603
3604             if( p_sys->b_es_id_pid ) pid->es->fmt.i_id = p_es->i_pid;
3605
3606             /* Check if we can avoid restarting the ES */
3607             if( old_pid &&
3608                 pid->es->fmt.i_codec == old_pid->es->fmt.i_codec &&
3609                 pid->es->fmt.i_extra == old_pid->es->fmt.i_extra &&
3610                 pid->es->fmt.i_extra == 0 &&
3611                 pid->i_extra_es == old_pid->i_extra_es &&
3612                 ( ( !pid->es->fmt.psz_language &&
3613                     !old_pid->es->fmt.psz_language ) ||
3614                   ( pid->es->fmt.psz_language &&
3615                     old_pid->es->fmt.psz_language &&
3616                     !strcmp( pid->es->fmt.psz_language,
3617                              old_pid->es->fmt.psz_language ) ) ) )
3618             {
3619                 pid->es->id = old_pid->es->id;
3620                 old_pid->es->id = NULL;
3621                 for( i = 0; i < pid->i_extra_es; i++ )
3622                 {
3623                     pid->extra_es[i]->id = old_pid->extra_es[i]->id;
3624                     old_pid->extra_es[i]->id = NULL;
3625                 }
3626             }
3627             else
3628             {
3629                 if( old_pid )
3630                 {
3631                     PIDClean( p_demux->out, old_pid );
3632                     TAB_REMOVE( i_clean, pp_clean, old_pid );
3633                     old_pid = 0;
3634                 }
3635
3636                 pid->es->id = es_out_Add( p_demux->out, &pid->es->fmt );
3637                 for( i = 0; i < pid->i_extra_es; i++ )
3638                 {
3639                     pid->extra_es[i]->id =
3640                         es_out_Add( p_demux->out, &pid->extra_es[i]->fmt );
3641                 }
3642             }
3643         }
3644
3645         /* Add ES to the list */
3646         if( old_pid )
3647         {
3648             PIDClean( p_demux->out, old_pid );
3649             TAB_REMOVE( i_clean, pp_clean, old_pid );
3650         }
3651         p_sys->pid[p_es->i_pid] = *pid;
3652
3653         for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
3654              p_dr = p_dr->p_next )
3655         {
3656             if( p_dr->i_tag == 0x9 )
3657             {
3658                 uint16_t i_sysid = ((uint16_t)p_dr->p_data[0] << 8)
3659                                     | p_dr->p_data[1];
3660                 msg_Dbg( p_demux, "   * descriptor : CA (0x9) SysID 0x%x",
3661                          i_sysid );
3662             }
3663         }
3664
3665         if( DVBProgramIsSelected( p_demux, prg->i_number )
3666              && (pid->es->id != NULL || p_sys->b_udp_out) )
3667         {
3668             /* Set demux filter */
3669             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3670                             ACCESS_SET_PRIVATE_ID_STATE, p_es->i_pid,
3671                             VLC_TRUE );
3672         }
3673     }
3674
3675     if( DVBProgramIsSelected( p_demux, prg->i_number ) )
3676     {
3677         /* Set CAM descrambling */
3678         stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3679                         ACCESS_SET_PRIVATE_ID_CA, p_pmt );
3680     }
3681     else
3682     {
3683         dvbpsi_DeletePMT( p_pmt );
3684     }
3685
3686     for ( i = 0; i < i_clean; i++ )
3687     {
3688         if( DVBProgramIsSelected( p_demux, prg->i_number ) )
3689         {
3690             stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3691                             ACCESS_SET_PRIVATE_ID_STATE, pp_clean[i]->i_pid,
3692                             VLC_FALSE );
3693         }
3694
3695         PIDClean( p_demux->out, pp_clean[i] );
3696     }
3697     if( i_clean ) free( pp_clean );
3698 }
3699
3700 static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
3701 {
3702     demux_sys_t          *p_sys = p_demux->p_sys;
3703     dvbpsi_pat_program_t *p_program;
3704     ts_pid_t             *pat = &p_sys->pid[0];
3705     int                  i, j;
3706
3707     msg_Dbg( p_demux, "PATCallBack called" );
3708
3709     if( pat->psi->i_pat_version != -1 &&
3710         ( !p_pat->b_current_next ||
3711           p_pat->i_version == pat->psi->i_pat_version ) )
3712     {
3713         dvbpsi_DeletePAT( p_pat );
3714         return;
3715     }
3716
3717     msg_Dbg( p_demux, "new PAT ts_id=%d version=%d current_next=%d",
3718              p_pat->i_ts_id, p_pat->i_version, p_pat->b_current_next );
3719
3720     /* Clean old */
3721     if( p_sys->i_pmt > 0 )
3722     {
3723         int      i_pmt_rm = 0;
3724         ts_pid_t **pmt_rm = NULL;
3725
3726         /* Search pmt to be deleted */
3727         for( i = 0; i < p_sys->i_pmt; i++ )
3728         {
3729             ts_pid_t *pmt = p_sys->pmt[i];
3730             vlc_bool_t b_keep = VLC_FALSE;
3731
3732             for( p_program = p_pat->p_first_program; p_program != NULL;
3733                  p_program = p_program->p_next )
3734             {
3735                 if( p_program->i_pid == pmt->i_pid )
3736                 {
3737                     int i_prg;
3738                     for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
3739                     {
3740                         if( p_program->i_number ==
3741                             pmt->psi->prg[i_prg]->i_number )
3742                         {
3743                             b_keep = VLC_TRUE;
3744                             break;
3745                         }
3746                     }
3747                     if( b_keep ) break;
3748                 }
3749             }
3750
3751             if( !b_keep )
3752             {
3753                 TAB_APPEND( i_pmt_rm, pmt_rm, pmt );
3754             }
3755         }
3756
3757         /* Delete all ES attached to thoses PMT */
3758         for( i = 2; i < 8192; i++ )
3759         {
3760             ts_pid_t *pid = &p_sys->pid[i];
3761
3762             if( !pid->b_valid || pid->psi ) continue;
3763
3764             for( j = 0; j < i_pmt_rm; j++ )
3765             {
3766                 int i_prg;
3767                 for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
3768                 {
3769                     /* We only remove es that aren't defined by extra pmt */
3770                     if( pid->p_owner->prg[i_prg]->i_pid_pmt !=
3771                         pmt_rm[j]->i_pid ) continue;
3772
3773                     if( p_sys->b_dvb_control && pid->es->id )
3774                     {
3775                         if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3776                                             ACCESS_SET_PRIVATE_ID_STATE, i,
3777                                             VLC_FALSE ) )
3778                             p_sys->b_dvb_control = VLC_FALSE;
3779                     }
3780
3781                     PIDClean( p_demux->out, pid );
3782                     break;
3783                 }
3784
3785                 if( !pid->b_valid ) break;
3786             }
3787         }
3788
3789         /* Delete PMT pid */
3790         for( i = 0; i < i_pmt_rm; i++ )
3791         {
3792             int i_prg;
3793             if( p_sys->b_dvb_control )
3794             {
3795                 if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3796                                     ACCESS_SET_PRIVATE_ID_STATE,
3797                                     pmt_rm[i]->i_pid, VLC_FALSE ) )
3798                     p_sys->b_dvb_control = VLC_FALSE;
3799             }
3800
3801             for( i_prg = 0; i_prg < pmt_rm[i]->psi->i_prg; i_prg++ )
3802             {
3803                 const int i_number = pmt_rm[i]->psi->prg[i_prg]->i_number;
3804                 if( i_number != 0 )
3805                     es_out_Control( p_demux->out, ES_OUT_DEL_GROUP, i_number );
3806             }
3807
3808             PIDClean( p_demux->out, &p_sys->pid[pmt_rm[i]->i_pid] );
3809             TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] );
3810         }
3811
3812         if( pmt_rm ) free( pmt_rm );
3813     }
3814
3815     /* now create programs */
3816     for( p_program = p_pat->p_first_program; p_program != NULL;
3817          p_program = p_program->p_next )
3818     {
3819         msg_Dbg( p_demux, "  * number=%d pid=%d", p_program->i_number,
3820                  p_program->i_pid );
3821         if( p_program->i_number != 0 )
3822         {
3823             ts_pid_t *pmt = &p_sys->pid[p_program->i_pid];
3824             vlc_bool_t b_add = VLC_TRUE;
3825
3826             if( pmt->b_valid )
3827             {
3828                 int i_prg;
3829                 for( i_prg = 0; i_prg < pmt->psi->i_prg; i_prg++ )
3830                 {
3831                     if( pmt->psi->prg[i_prg]->i_number == p_program->i_number )
3832                     {
3833                         b_add = VLC_FALSE;
3834                         break;
3835                     }
3836                 }
3837             }
3838             else
3839             {
3840                 TAB_APPEND( p_sys->i_pmt, p_sys->pmt, pmt );
3841             }
3842
3843             if( b_add )
3844             {
3845                 PIDInit( pmt, VLC_TRUE, pat->psi );
3846                 pmt->psi->prg[pmt->psi->i_prg-1]->handle =
3847                     dvbpsi_AttachPMT( p_program->i_number,
3848                                       (dvbpsi_pmt_callback)PMTCallBack,
3849                                       p_demux );
3850                 pmt->psi->prg[pmt->psi->i_prg-1]->i_number =
3851                     p_program->i_number;
3852                 pmt->psi->prg[pmt->psi->i_prg-1]->i_pid_pmt =
3853                     p_program->i_pid;
3854
3855                 /* Now select PID at access level */
3856                 if( p_sys->b_dvb_control )
3857                 {
3858                     if( DVBProgramIsSelected( p_demux, p_program->i_number ) )
3859                     {
3860                         if( p_sys->i_dvb_program == 0 )
3861                             p_sys->i_dvb_program = p_program->i_number;
3862
3863                         if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
3864                                             ACCESS_SET_PRIVATE_ID_STATE,
3865                                             p_program->i_pid, VLC_TRUE ) )
3866                             p_sys->b_dvb_control = VLC_FALSE;
3867                     }
3868                 }
3869             }
3870         }
3871     }
3872     pat->psi->i_pat_version = p_pat->i_version;
3873
3874     dvbpsi_DeletePAT( p_pat );
3875 }