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