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