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