]> git.sesse.net Git - vlc/blob - modules/mux/mpeg/ts.c
* modules/mux/asf.c, ts.c, ogg.c: added WMV3 fourcc.
[vlc] / modules / mux / mpeg / ts.c
1 /*****************************************************************************
2  * ts.c: MPEG-II TS Muxer
3  *****************************************************************************
4  * Copyright (C) 2001, 2002 VideoLAN
5  * $Id$
6  *
7  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8  *          Eric Petit <titer@videolan.org>
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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
23  *****************************************************************************/
24
25 /*****************************************************************************
26  * Preamble
27  *****************************************************************************/
28 #include <stdlib.h>
29
30 #include <vlc/vlc.h>
31 #include <vlc/input.h>
32 #include <vlc/sout.h>
33
34 #include "iso_lang.h"
35
36 #include "bits.h"
37 #include "pes.h"
38 #include "csa.h"
39
40 #ifdef HAVE_DVBPSI_DR_H
41 #   include <dvbpsi/dvbpsi.h>
42 #   include <dvbpsi/descriptor.h>
43 #   include <dvbpsi/pat.h>
44 #   include <dvbpsi/pmt.h>
45 #   include <dvbpsi/dr.h>
46 #   include <dvbpsi/psi.h>
47 #else
48 #   include "dvbpsi.h"
49 #   include "descriptor.h"
50 #   include "tables/pat.h"
51 #   include "tables/pmt.h"
52 #   include "descriptors/dr.h"
53 #   include "psi.h"
54 #endif
55
56 /*
57  * TODO:
58  *  - check PCR frequency requirement
59  *  - check PAT/PMT  "        "
60  *  - check PCR/PCR "soft"
61  *  - check if "registration" descriptor : "AC-3" should be a program
62  *    descriptor or an es one. (xine want an es one)
63  *
64  *  - remove creation of PAT/PMT without dvbpsi
65  *  - ?
66  * FIXME:
67  *  - subtitle support is far from perfect. I expect some subtitles drop
68  *    if they arrive a bit late
69  *    (We cannot rely on the fact that the fifo should be full)
70  */
71 /*****************************************************************************
72  * Module descriptor
73  *****************************************************************************/
74 static int     Open   ( vlc_object_t * );
75 static void    Close  ( vlc_object_t * );
76
77 #define VPID_TEXT N_("Video PID")
78 #define VPID_LONGTEXT N_("Assigns a fixed PID to the video stream. The PCR " \
79   "PID will automatically be the video.")
80 #define APID_TEXT N_("Audio PID")
81 #define APID_LONGTEXT N_("Assigns a fixed PID to the audio stream.")
82
83 #define SHAPING_TEXT N_("Shaping delay (ms)")
84 #define SHAPING_LONGTEXT N_("If enabled, the TS muxer will cut the " \
85   "stream in slices of the given duration, and ensure a constant bitrate " \
86   "between the two boundaries. This avoids having huge bitrate peaks for " \
87   "reference frames, in particular.")
88 #define KEYF_TEXT N_("Use keyframes")
89 #define KEYF_LONGTEXT N_("If enabled, and shaping is specified, " \
90   "the TS muxer will place the boundaries at the end of I pictures. In " \
91   "that case, the shaping duration given by the user is a worse case " \
92   "used when no reference frame is available. This enhances the efficiency " \
93   "of the shaping algorithm, since I frames are usually the biggest " \
94   "frames in the stream.")
95
96 #define PCR_TEXT N_("PCR delay (ms)")
97 #define PCR_LONGTEXT N_("This option allows you to set at which interval " \
98   "PCRs (Program Clock Reference) will be sent. " \
99   "This value should be below 100ms. (default is 30)")
100
101 #define DTS_TEXT N_("DTS delay (ms)")
102 #define DTS_LONGTEXT N_("This option will delay the DTS (decoding time " \
103   "stamps) and PTS (presentation timestamps) of the data in the " \
104   "stream, compared to the PCRs. This allows for some buffering inside " \
105   "the client decoder.")
106
107 #define ACRYPT_TEXT N_("Crypt audio")
108 #define ACRYPT_LONGTEXT N_("Crypt audio using CSA")
109
110 #define CK_TEXT N_("CSA Key")
111 #define CK_LONGTEXT N_("Defines the CSA encryption key. This must be a " \
112   "16 char string (8 hexadecimal bytes).")
113
114 #define SOUT_CFG_PREFIX "sout-ts-"
115
116 vlc_module_begin();
117     set_description( _("TS muxer (libdvbpsi)") );
118     set_capability( "sout mux", 120 );
119     add_shortcut( "ts" );
120
121     add_integer( SOUT_CFG_PREFIX "pid-video", 0, NULL,VPID_TEXT, VPID_LONGTEXT,
122                                   VLC_TRUE );
123     add_integer( SOUT_CFG_PREFIX "pid-audio", 0, NULL, APID_TEXT,
124                  APID_LONGTEXT, VLC_TRUE );
125
126     add_integer( SOUT_CFG_PREFIX "shaping", 200, NULL,SHAPING_TEXT,
127                  SHAPING_LONGTEXT, VLC_TRUE );
128     add_bool( SOUT_CFG_PREFIX "use-key-frames", VLC_FALSE, NULL, KEYF_TEXT,
129               KEYF_LONGTEXT, VLC_TRUE );
130
131     add_integer( SOUT_CFG_PREFIX "pcr", 30, NULL, PCR_TEXT, PCR_LONGTEXT,
132                  VLC_TRUE );
133     add_integer( SOUT_CFG_PREFIX "dts-delay", 200, NULL, DTS_TEXT,
134                  DTS_LONGTEXT, VLC_TRUE );
135
136     add_bool( SOUT_CFG_PREFIX "crypt-audio", VLC_TRUE, NULL, ACRYPT_TEXT,
137               ACRYPT_LONGTEXT, VLC_TRUE );
138
139     add_string( SOUT_CFG_PREFIX "csa-ck", NULL, NULL, CK_TEXT, CK_LONGTEXT,
140                 VLC_TRUE );
141
142     set_callbacks( Open, Close );
143 vlc_module_end();
144
145 /*****************************************************************************
146  * Local data structures
147  *****************************************************************************/
148 static const char *ppsz_sout_options[] = {
149     "pid-video", "pid-audio", "shaping", "pcr",
150     "use-key-frames", "dts-delay", "csa-ck", "crypt-audio", NULL
151 };
152
153 #define SOUT_BUFFER_FLAGS_PRIVATE_PCR  ( 1 << BLOCK_FLAG_PRIVATE_SHIFT )
154 #define SOUT_BUFFER_FLAGS_PRIVATE_CSA  ( 2 << BLOCK_FLAG_PRIVATE_SHIFT )
155 typedef struct
156 {
157     int     i_depth;
158     block_t *p_first;
159     block_t **pp_last;
160 } sout_buffer_chain_t;
161
162 static inline void BufferChainInit  ( sout_buffer_chain_t *c )
163 {
164     c->i_depth = 0;
165     c->p_first = NULL;
166     c->pp_last = &c->p_first;
167 }
168 static inline void BufferChainAppend( sout_buffer_chain_t *c, block_t *b )
169 {
170     *c->pp_last = b;
171     c->i_depth++;
172
173     while( b->p_next )
174     {
175         b = b->p_next;
176         c->i_depth++;
177     }
178     c->pp_last = &b->p_next;
179 }
180 static inline block_t *BufferChainGet( sout_buffer_chain_t *c )
181 {
182     block_t *b = c->p_first;
183
184     if( b )
185     {
186         c->i_depth--;
187         c->p_first = b->p_next;
188
189         if( c->p_first == NULL )
190         {
191             c->pp_last = &c->p_first;
192         }
193
194         b->p_next = NULL;
195     }
196     return b;
197 }
198 static inline block_t *BufferChainPeek( sout_buffer_chain_t *c )
199 {
200     block_t *b = c->p_first;
201
202     return b;
203 }
204 static inline void BufferChainClean( sout_instance_t *p_sout,
205                                      sout_buffer_chain_t *c )
206 {
207     block_t *b;
208
209     while( ( b = BufferChainGet( c ) ) )
210     {
211         block_Release( b );
212     }
213     BufferChainInit( c );
214 }
215
216 typedef struct ts_stream_t
217 {
218     int             i_pid;
219     vlc_fourcc_t    i_codec;
220
221     int             i_stream_type;
222     int             i_stream_id;
223     int             i_continuity_counter;
224
225     /* to be used for carriege of DIV3 */
226     vlc_fourcc_t    i_bih_codec;
227     int             i_bih_width, i_bih_height;
228
229     /* Specific to mpeg4 in mpeg2ts */
230     int             i_es_id;
231
232     int             i_decoder_specific_info;
233     uint8_t         *p_decoder_specific_info;
234
235     /* language is iso639-2T */
236     uint8_t         lang[3];
237
238     sout_buffer_chain_t chain_pes;
239     mtime_t             i_pes_dts;
240     mtime_t             i_pes_length;
241     int                 i_pes_used;
242     vlc_bool_t          b_key_frame;
243
244 } ts_stream_t;
245
246 struct sout_mux_sys_t
247 {
248     int             i_pcr_pid;
249     sout_input_t    *p_pcr_input;
250
251     int             i_audio_bound;
252     int             i_video_bound;
253
254     int             i_pid_video;
255     int             i_pid_audio;
256     int             i_pid_free; // first usable pid
257
258     int             i_pat_version_number;
259     ts_stream_t     pat;
260
261     int             i_pmt_version_number;
262     ts_stream_t     pmt;        // Up to now only one program
263
264     int             i_mpeg4_streams;
265
266     int             i_null_continuity_counter;  /* Needed ? */
267
268     /* for TS building */
269     int64_t             i_bitrate_min;
270     int64_t             i_bitrate_max;
271
272     int64_t             i_shaping_delay;
273     int64_t             i_pcr_delay;
274
275     int64_t             i_dts_delay;
276
277     vlc_bool_t          b_use_key_frames;
278
279     mtime_t             i_pcr;  /* last PCR emited */
280
281     csa_t               *csa;
282     vlc_bool_t          b_crypt_audio;
283 };
284
285
286 /* Reserve a pid and return it */
287 static int  AllocatePID( sout_mux_sys_t *p_sys, int i_cat )
288 {
289     int i_pid;
290     if ( i_cat == VIDEO_ES && p_sys->i_pid_video )
291     {
292         i_pid = p_sys->i_pid_video;
293         p_sys->i_pid_video = 0;
294     }
295     else if ( i_cat == AUDIO_ES && p_sys->i_pid_audio )
296     {
297         i_pid = p_sys->i_pid_audio;
298         p_sys->i_pid_audio = 0;
299     }
300     else
301     {
302         i_pid = ++p_sys->i_pid_free;
303     }
304     return i_pid;
305 }
306
307 /*****************************************************************************
308  * Local prototypes
309  *****************************************************************************/
310 static int Control  ( sout_mux_t *, int, va_list );
311 static int AddStream( sout_mux_t *, sout_input_t * );
312 static int DelStream( sout_mux_t *, sout_input_t * );
313 static int Mux      ( sout_mux_t * );
314
315 static void TSSchedule  ( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts,
316                           mtime_t i_pcr_length, mtime_t i_pcr_dts );
317 static void TSDate      ( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts,
318                           mtime_t i_pcr_length, mtime_t i_pcr_dts );
319 static void GetPAT( sout_mux_t *p_mux, sout_buffer_chain_t *c );
320 static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c );
321
322 static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream, vlc_bool_t b_pcr );
323 static void TSSetPCR( block_t *p_ts, mtime_t i_dts );
324
325 static void PEStoTS  ( sout_instance_t *, sout_buffer_chain_t *, block_t *, ts_stream_t * );
326
327 /*****************************************************************************
328  * Open:
329  *****************************************************************************/
330 static int Open( vlc_object_t *p_this )
331 {
332     sout_mux_t          *p_mux =(sout_mux_t*)p_this;
333     sout_mux_sys_t      *p_sys;
334     vlc_value_t         val;
335
336     msg_Dbg( p_mux, "Open" );
337     sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
338
339     p_sys = malloc( sizeof( sout_mux_sys_t ) );
340
341     p_mux->pf_control   = Control;
342     p_mux->pf_addstream = AddStream;
343     p_mux->pf_delstream = DelStream;
344     p_mux->pf_mux       = Mux;
345     p_mux->p_sys        = p_sys;
346
347     srand( (uint32_t)mdate() );
348
349     p_sys->i_audio_bound = 0;
350     p_sys->i_video_bound = 0;
351
352     p_sys->i_pat_version_number = rand() % 32;
353     p_sys->pat.i_pid = 0;
354     p_sys->pat.i_continuity_counter = 0;
355
356     p_sys->i_pmt_version_number = rand() % 32;
357     p_sys->pmt.i_pid = 0x42;
358     p_sys->pmt.i_continuity_counter = 0;
359
360     p_sys->i_pid_free = 0x43;
361
362     var_Get( p_mux, SOUT_CFG_PREFIX "pid-video", &val );
363     p_sys->i_pid_video = val.i_int;
364     if ( p_sys->i_pid_video > p_sys->i_pid_free )
365     {
366         p_sys->i_pid_free = p_sys->i_pid_video + 1;
367     }
368
369     var_Get( p_mux, SOUT_CFG_PREFIX "pid-audio", &val );
370     p_sys->i_pid_audio = val.i_int;
371     if ( p_sys->i_pid_audio > p_sys->i_pid_free )
372     {
373         p_sys->i_pid_free = p_sys->i_pid_audio + 1;
374     }
375
376     p_sys->i_pcr_pid = 0x1fff;
377     p_sys->p_pcr_input = NULL;
378
379     p_sys->i_mpeg4_streams = 0;
380
381     p_sys->i_null_continuity_counter = 0;
382
383     /* Allow to create constrained stream */
384     var_Get( p_mux, SOUT_CFG_PREFIX "bmin", &val );
385     p_sys->i_bitrate_min = 0;/*val.i_int;*/
386
387     var_Get( p_mux, SOUT_CFG_PREFIX "bmax", &val );
388     p_sys->i_bitrate_max = 0;/*val.i_int;*/
389
390     if( p_sys->i_bitrate_min > 0 && p_sys->i_bitrate_max > 0 &&
391         p_sys->i_bitrate_min > p_sys->i_bitrate_max )
392     {
393         msg_Err( p_mux, "incompatible minimum and maximum bitrate, "
394                  "disabling bitrate control" );
395         p_sys->i_bitrate_min = 0;
396         p_sys->i_bitrate_max = 0;
397     }
398     if( p_sys->i_bitrate_min > 0 || p_sys->i_bitrate_max > 0 )
399     {
400         msg_Err( p_mux, "bmin and bmax no more supported "
401                  "(if you need them report it)" );
402     }
403
404     var_Get( p_mux, SOUT_CFG_PREFIX "shaping", &val );
405     p_sys->i_shaping_delay = (int64_t)val.i_int * 1000;
406     if( p_sys->i_shaping_delay <= 0 )
407     {
408         msg_Err( p_mux,
409                  "invalid shaping ("I64Fd"ms) resetting to 200ms",
410                  p_sys->i_shaping_delay / 1000 );
411         p_sys->i_shaping_delay = 200000;
412     }
413
414     var_Get( p_mux, SOUT_CFG_PREFIX "pcr", &val );
415     p_sys->i_pcr_delay = (int64_t)val.i_int * 1000;
416     if( p_sys->i_pcr_delay <= 0 ||
417         p_sys->i_pcr_delay >= p_sys->i_shaping_delay )
418     {
419         msg_Err( p_mux,
420                  "invalid pcr delay ("I64Fd"ms) resetting to 30ms",
421                  p_sys->i_pcr_delay / 1000 );
422         p_sys->i_pcr_delay = 30000;
423     }
424
425     var_Get( p_mux, SOUT_CFG_PREFIX "dts-delay", &val );
426     p_sys->i_dts_delay = (int64_t)val.i_int * 1000;
427
428     msg_Dbg( p_mux, "shaping="I64Fd" pcr="I64Fd" dts_delay="I64Fd,
429              p_sys->i_shaping_delay, p_sys->i_pcr_delay, p_sys->i_dts_delay );
430
431     var_Get( p_mux, SOUT_CFG_PREFIX "use-key-frames", &val );
432     p_sys->b_use_key_frames = val.b_bool;
433
434     /* for TS generation */
435     p_sys->i_pcr    = 0;
436
437     p_sys->csa      = NULL;
438     var_Get( p_mux, SOUT_CFG_PREFIX "csa-ck", &val );
439     if( val.psz_string )
440     {
441         char *psz = val.psz_string;
442
443         /* skip 0x */
444         if( psz[0] == '0' && ( psz[1] == 'x' || psz[1] == 'X' ) )
445         {
446             psz += 2;
447         }
448         if( strlen( psz ) != 16 )
449         {
450             msg_Dbg( p_mux, "invalid csa ck (it must be 16 chars long)" );
451         }
452         else
453         {
454             uint64_t i_ck = strtoll( psz, NULL, 16 );
455             uint8_t  ck[8];
456             int      i;
457
458             for( i = 0; i < 8; i++ )
459             {
460                 ck[i] = ( i_ck >> ( 56 - 8*i) )&0xff;
461             }
462
463             msg_Dbg( p_mux, "using CSA scrambling with ck=%x:%x:%x:%x:%x:%x:%x:%x",
464                      ck[0], ck[1], ck[2], ck[3], ck[4], ck[5], ck[6], ck[7] );
465
466             p_sys->csa = csa_New();
467             csa_SetCW( p_sys->csa, ck, ck );
468         }
469     }
470     if( val.psz_string ) free( val.psz_string );
471
472     var_Get( p_mux, SOUT_CFG_PREFIX "crypt-audio", &val );
473     p_sys->b_crypt_audio = val.b_bool;
474
475     return VLC_SUCCESS;
476 }
477
478 /*****************************************************************************
479  * Close:
480  *****************************************************************************/
481 static void Close( vlc_object_t * p_this )
482 {
483     sout_mux_t          *p_mux = (sout_mux_t*)p_this;
484     sout_mux_sys_t      *p_sys = p_mux->p_sys;
485
486     msg_Dbg( p_mux, "Close" );
487     if( p_sys->csa )
488     {
489         csa_Delete( p_sys->csa );
490     }
491
492     free( p_sys );
493 }
494
495 /*****************************************************************************
496  * Control:
497  *****************************************************************************/
498 static int Control( sout_mux_t *p_mux, int i_query, va_list args )
499 {
500     vlc_bool_t *pb_bool;
501     char **ppsz;
502
503    switch( i_query )
504    {
505        case MUX_CAN_ADD_STREAM_WHILE_MUXING:
506            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
507            *pb_bool = VLC_TRUE;
508            return VLC_SUCCESS;
509
510        case MUX_GET_ADD_STREAM_WAIT:
511            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
512            *pb_bool = VLC_FALSE;
513            return VLC_SUCCESS;
514
515        case MUX_GET_MIME:
516            ppsz = (char**)va_arg( args, char ** );
517            *ppsz = strdup( "video/mpeg" );  /* FIXME not sure */
518            return VLC_SUCCESS;
519
520         default:
521             return VLC_EGENERIC;
522    }
523 }
524
525 /*****************************************************************************
526  * AddStream: called for each stream addition
527  *****************************************************************************/
528 static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
529 {
530     sout_mux_sys_t      *p_sys = p_mux->p_sys;
531     ts_stream_t         *p_stream;
532
533     p_input->p_sys = p_stream = malloc( sizeof( ts_stream_t ) );
534
535     /* Init this new stream */
536     p_stream->i_pid = AllocatePID( p_sys, p_input->p_fmt->i_cat );
537     p_stream->i_codec = p_input->p_fmt->i_codec;
538     p_stream->i_continuity_counter    = 0;
539     p_stream->i_decoder_specific_info = 0;
540     p_stream->p_decoder_specific_info = NULL;
541
542     msg_Dbg( p_mux, "adding input codec=%4.4s pid=%d",
543              (char*)&p_input->p_fmt->i_codec, p_stream->i_pid );
544
545     /* All others fields depand on codec */
546     switch( p_input->p_fmt->i_cat )
547     {
548         case VIDEO_ES:
549             switch( p_input->p_fmt->i_codec )
550             {
551                 case VLC_FOURCC( 'm', 'p','g', 'v' ):
552                     /* TODO: do we need to check MPEG-I/II ? */
553                     p_stream->i_stream_type = 0x02;
554                     p_stream->i_stream_id = 0xe0;
555                     break;
556                 case VLC_FOURCC( 'm', 'p','4', 'v' ):
557                     p_stream->i_stream_type = 0x10;
558                     p_stream->i_stream_id = 0xfa;
559                     p_sys->i_mpeg4_streams++;
560                     p_stream->i_es_id = p_stream->i_pid;
561                     break;
562                 case VLC_FOURCC( 'h', '2','6', '4' ):
563                     p_stream->i_stream_type = 0x1b;
564                     p_stream->i_stream_id = 0xe0;
565                     break;
566                 /* XXX dirty dirty but somebody want that:
567                  *     using crapy MS-codec XXX */
568                 /* I didn't want to do that :P */
569                 case VLC_FOURCC( 'H', '2', '6', '3' ):
570                 case VLC_FOURCC( 'I', '2', '6', '3' ):
571                 case VLC_FOURCC( 'W', 'M', 'V', '3' ):
572                 case VLC_FOURCC( 'W', 'M', 'V', '2' ):
573                 case VLC_FOURCC( 'W', 'M', 'V', '1' ):
574                 case VLC_FOURCC( 'D', 'I', 'V', '3' ):
575                 case VLC_FOURCC( 'D', 'I', 'V', '2' ):
576                 case VLC_FOURCC( 'D', 'I', 'V', '1' ):
577                 case VLC_FOURCC( 'M', 'J', 'P', 'G' ):
578                     p_stream->i_stream_type = 0xa0; // private
579                     p_stream->i_stream_id = 0xa0;   // beurk
580                     p_stream->i_bih_codec  = p_input->p_fmt->i_codec;
581                     p_stream->i_bih_width  = p_input->p_fmt->video.i_width;
582                     p_stream->i_bih_height = p_input->p_fmt->video.i_height;
583                     break;
584                 default:
585                     free( p_stream );
586                     return VLC_EGENERIC;
587             }
588             p_sys->i_video_bound++;
589             break;
590
591         case AUDIO_ES:
592             switch( p_input->p_fmt->i_codec )
593             {
594                 case VLC_FOURCC( 'm', 'p','g', 'a' ):
595                     p_stream->i_stream_type =
596                         p_input->p_fmt->audio.i_rate >= 32000 ? 0x03 : 0x04;
597                     p_stream->i_stream_id = 0xc0;
598                     break;
599                 case VLC_FOURCC( 'a', '5','2', ' ' ):
600                     p_stream->i_stream_type = 0x81;
601                     p_stream->i_stream_id = 0xbd;
602                     break;
603                 case VLC_FOURCC( 'l', 'p','c', 'm' ):
604                     p_stream->i_stream_type = 0x83;
605                     p_stream->i_stream_id = 0xbd;
606                     break;
607                 case VLC_FOURCC( 'd', 't','s', ' ' ):
608                     p_stream->i_stream_type = 0x06;
609                     p_stream->i_stream_id = 0xbd;
610                     break;
611
612                 case VLC_FOURCC( 'm', 'p','4', 'a' ):
613                     p_stream->i_stream_type = 0x11;
614                     p_stream->i_stream_id = 0xfa;
615                     p_sys->i_mpeg4_streams++;
616                     p_stream->i_es_id = p_stream->i_pid;
617                     break;
618                 default:
619                     free( p_stream );
620                     return VLC_EGENERIC;
621             }
622             p_sys->i_audio_bound++;
623             break;
624
625         case SPU_ES:
626             switch( p_input->p_fmt->i_codec )
627             {
628                 case VLC_FOURCC( 's', 'p','u', ' ' ):
629                     p_stream->i_stream_type = 0x82;
630                     p_stream->i_stream_id = 0xbd;
631                     break;
632                 case VLC_FOURCC( 's', 'u','b', 't' ):
633                     p_stream->i_stream_type = 0x12;
634                     p_stream->i_stream_id = 0xfa;
635                     p_sys->i_mpeg4_streams++;
636                     p_stream->i_es_id = p_stream->i_pid;
637                     break;
638                 case VLC_FOURCC('d','v','b','s'):
639                     p_stream->i_stream_type = 0x06;
640                     p_stream->i_es_id = p_input->p_fmt->subs.dvb.i_id;
641                     p_stream->i_stream_id = 0xa0;
642                     break;
643                 default:
644                     free( p_stream );
645                     return VLC_EGENERIC;
646             }
647             break;
648
649         default:
650             free( p_stream );
651             return VLC_EGENERIC;
652     }
653
654     p_stream->lang[0] =
655     p_stream->lang[1] =
656     p_stream->lang[2] = '\0';
657     if( p_input->p_fmt->psz_language )
658     {
659         char *psz = p_input->p_fmt->psz_language;
660         const iso639_lang_t *pl = NULL;
661
662         if( strlen( psz ) == 2 )
663         {
664             pl = GetLang_1( psz );
665         }
666         else if( strlen( psz ) == 3 )
667         {
668             pl = GetLang_2B( psz );
669             if( !strcmp( pl->psz_iso639_1, "??" ) )
670             {
671                 pl = GetLang_2T( psz );
672             }
673         }
674         if( pl && strcmp( pl->psz_iso639_1, "??" ) )
675         {
676             p_stream->lang[0] = pl->psz_iso639_2T[0];
677             p_stream->lang[1] = pl->psz_iso639_2T[1];
678             p_stream->lang[2] = pl->psz_iso639_2T[2];
679
680             msg_Dbg( p_mux, "    - lang=%c%c%c",
681                      p_stream->lang[0], p_stream->lang[1], p_stream->lang[2] );
682         }
683     }
684
685
686     /* Copy extra data (VOL for MPEG-4 and extra BitMapInfoHeader for VFW */
687     p_stream->i_decoder_specific_info = p_input->p_fmt->i_extra;
688     if( p_stream->i_decoder_specific_info > 0 )
689     {
690         p_stream->p_decoder_specific_info =
691             malloc( p_stream->i_decoder_specific_info );
692         memcpy( p_stream->p_decoder_specific_info,
693                 p_input->p_fmt->p_extra,
694                 p_input->p_fmt->i_extra );
695     }
696
697     /* Create decoder specific info for subt */
698     if( p_stream->i_codec == VLC_FOURCC( 's', 'u','b', 't' ) )
699     {
700         uint8_t *p;
701
702         p_stream->i_decoder_specific_info = 55;
703         p_stream->p_decoder_specific_info = p =
704             malloc( p_stream->i_decoder_specific_info );
705
706         p[0] = 0x10;    /* textFormat, 0x10 for 3GPP TS 26.245 */
707         p[1] = 0x00;    /* flags: 1b: associated video info flag
708                                   3b: reserved
709                                   1b: duration flag
710                                   3b: reserved */
711         p[2] = 52;      /* remaining size */
712
713         p += 3;
714
715         p[0] = p[1] = p[2] = p[3] = 0; p+=4;    /* display flags */
716         *p++ = 0;  /* horizontal justification (-1: left, 0 center, 1 right) */
717         *p++ = 1;  /* vertical   justification (-1: top, 0 center, 1 bottom) */
718
719         p[0] = p[1] = p[2] = 0x00; p+=3;/* background rgb */
720         *p++ = 0xff;                    /* background a */
721
722         p[0] = p[1] = 0; p += 2;        /* text box top */
723         p[0] = p[1] = 0; p += 2;        /* text box left */
724         p[0] = p[1] = 0; p += 2;        /* text box bottom */
725         p[0] = p[1] = 0; p += 2;        /* text box right */
726
727         p[0] = p[1] = 0; p += 2;        /* start char */
728         p[0] = p[1] = 0; p += 2;        /* end char */
729         p[0] = p[1] = 0; p += 2;        /* default font id */
730
731         *p++ = 0;                       /* font style flags */
732         *p++ = 12;                      /* font size */
733
734         p[0] = p[1] = p[2] = 0x00; p+=3;/* foreground rgb */
735         *p++ = 0x00;                    /* foreground a */
736
737         p[0] = p[1] = p[2] = 0; p[3] = 22; p += 4;
738         memcpy( p, "ftab", 4 ); p += 4;
739         *p++ = 0; *p++ = 1;             /* entry count */
740         p[0] = p[1] = 0; p += 2;        /* font id */
741         *p++ = 9;                       /* font name length */
742         memcpy( p, "Helvetica", 9 );    /* font name */
743     }
744
745     /* Init pes chain */
746     BufferChainInit( &p_stream->chain_pes );
747     p_stream->i_pes_dts    = 0;
748     p_stream->i_pes_length = 0;
749     p_stream->i_pes_used   = 0;
750     p_stream->b_key_frame  = 0;
751
752     /* We only change PMT version (PAT isn't changed) */
753     p_sys->i_pmt_version_number = ( p_sys->i_pmt_version_number + 1 )%32;
754
755     /* Update pcr_pid */
756     if( p_input->p_fmt->i_cat != SPU_ES &&
757         ( p_sys->i_pcr_pid == 0x1fff || p_input->p_fmt->i_cat == VIDEO_ES ) )
758     {
759         if( p_sys->p_pcr_input )
760         {
761             /* There was already a PCR stream, so clean context */
762             /* FIXME */
763         }
764         p_sys->i_pcr_pid   = p_stream->i_pid;
765         p_sys->p_pcr_input = p_input;
766
767         msg_Dbg( p_mux, "new PCR PID is %d", p_sys->i_pcr_pid );
768     }
769
770     return VLC_SUCCESS;
771 }
772
773 /*****************************************************************************
774  * DelStream: called before a stream deletion
775  *****************************************************************************/
776 static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
777 {
778     sout_mux_sys_t  *p_sys = p_mux->p_sys;
779     ts_stream_t     *p_stream;
780     vlc_value_t     val;
781
782     p_stream = (ts_stream_t*)p_input->p_sys;
783     msg_Dbg( p_mux, "removing input pid=%d", p_stream->i_pid );
784
785     if( p_sys->i_pcr_pid == p_stream->i_pid )
786     {
787         int i;
788
789         /* Find a new pcr stream (Prefer Video Stream) */
790         p_sys->i_pcr_pid = 0x1fff;
791         p_sys->p_pcr_input = NULL;
792         for( i = 0; i < p_mux->i_nb_inputs; i++ )
793         {
794             if( p_mux->pp_inputs[i] == p_input )
795             {
796                 continue;
797             }
798
799             if( p_mux->pp_inputs[i]->p_fmt->i_cat == VIDEO_ES )
800             {
801                 p_sys->i_pcr_pid  =
802                     ((ts_stream_t*)p_mux->pp_inputs[i]->p_sys)->i_pid;
803                 p_sys->p_pcr_input= p_mux->pp_inputs[i];
804                 break;
805             }
806             else if( p_mux->pp_inputs[i]->p_fmt->i_cat != SPU_ES &&
807                      p_sys->i_pcr_pid == 0x1fff )
808             {
809                 p_sys->i_pcr_pid  =
810                     ((ts_stream_t*)p_mux->pp_inputs[i]->p_sys)->i_pid;
811                 p_sys->p_pcr_input= p_mux->pp_inputs[i];
812             }
813         }
814         if( p_sys->p_pcr_input )
815         {
816             /* Empty TS buffer */
817             /* FIXME */
818         }
819         msg_Dbg( p_mux, "new PCR PID is %d", p_sys->i_pcr_pid );
820     }
821
822     /* Empty all data in chain_pes */
823     BufferChainClean( p_mux->p_sout, &p_stream->chain_pes );
824
825     if( p_stream->p_decoder_specific_info )
826     {
827         free( p_stream->p_decoder_specific_info );
828     }
829     if( p_stream->i_stream_id == 0xfa ||
830         p_stream->i_stream_id == 0xfb ||
831         p_stream->i_stream_id == 0xfe )
832     {
833         p_sys->i_mpeg4_streams--;
834     }
835
836     var_Get( p_mux, SOUT_CFG_PREFIX "pid-video", &val );
837     if( val.i_int > 0 )
838     {
839         int i_pid_video = val.i_int;
840         if ( i_pid_video == p_stream->i_pid )
841         {
842             p_sys->i_pid_video = i_pid_video;
843             msg_Dbg( p_mux, "freeing video PID %d", i_pid_video );
844         }
845     }
846     var_Get( p_mux, SOUT_CFG_PREFIX "pid-audio", &val );
847     if( val.i_int > 0 )
848     {
849         int i_pid_audio = val.i_int;
850         if ( i_pid_audio == p_stream->i_pid )
851         {
852             p_sys->i_pid_audio = i_pid_audio;
853             msg_Dbg( p_mux, "freeing audio PID %d", i_pid_audio );
854         }
855     }
856     free( p_stream );
857
858     /* We only change PMT version (PAT isn't changed) */
859     p_sys->i_pmt_version_number++; p_sys->i_pmt_version_number %= 32;
860
861     return VLC_SUCCESS;
862 }
863
864 /*****************************************************************************
865  * Mux: Call each time there is new data for at least one stream
866  *****************************************************************************
867  *
868  *****************************************************************************/
869 static int Mux( sout_mux_t *p_mux )
870 {
871     sout_mux_sys_t  *p_sys = p_mux->p_sys;
872     ts_stream_t     *p_pcr_stream;
873
874     if( p_sys->i_pcr_pid == 0x1fff )
875     {
876         msg_Dbg( p_mux, "waiting for PCR streams" );
877         msleep( 1000 );
878         return VLC_SUCCESS;
879     }
880     p_pcr_stream = (ts_stream_t*)p_sys->p_pcr_input->p_sys;
881
882     for( ;; )
883     {
884         sout_buffer_chain_t chain_ts;
885         int                 i_packet_count;
886         int                 i_packet_pos;
887         mtime_t             i_pcr_dts;
888         mtime_t             i_pcr_length;
889         mtime_t             i_shaping_delay;
890         int i;
891
892         if( p_pcr_stream->b_key_frame )
893         {
894             i_shaping_delay = p_pcr_stream->i_pes_length;
895         }
896         else
897         {
898             i_shaping_delay = p_sys->i_shaping_delay;
899         }
900
901         /* 1: get enough PES packet for all input */
902         for( ;; )
903         {
904             vlc_bool_t b_ok = VLC_TRUE;
905             block_t *p_data;
906
907             /* Accumulate enough data in the pcr stream (>i_shaping_delay) */
908             /* Accumulate enough data in all other stream ( >= length of pcr)*/
909             for( i = 0; i < p_mux->i_nb_inputs; i++ )
910             {
911                 sout_input_t *p_input = p_mux->pp_inputs[i];
912                 ts_stream_t *p_stream = (ts_stream_t*)p_input->p_sys;
913                 int64_t i_spu_length = 0;
914                 int64_t i_spu_dts    = 0;
915
916
917                 if( ( p_stream == p_pcr_stream &&
918                       p_stream->i_pes_length < i_shaping_delay ) ||
919                     p_stream->i_pes_dts + p_stream->i_pes_length <
920                     p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length )
921                 {
922                     /* Need more data */
923                     if( p_input->p_fifo->i_depth <= 50 )
924                     {
925                         if( p_input->p_fmt->i_cat == AUDIO_ES ||
926                             p_input->p_fmt->i_cat == VIDEO_ES )
927                         {
928                             /* We need more data */
929                             return VLC_SUCCESS;
930                         }
931                         else if( p_input->p_fifo->i_depth <= 0 )
932                         {
933                             /* spu, only one packet is needed */
934                             continue;
935                         }
936                     }
937                     b_ok = VLC_FALSE;
938
939                     p_data = block_FifoGet( p_input->p_fifo );
940                     if( p_input->p_fmt->i_codec == VLC_FOURCC('s','u','b','t'))
941                     {
942                         i_spu_length = p_data->i_length;/* save info for SPU */
943                         i_spu_dts    = p_data->i_dts;
944                     }
945                     if( p_input->p_fifo->i_depth > 0 )
946                     {
947                         block_t *p_next = block_FifoShow( p_input->p_fifo );
948
949                         p_data->i_length = p_next->i_dts - p_data->i_dts;
950                     }
951
952                     if( ( p_pcr_stream->i_pes_dts > 0 &&
953                           p_data->i_dts - 2000000 > p_pcr_stream->i_pes_dts +
954                           p_pcr_stream->i_pes_length ) ||
955                         p_data->i_dts < p_stream->i_pes_dts ||
956                         ( p_stream->i_pes_dts > 0 &&
957                           p_input->p_fmt->i_cat != SPU_ES &&
958                           p_data->i_dts - 2000000 > p_stream->i_pes_dts +
959                           p_stream->i_pes_length ) )
960                     {
961                         msg_Warn( p_mux, "packet with too strange dts "
962                                   "(dts="I64Fd",old="I64Fd",pcr="I64Fd")",
963                                   p_data->i_dts, p_stream->i_pes_dts,
964                                   p_pcr_stream->i_pes_dts );
965                         block_Release( p_data );
966
967                         BufferChainClean( p_mux->p_sout,
968                                           &p_stream->chain_pes );
969                         p_stream->i_pes_dts = 0;
970                         p_stream->i_pes_used = 0;
971                         p_stream->i_pes_length = 0;
972
973                         BufferChainClean( p_mux->p_sout,
974                                           &p_pcr_stream->chain_pes );
975                         p_pcr_stream->i_pes_dts = 0;
976                         p_pcr_stream->i_pes_used = 0;
977                         p_pcr_stream->i_pes_length = 0;
978
979                     }
980                     else
981                     {
982                         if( p_input->p_fmt->i_cat == SPU_ES )
983                         {
984                             /* Arbitrary */
985                             p_data->i_length = 1000;
986                             if( p_input->p_fmt->i_codec ==
987                                 VLC_FOURCC('s','u','b','t') )
988                             {
989                                 /* Prepend header */
990                                 p_data = block_Realloc( p_data, 2,
991                                                         p_data->i_buffer );
992                                 p_data->p_buffer[0] =
993                                     ( (p_data->i_buffer - 2) >> 8) & 0xff;
994                                 p_data->p_buffer[1] =
995                                     ( (p_data->i_buffer - 2)     ) & 0xff;
996
997                                 /* remove trailling \0 if any */
998                                 if( p_data->i_buffer > 2 &&
999                                     p_data->p_buffer[p_data->i_buffer -1] ==
1000                                     '\0' )
1001                                     p_data->i_buffer--;
1002                             }
1003                         }
1004                         else if( p_data->i_length < 0 ||
1005                                  p_data->i_length > 2000000 )
1006                         {
1007                             /* FIXME choose a better value, but anyway we
1008                              * should never have to do that */
1009                             p_data->i_length = 1000;
1010                         }
1011
1012                         p_stream->i_pes_length += p_data->i_length;
1013                         if( p_stream->i_pes_dts == 0 )
1014                         {
1015                             p_stream->i_pes_dts = p_data->i_dts;
1016                         }
1017
1018                         /* Convert to pes */
1019                         if( p_stream->i_stream_id == 0xa0 &&
1020                             p_data->i_pts <= 0 )
1021                         {
1022                             /* XXX yes I know, it's awfull, but it's needed,
1023                              * so don't remove it ... */
1024                             p_data->i_pts = p_data->i_dts;
1025                         }
1026                         E_( EStoPES )( p_mux->p_sout, &p_data, p_data,
1027                                        p_stream->i_stream_id, 1 );
1028
1029                         BufferChainAppend( &p_stream->chain_pes, p_data );
1030
1031                         if( p_sys->b_use_key_frames && p_stream == p_pcr_stream
1032                             && (p_data->i_flags & BLOCK_FLAG_TYPE_I )
1033                             && (p_stream->i_pes_length > 300000) )
1034                         {
1035                             i_shaping_delay = p_stream->i_pes_length;
1036                             p_stream->b_key_frame = 1;
1037                         }
1038
1039                         /* Append a empty sub (sub text only) */
1040                         if( i_spu_length > 0 )
1041                         {
1042                             block_t *p_spu = block_New( p_mux, 3 );
1043
1044                             p_spu->i_dts = p_spu->i_pts = i_spu_dts +
1045                                 i_spu_length;
1046                             p_spu->i_length = 1000;
1047
1048                             p_spu->p_buffer[0] = 0;
1049                             p_spu->p_buffer[1] = 1;
1050                             p_spu->p_buffer[2] = ' ';
1051
1052                             p_stream->i_pes_length += p_spu->i_length;
1053                             E_( EStoPES )( p_mux->p_sout, &p_spu, p_spu,
1054                                            p_stream->i_stream_id, 1 );
1055                             BufferChainAppend( &p_stream->chain_pes, p_spu );
1056                         }
1057                     }
1058                 }
1059             }
1060
1061             if( b_ok )
1062             {
1063                 break;
1064             }
1065         }
1066
1067         /* save */
1068         i_pcr_dts      = p_pcr_stream->i_pes_dts;
1069         i_pcr_length   = p_pcr_stream->i_pes_length;
1070         p_pcr_stream->b_key_frame = 0;
1071
1072         /* msg_Dbg( p_mux, "starting muxing %lldms", i_pcr_length / 1000 ); */
1073         /* 2: calculate non accurate total size of muxed ts */
1074         i_packet_count = 0;
1075         for( i = 0; i < p_mux->i_nb_inputs; i++ )
1076         {
1077             ts_stream_t *p_stream = (ts_stream_t*)p_mux->pp_inputs[i]->p_sys;
1078             block_t *p_pes;
1079
1080             /* False for pcr stream but it will be enough to do PCR algo */
1081             for( p_pes = p_stream->chain_pes.p_first; p_pes != NULL;
1082                  p_pes = p_pes->p_next )
1083             {
1084                 int i_size = p_pes->i_buffer;
1085                 if( p_pes->i_dts + p_pes->i_length >
1086                     p_pcr_stream->i_pes_dts + p_pcr_stream->i_pes_length )
1087                 {
1088                     mtime_t i_frag = p_pcr_stream->i_pes_dts +
1089                         p_pcr_stream->i_pes_length - p_pes->i_dts;
1090                     if( i_frag < 0 )
1091                     {
1092                         /* Next stream */
1093                         break;
1094                     }
1095                     i_size = p_pes->i_buffer * i_frag / p_pes->i_length;
1096                 }
1097                 i_packet_count += ( i_size + 183 ) / 184;
1098             }
1099         }
1100         /* add overhead for PCR (not really exact) */
1101         i_packet_count += (8 * i_pcr_length / p_sys->i_pcr_delay + 175) / 176;
1102
1103
1104         /* 3: mux PES into TS */
1105         BufferChainInit( &chain_ts );
1106         /* append PAT/PMT  -> FIXME with big pcr delay it won't have enough pat/pmt */
1107         GetPAT( p_mux, &chain_ts);
1108         GetPMT( p_mux, &chain_ts );
1109         i_packet_pos = 0;
1110         i_packet_count += chain_ts.i_depth;
1111         /* msg_Dbg( p_mux, "estimated pck=%d", i_packet_count ); */
1112
1113         for( ;; )
1114         {
1115             int         i_stream;
1116             mtime_t     i_dts;
1117             ts_stream_t *p_stream;
1118             sout_input_t *p_input;
1119             block_t *p_ts;
1120             vlc_bool_t   b_pcr;
1121
1122             /* Select stream (lowest dts) */
1123             for( i = 0, i_stream = -1, i_dts = 0; i < p_mux->i_nb_inputs; i++ )
1124             {
1125                 p_input = p_mux->pp_inputs[i];
1126                 p_stream = (ts_stream_t*)p_mux->pp_inputs[i]->p_sys;
1127
1128                 if( p_stream->i_pes_dts == 0 )
1129                 {
1130                     continue;
1131                 }
1132
1133                 if( i_stream == -1 ||
1134                     p_stream->i_pes_dts < i_dts )
1135                 {
1136                     i_stream = i;
1137                     i_dts = p_stream->i_pes_dts;
1138                 }
1139             }
1140             if( i_stream == -1 || i_dts > i_pcr_dts + i_pcr_length )
1141             {
1142                 break;
1143             }
1144             p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys;
1145
1146             /* do we need to issue pcr */
1147             b_pcr = VLC_FALSE;
1148             if( p_stream == p_pcr_stream &&
1149                 i_pcr_dts + i_packet_pos * i_pcr_length / i_packet_count >=
1150                 p_sys->i_pcr + p_sys->i_pcr_delay )
1151             {
1152                 b_pcr = VLC_TRUE;
1153                 p_sys->i_pcr = i_pcr_dts + i_packet_pos *
1154                     i_pcr_length / i_packet_count;
1155             }
1156
1157             /* Build the TS packet */
1158             p_ts = TSNew( p_mux, p_stream, b_pcr );
1159             if( p_sys->csa != NULL &&
1160                  (p_input->p_fmt->i_cat != AUDIO_ES || p_sys->b_crypt_audio) )
1161             {
1162                 p_ts->i_flags |= SOUT_BUFFER_FLAGS_PRIVATE_CSA;
1163             }
1164             i_packet_pos++;
1165
1166             /* */
1167             BufferChainAppend( &chain_ts, p_ts );
1168         }
1169
1170         /* 4: date and send */
1171         TSSchedule( p_mux, &chain_ts, i_pcr_length, i_pcr_dts );
1172     }
1173 }
1174
1175 static void TSSchedule( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts,
1176                         mtime_t i_pcr_length, mtime_t i_pcr_dts )
1177 {
1178     sout_mux_sys_t  *p_sys = p_mux->p_sys;
1179     sout_buffer_chain_t new_chain;
1180     int i_packet_count = p_chain_ts->i_depth;
1181     int i;
1182
1183     BufferChainInit( &new_chain );
1184
1185     if ( i_pcr_length <= 0 )
1186     {
1187         i_pcr_length = i_packet_count;
1188     }
1189
1190     for( i = 0; i < i_packet_count; i++ )
1191     {
1192         block_t *p_ts = BufferChainGet( p_chain_ts );
1193         mtime_t i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count;
1194
1195         BufferChainAppend( &new_chain, p_ts );
1196
1197         if( p_ts->i_dts &&
1198             p_ts->i_dts + p_sys->i_dts_delay * 2/3 < i_new_dts )
1199         {
1200             mtime_t i_max_diff = i_new_dts - p_ts->i_dts;
1201             mtime_t i_cut_dts = p_ts->i_dts;
1202
1203             p_ts = BufferChainPeek( p_chain_ts );
1204             i++;
1205             i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count;
1206             while ( p_ts != NULL && i_new_dts - p_ts->i_dts >= i_max_diff )
1207             {
1208                 p_ts = BufferChainGet( p_chain_ts );
1209                 i_max_diff = i_new_dts - p_ts->i_dts;
1210                 i_cut_dts = p_ts->i_dts;
1211                 BufferChainAppend( &new_chain, p_ts );
1212
1213                 p_ts = BufferChainPeek( p_chain_ts );
1214                 i++;
1215                 i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count;
1216             }
1217             msg_Dbg( p_mux, "adjusting rate at "I64Fd"/"I64Fd" (%d/%d)",
1218                      i_cut_dts - i_pcr_dts, i_pcr_length, new_chain.i_depth,
1219                      p_chain_ts->i_depth );
1220             if ( new_chain.i_depth )
1221                 TSDate( p_mux, &new_chain,
1222                         i_cut_dts - i_pcr_dts,
1223                         i_pcr_dts );
1224             if ( p_chain_ts->i_depth )
1225                 TSSchedule( p_mux,
1226                             p_chain_ts, i_pcr_dts + i_pcr_length - i_cut_dts,
1227                             i_cut_dts );
1228             return;
1229         }
1230     }
1231
1232     if ( new_chain.i_depth )
1233         TSDate( p_mux, &new_chain, i_pcr_length, i_pcr_dts );
1234 }
1235
1236 static void TSDate( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts,
1237                     mtime_t i_pcr_length, mtime_t i_pcr_dts )
1238 {
1239     sout_mux_sys_t  *p_sys = p_mux->p_sys;
1240     int i_packet_count = p_chain_ts->i_depth;
1241     int i;
1242
1243     if ( i_pcr_length / 1000 > 0 )
1244     {
1245         int i_bitrate = ((uint64_t)i_packet_count * 188 * 8000)
1246                           / (uint64_t)(i_pcr_length / 1000);
1247         if ( p_sys->i_bitrate_max && p_sys->i_bitrate_max < i_bitrate )
1248         {
1249             msg_Warn( p_mux, "max bitrate exceeded at "I64Fd
1250                       " (%d bi/s for %d pkt in "I64Fd" us)",
1251                       i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(),
1252                       i_bitrate, i_packet_count, i_pcr_length);
1253         }
1254 #if 0
1255         else
1256         {
1257             msg_Dbg( p_mux, "starting at "I64Fd
1258                      " (%d bi/s for %d packets in "I64Fd" us)",
1259                      i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(),
1260                      i_bitrate, i_packet_count, i_pcr_length);
1261         }
1262 #endif
1263     }
1264     else
1265     {
1266         /* This shouldn't happen, but happens in some rare heavy load
1267          * and packet losses conditions. */
1268         i_pcr_length = i_packet_count;
1269     }
1270
1271     /* msg_Dbg( p_mux, "real pck=%d", i_packet_count ); */
1272     for( i = 0; i < i_packet_count; i++ )
1273     {
1274         block_t *p_ts = BufferChainGet( p_chain_ts );
1275         mtime_t i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count;
1276
1277         p_ts->i_dts    = i_new_dts;
1278         p_ts->i_length = i_pcr_length / i_packet_count;
1279
1280         if( p_ts->i_flags & SOUT_BUFFER_FLAGS_PRIVATE_PCR )
1281         {
1282             /* msg_Dbg( p_mux, "pcr=%lld ms", p_ts->i_dts / 1000 ); */
1283             TSSetPCR( p_ts, p_ts->i_dts - p_sys->i_dts_delay );
1284         }
1285         if( p_ts->i_flags & SOUT_BUFFER_FLAGS_PRIVATE_CSA )
1286         {
1287             csa_Encrypt( p_sys->csa, p_ts->p_buffer, 0 );
1288         }
1289
1290         /* latency */
1291         p_ts->i_dts += p_sys->i_shaping_delay * 3 / 2;
1292
1293         sout_AccessOutWrite( p_mux->p_access, p_ts );
1294     }
1295 }
1296
1297 static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream,
1298                        vlc_bool_t b_pcr )
1299 {
1300     block_t *p_pes = p_stream->chain_pes.p_first;
1301     block_t *p_ts;
1302
1303     vlc_bool_t b_new_pes = VLC_FALSE;
1304     vlc_bool_t b_adaptation_field = VLC_FALSE;
1305
1306     int        i_payload_max = 184 - ( b_pcr ? 8 : 0 );
1307     int        i_payload;
1308
1309     if( p_stream->i_pes_used <= 0 )
1310     {
1311         b_new_pes = VLC_TRUE;
1312     }
1313     i_payload = __MIN( (int)p_pes->i_buffer - p_stream->i_pes_used,
1314                        i_payload_max );
1315
1316     if( b_pcr || i_payload < i_payload_max )
1317     {
1318         b_adaptation_field = VLC_TRUE;
1319     }
1320
1321     p_ts = block_New( p_mux, 188 );
1322     p_ts->i_dts = p_pes->i_dts;
1323
1324     p_ts->p_buffer[0] = 0x47;
1325     p_ts->p_buffer[1] = ( b_new_pes ? 0x40 : 0x00 ) |
1326         ( ( p_stream->i_pid >> 8 )&0x1f );
1327     p_ts->p_buffer[2] = p_stream->i_pid & 0xff;
1328     p_ts->p_buffer[3] = ( b_adaptation_field ? 0x30 : 0x10 ) |
1329         p_stream->i_continuity_counter;
1330
1331     p_stream->i_continuity_counter = (p_stream->i_continuity_counter+1)%16;
1332
1333     if( b_adaptation_field )
1334     {
1335         int i;
1336
1337         if( b_pcr )
1338         {
1339             int     i_stuffing = i_payload_max - i_payload;
1340
1341             p_ts->i_flags |= SOUT_BUFFER_FLAGS_PRIVATE_PCR;
1342
1343             p_ts->p_buffer[4] = 7 + i_stuffing;
1344             p_ts->p_buffer[5] = 0x10;   /* flags */
1345             p_ts->p_buffer[6] = ( 0 )&0xff;
1346             p_ts->p_buffer[7] = ( 0 )&0xff;
1347             p_ts->p_buffer[8] = ( 0 )&0xff;
1348             p_ts->p_buffer[9] = ( 0 )&0xff;
1349             p_ts->p_buffer[10]= ( 0 )&0x80;
1350             p_ts->p_buffer[11]= 0;
1351
1352             for( i = 12; i < 12 + i_stuffing; i++ )
1353             {
1354                 p_ts->p_buffer[i] = 0xff;
1355             }
1356         }
1357         else
1358         {
1359             int i_stuffing = i_payload_max - i_payload;
1360
1361             p_ts->p_buffer[4] = i_stuffing - 1;
1362             if( i_stuffing > 1 )
1363             {
1364                 p_ts->p_buffer[5] = 0x00;
1365                 for( i = 6; i < 6 + i_stuffing - 2; i++ )
1366                 {
1367                     p_ts->p_buffer[i] = 0xff;
1368                 }
1369             }
1370         }
1371     }
1372
1373     /* copy payload */
1374     memcpy( &p_ts->p_buffer[188 - i_payload],
1375             &p_pes->p_buffer[p_stream->i_pes_used], i_payload );
1376
1377     p_stream->i_pes_used += i_payload;
1378     p_stream->i_pes_dts = p_pes->i_dts + p_pes->i_length *
1379         p_stream->i_pes_used / p_pes->i_buffer;
1380     p_stream->i_pes_length -= p_pes->i_length * i_payload / p_pes->i_buffer;
1381
1382     if( p_stream->i_pes_used >= (int)p_pes->i_buffer )
1383     {
1384         p_pes = BufferChainGet( &p_stream->chain_pes );
1385         block_Release( p_pes );
1386
1387         p_pes = p_stream->chain_pes.p_first;
1388         if( p_pes )
1389         {
1390             p_stream->i_pes_dts    = p_pes->i_dts;
1391             p_stream->i_pes_length = 0;
1392             while( p_pes )
1393             {
1394                 p_stream->i_pes_length += p_pes->i_length;
1395
1396                 p_pes = p_pes->p_next;
1397             }
1398         }
1399         else
1400         {
1401             p_stream->i_pes_dts = 0;
1402             p_stream->i_pes_length = 0;
1403         }
1404         p_stream->i_pes_used = 0;
1405     }
1406
1407     return p_ts;
1408 }
1409
1410
1411 static void TSSetPCR( block_t *p_ts, mtime_t i_dts )
1412 {
1413     mtime_t i_pcr = 9 * i_dts / 100;
1414
1415     p_ts->p_buffer[6]  = ( i_pcr >> 25 )&0xff;
1416     p_ts->p_buffer[7]  = ( i_pcr >> 17 )&0xff;
1417     p_ts->p_buffer[8]  = ( i_pcr >> 9  )&0xff;
1418     p_ts->p_buffer[9]  = ( i_pcr >> 1  )&0xff;
1419     p_ts->p_buffer[10]|= ( i_pcr << 7  )&0x80;
1420 }
1421
1422 #if 0
1423 static void TSSetConstraints( sout_mux_t *p_mux, sout_buffer_chain_t *c,
1424                               mtime_t i_length, int i_bitrate_min,
1425                               int i_bitrate_max )
1426 {
1427     sout_mux_sys_t  *p_sys = p_mux->p_sys;
1428     sout_buffer_chain_t s = *c;
1429
1430     int i_packets = 0;
1431     int i_packets_min = 0;
1432     int i_packets_max = 0;
1433
1434     if( i_length <= 0 )
1435     {
1436         return;
1437     }
1438
1439     i_packets     = c->i_depth;
1440     i_packets_min = ( (int64_t)i_bitrate_min * i_length / 8 / 1000000  + 187 ) / 188;
1441     i_packets_max = ( (int64_t)i_bitrate_max * i_length / 8 / 1000000  + 187 ) / 188;
1442
1443     if( i_packets < i_packets_min && i_packets_min > 0 )
1444     {
1445         block_t *p_pk;
1446         int i_div = ( i_packets_min - i_packets ) / i_packets;
1447         int i_mod = ( i_packets_min - i_packets ) % i_packets;
1448         int i_rest = 0;
1449
1450         /* We need to pad with null packets (pid=0x1fff)
1451          * We try to melt null packets with true packets */
1452         msg_Dbg( p_mux,
1453                  "packets=%d but min=%d -> adding %d packets of padding",
1454                  i_packets, i_packets_min, i_packets_min - i_packets );
1455
1456         BufferChainInit( c );
1457         while( ( p_pk = BufferChainGet( &s ) ) )
1458         {
1459             int i, i_null;
1460
1461             BufferChainAppend( c, p_pk );
1462
1463             i_null = i_div + ( i_rest + i_mod ) / i_packets;
1464
1465             for( i = 0; i < i_null; i++ )
1466             {
1467                 block_t *p_null;
1468
1469                 p_null = sout_BufferNew( p_mux->p_sout, 188 );
1470                 p_null->p_buffer[0] = 0x47;
1471                 p_null->p_buffer[1] = 0x1f;
1472                 p_null->p_buffer[2] = 0xff;
1473                 p_null->p_buffer[3] = 0x10 | p_sys->i_null_continuity_counter;
1474                 memset( &p_null->p_buffer[4], 0, 184 );
1475                 p_sys->i_null_continuity_counter =
1476                     ( p_sys->i_null_continuity_counter + 1 ) % 16;
1477
1478                 BufferChainAppend( c, p_null );
1479             }
1480
1481             i_rest = ( i_rest + i_mod ) % i_packets;
1482         }
1483     }
1484     else if( i_packets > i_packets_max && i_packets_max > 0 )
1485     {
1486         block_t *p_pk;
1487         int           i;
1488
1489         /* Arg, we need to drop packets, I don't do something clever (like
1490          * dropping complete pid, b frames, ... ), I just get the right amount
1491          * of packets and discard the others */
1492         msg_Warn( p_mux,
1493                   "packets=%d but max=%d -> removing %d packets -> stream broken",
1494                   i_packets, i_packets_max, i_packets - i_packets_max );
1495
1496         BufferChainInit( c );
1497         for( i = 0; i < i_packets_max; i++ )
1498         {
1499             BufferChainAppend( c, BufferChainGet( &s ) );
1500         }
1501
1502         while( ( p_pk = BufferChainGet( &s ) ) )
1503         {
1504             sout_BufferDelete( p_mux->p_sout, p_pk );
1505         }
1506     }
1507 }
1508 #endif
1509
1510 static void PEStoTS( sout_instance_t *p_sout,
1511                      sout_buffer_chain_t *c, block_t *p_pes,
1512                      ts_stream_t *p_stream )
1513 {
1514     uint8_t *p_data;
1515     int     i_size;
1516     int     b_new_pes;
1517
1518     /* get PES total size */
1519     i_size = p_pes->i_buffer;
1520     p_data = p_pes->p_buffer;
1521
1522     b_new_pes = VLC_TRUE;
1523
1524     for( ;; )
1525     {
1526         int           b_adaptation_field;
1527         int           i_copy;
1528         block_t *p_ts;
1529
1530         p_ts = block_New( p_sout, 188 );
1531         /* write header
1532          * 8b   0x47    sync byte
1533          * 1b           transport_error_indicator
1534          * 1b           payload_unit_start
1535          * 1b           transport_priority
1536          * 13b          pid
1537          * 2b           transport_scrambling_control
1538          * 2b           if adaptation_field 0x03 else 0x01
1539          * 4b           continuity_counter
1540          */
1541
1542         i_copy    = __MIN( i_size, 184 );
1543         b_adaptation_field = i_size < 184 ? VLC_TRUE : VLC_FALSE;
1544
1545         p_ts->p_buffer[0] = 0x47;
1546         p_ts->p_buffer[1] = ( b_new_pes ? 0x40 : 0x00 )|
1547                             ( ( p_stream->i_pid >> 8 )&0x1f );
1548         p_ts->p_buffer[2] = p_stream->i_pid & 0xff;
1549         p_ts->p_buffer[3] = ( b_adaptation_field ? 0x30 : 0x10 )|
1550                             p_stream->i_continuity_counter;
1551
1552         b_new_pes = VLC_FALSE;
1553         p_stream->i_continuity_counter = (p_stream->i_continuity_counter+1)%16;
1554
1555         if( b_adaptation_field )
1556         {
1557             int i_stuffing = 184 - i_copy;
1558             int i;
1559
1560             p_ts->p_buffer[4] = i_stuffing - 1;
1561             if( i_stuffing > 1 )
1562             {
1563                 p_ts->p_buffer[5] = 0x00;
1564                 for( i = 6; i < 6 + i_stuffing - 2; i++ )
1565                 {
1566                     p_ts->p_buffer[i] = 0xff;
1567                 }
1568             }
1569         }
1570         /* copy payload */
1571         memcpy( &p_ts->p_buffer[188 - i_copy], p_data, i_copy );
1572         p_data += i_copy;
1573         i_size -= i_copy;
1574
1575         BufferChainAppend( c, p_ts );
1576
1577         if( i_size <= 0 )
1578         {
1579             block_t *p_next = p_pes->p_next;
1580
1581             p_pes->p_next = NULL;
1582             block_Release( p_pes );
1583             if( p_next == NULL )
1584             {
1585                 break;
1586             }
1587             b_new_pes = VLC_TRUE;
1588             p_pes = p_next;
1589             i_size = p_pes->i_buffer;
1590             p_data = p_pes->p_buffer;
1591         }
1592     }
1593
1594     return;
1595 }
1596
1597 static block_t *WritePSISection( sout_instance_t *p_sout,
1598                                        dvbpsi_psi_section_t* p_section )
1599 {
1600     block_t   *p_psi, *p_first = NULL;
1601
1602
1603     while( p_section )
1604     {
1605         int             i_size;
1606
1607         i_size =  (uint32_t)( p_section->p_payload_end - p_section->p_data )+
1608                   ( p_section->b_syntax_indicator ? 4 : 0 );
1609
1610         p_psi = block_New( p_sout, i_size + 1 );
1611         p_psi->i_pts = 0;
1612         p_psi->i_dts = 0;
1613         p_psi->i_length = 0;
1614         p_psi->i_buffer = i_size + 1;
1615
1616         p_psi->p_buffer[0] = 0; // pointer
1617         memcpy( p_psi->p_buffer + 1,
1618                 p_section->p_data,
1619                 i_size );
1620
1621         block_ChainAppend( &p_first, p_psi );
1622
1623         p_section = p_section->p_next;
1624     }
1625
1626     return( p_first );
1627 }
1628
1629 static void GetPAT( sout_mux_t *p_mux,
1630                     sout_buffer_chain_t *c )
1631 {
1632     sout_mux_sys_t       *p_sys = p_mux->p_sys;
1633     block_t        *p_pat;
1634     dvbpsi_pat_t         pat;
1635     dvbpsi_psi_section_t *p_section;
1636
1637     dvbpsi_InitPAT( &pat,
1638                     0x01,    // i_ts_id
1639                     p_sys->i_pat_version_number,
1640                     1 );      // b_current_next
1641     /* add all program (only one) */
1642     dvbpsi_PATAddProgram( &pat,
1643                           1,                    // i_number
1644                           p_sys->pmt.i_pid );   // i_pid
1645
1646     p_section = dvbpsi_GenPATSections( &pat,
1647                                        0 );     // max program per section
1648
1649     p_pat = WritePSISection( p_mux->p_sout, p_section );
1650
1651     PEStoTS( p_mux->p_sout, c, p_pat, &p_sys->pat );
1652
1653     dvbpsi_DeletePSISections( p_section );
1654     dvbpsi_EmptyPAT( &pat );
1655 }
1656
1657 static uint32_t GetDescriptorLength24b( int i_length )
1658 {
1659     uint32_t i_l1, i_l2, i_l3;
1660
1661     i_l1 = i_length&0x7f;
1662     i_l2 = ( i_length >> 7 )&0x7f;
1663     i_l3 = ( i_length >> 14 )&0x7f;
1664
1665     return( 0x808000 | ( i_l3 << 16 ) | ( i_l2 << 8 ) | i_l1 );
1666 }
1667
1668 static void GetPMT( sout_mux_t *p_mux,
1669                     sout_buffer_chain_t *c )
1670 {
1671     sout_mux_sys_t  *p_sys = p_mux->p_sys;
1672     block_t   *p_pmt;
1673
1674     dvbpsi_pmt_t        pmt;
1675     dvbpsi_pmt_es_t     *p_es;
1676     dvbpsi_psi_section_t *p_section;
1677
1678     int                 i_stream;
1679
1680     dvbpsi_InitPMT( &pmt,
1681                     0x01,   // program number
1682                     p_sys->i_pmt_version_number,
1683                     1,      // b_current_next
1684                     p_sys->i_pcr_pid );
1685
1686     if( p_sys->i_mpeg4_streams > 0 )
1687     {
1688         uint8_t iod[4096];
1689         bits_buffer_t bits;
1690         bits_buffer_t bits_fix_IOD;
1691
1692         /* Make valgrind happy : it works at byte level not bit one so
1693          * bit_write confuse it (but DON'T CHANGE the way that bit_write is
1694          * working (needed when fixing some bits) */
1695         memset( iod, 0, 4096 );
1696
1697         bits_initwrite( &bits, 4096, iod );
1698         // IOD_label
1699         bits_write( &bits, 8,   0x01 );
1700         // InitialObjectDescriptor
1701         bits_align( &bits );
1702         bits_write( &bits, 8,   0x02 );     // tag
1703         bits_fix_IOD = bits;    // save states to fix length later
1704         bits_write( &bits, 24,
1705             GetDescriptorLength24b( 0 ) ); // variable length (fixed later)
1706         bits_write( &bits, 10,  0x01 );     // ObjectDescriptorID
1707         bits_write( &bits, 1,   0x00 );     // URL Flag
1708         bits_write( &bits, 1,   0x00 );     // includeInlineProfileLevelFlag
1709         bits_write( &bits, 4,   0x0f );     // reserved
1710         bits_write( &bits, 8,   0xff );     // ODProfile (no ODcapability )
1711         bits_write( &bits, 8,   0xff );     // sceneProfile
1712         bits_write( &bits, 8,   0xfe );     // audioProfile (unspecified)
1713         bits_write( &bits, 8,   0xfe );     // visualProfile( // )
1714         bits_write( &bits, 8,   0xff );     // graphicProfile (no )
1715         for( i_stream = 0; i_stream < p_mux->i_nb_inputs; i_stream++ )
1716         {
1717             ts_stream_t *p_stream;
1718             p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys;
1719
1720             if( p_stream->i_stream_id == 0xfa ||
1721                 p_stream->i_stream_id == 0xfb ||
1722                 p_stream->i_stream_id == 0xfe )
1723             {
1724                 bits_buffer_t bits_fix_ESDescr, bits_fix_Decoder;
1725                 /* ES descriptor */
1726                 bits_align( &bits );
1727                 bits_write( &bits, 8,   0x03 );     // ES_DescrTag
1728                 bits_fix_ESDescr = bits;
1729                 bits_write( &bits, 24,
1730                             GetDescriptorLength24b( 0 ) ); // variable size
1731                 bits_write( &bits, 16,  p_stream->i_es_id );
1732                 bits_write( &bits, 1,   0x00 );     // streamDependency
1733                 bits_write( &bits, 1,   0x00 );     // URL Flag
1734                 bits_write( &bits, 1,   0x00 );     // OCRStreamFlag
1735                 bits_write( &bits, 5,   0x1f );     // streamPriority
1736
1737                 // DecoderConfigDesciptor
1738                 bits_align( &bits );
1739                 bits_write( &bits, 8,   0x04 ); // DecoderConfigDescrTag
1740                 bits_fix_Decoder = bits;
1741                 bits_write( &bits, 24,  GetDescriptorLength24b( 0 ) );
1742                 if( p_stream->i_stream_type == 0x10 )
1743                 {
1744                     bits_write( &bits, 8, 0x20 );   // Visual 14496-2
1745                     bits_write( &bits, 6, 0x04 );   // VisualStream
1746                 }
1747                 else if( p_stream->i_stream_type == 0x11 )
1748                 {
1749                     bits_write( &bits, 8, 0x40 );   // Audio 14496-3
1750                     bits_write( &bits, 6, 0x05 );   // AudioStream
1751                 }
1752                 else if( p_stream->i_stream_type == 0x12 &&
1753                          p_stream->i_codec == VLC_FOURCC('s','u','b','t') )
1754                 {
1755                     bits_write( &bits, 8, 0x0B );   // Text Stream
1756                     bits_write( &bits, 6, 0x04 );   // VisualStream
1757                 }
1758                 else
1759                 {
1760                     bits_write( &bits, 8, 0x00 );
1761                     bits_write( &bits, 6, 0x00 );
1762
1763                     msg_Err( p_mux->p_sout,"Unsupported stream_type => "
1764                              "broken IOD" );
1765                 }
1766                 bits_write( &bits, 1,   0x00 );     // UpStream
1767                 bits_write( &bits, 1,   0x01 );     // reserved
1768                 bits_write( &bits, 24,  1024 * 1024 );  // bufferSizeDB
1769                 bits_write( &bits, 32,  0x7fffffff );   // maxBitrate
1770                 bits_write( &bits, 32,  0 );            // avgBitrate
1771
1772                 if( p_stream->i_decoder_specific_info > 0 )
1773                 {
1774                     int i;
1775                     // DecoderSpecificInfo
1776                     bits_align( &bits );
1777                     bits_write( &bits, 8,   0x05 ); // tag
1778                     bits_write( &bits, 24, GetDescriptorLength24b(
1779                                 p_stream->i_decoder_specific_info ) );
1780                     for( i = 0; i < p_stream->i_decoder_specific_info; i++ )
1781                     {
1782                         bits_write( &bits, 8,
1783                             ((uint8_t*)p_stream->p_decoder_specific_info)[i] );
1784                     }
1785                 }
1786                 /* fix Decoder length */
1787                 bits_write( &bits_fix_Decoder, 24,
1788                             GetDescriptorLength24b( bits.i_data -
1789                             bits_fix_Decoder.i_data - 3 ) );
1790
1791                 /* SLConfigDescriptor : predifined (0x01) */
1792                 bits_align( &bits );
1793                 bits_write( &bits, 8,   0x06 ); // tag
1794                 bits_write( &bits, 24,  GetDescriptorLength24b( 8 ) );
1795                 bits_write( &bits, 8,   0x01 ); // predefined
1796                 bits_write( &bits, 1,   0 );   // durationFlag
1797                 bits_write( &bits, 32,  0 );   // OCRResolution
1798                 bits_write( &bits, 8,   0 );   // OCRLength
1799                 bits_write( &bits, 8,   0 );   // InstantBitrateLength
1800                 bits_align( &bits );
1801
1802                 /* fix ESDescr length */
1803                 bits_write( &bits_fix_ESDescr, 24,
1804                             GetDescriptorLength24b( bits.i_data -
1805                             bits_fix_ESDescr.i_data - 3 ) );
1806             }
1807         }
1808         bits_align( &bits );
1809         /* fix IOD length */
1810         bits_write( &bits_fix_IOD, 24,
1811                     GetDescriptorLength24b( bits.i_data -
1812                                             bits_fix_IOD.i_data - 3 ) );
1813         dvbpsi_PMTAddDescriptor( &pmt, 0x1d, bits.i_data, bits.p_data );
1814     }
1815
1816     for( i_stream = 0; i_stream < p_mux->i_nb_inputs; i_stream++ )
1817     {
1818         ts_stream_t *p_stream;
1819
1820         p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys;
1821
1822         p_es = dvbpsi_PMTAddES( &pmt, p_stream->i_stream_type,
1823                                 p_stream->i_pid );
1824         if( p_stream->i_stream_id == 0xfa || p_stream->i_stream_id == 0xfb )
1825         {
1826             uint8_t     es_id[2];
1827
1828             /* SL descriptor */
1829             es_id[0] = (p_stream->i_es_id >> 8)&0xff;
1830             es_id[1] = (p_stream->i_es_id)&0xff;
1831             dvbpsi_PMTESAddDescriptor( p_es, 0x1f, 2, es_id );
1832         }
1833         else if( p_stream->i_stream_type == 0xa0 )
1834         {
1835             uint8_t data[512];
1836             int i_extra = __MIN( p_stream->i_decoder_specific_info, 502 );
1837
1838             /* private DIV3 descripor */
1839             memcpy( &data[0], &p_stream->i_bih_codec, 4 );
1840             data[4] = ( p_stream->i_bih_width >> 8 )&0xff;
1841             data[5] = ( p_stream->i_bih_width      )&0xff;
1842             data[6] = ( p_stream->i_bih_height>> 8 )&0xff;
1843             data[7] = ( p_stream->i_bih_height     )&0xff;
1844             data[8] = ( i_extra >> 8 )&0xff;
1845             data[9] = ( i_extra      )&0xff;
1846             if( i_extra > 0 )
1847             {
1848                 memcpy( &data[10], p_stream->p_decoder_specific_info, i_extra );
1849             }
1850
1851             /* 0xa0 is private */
1852             dvbpsi_PMTESAddDescriptor( p_es, 0xa0, i_extra + 10, data );
1853         }
1854         else if( p_stream->i_stream_type == 0x81 )
1855         {
1856             uint8_t format[4] = { 0x41, 0x43, 0x2d, 0x33 };
1857
1858             /* "registration" descriptor : "AC-3" */
1859             dvbpsi_PMTESAddDescriptor( p_es, 0x05, 4, format );
1860         }
1861         else if( p_stream->i_codec == VLC_FOURCC('d','t','s',' ') )
1862         {
1863             /* DTS registration descriptor (ETSI TS 101 154 Annex F) */
1864
1865             /* DTS format identifier, frame size 1024 - FIXME */
1866             uint8_t data[4] = { 0x44, 0x54, 0x53, 0x32 };
1867             dvbpsi_PMTESAddDescriptor( p_es, 0x05, 4, data );
1868         }
1869 #ifdef _DVBPSI_DR_59_H_
1870         else if( p_stream->i_codec == VLC_FOURCC('d','v','b','s') )
1871         {
1872             /* DVB subtitles */
1873             dvbpsi_subtitling_dr_t descr;
1874             dvbpsi_subtitle_t sub;
1875             dvbpsi_descriptor_t *p_descr;
1876
1877             memcpy( sub.i_iso6392_language_code, p_stream->lang, 3 );
1878             sub.i_subtitling_type = 0;
1879             sub.i_composition_page_id = p_stream->i_es_id & 0xFF;
1880             sub.i_ancillary_page_id = p_stream->i_es_id >> 16;
1881
1882             descr.i_subtitles_number = 1;
1883             descr.p_subtitle[0] = sub;
1884
1885             p_descr = dvbpsi_GenSubtitlingDr( &descr, 0 );
1886             /* Work around bug in old libdvbpsi */ p_descr->i_length = 8;
1887             dvbpsi_PMTESAddDescriptor( p_es, p_descr->i_tag,
1888                                        p_descr->i_length, p_descr->p_data );
1889             continue;
1890         }
1891 #endif /* _DVBPSI_DR_59_H_ */
1892
1893         if( p_stream->lang[0] != 0 )
1894         {
1895             uint8_t data[4];
1896
1897             /* I construct the content myself, way faster than looking at
1898              * over complicated/mind broken libdvbpsi way */
1899             data[0] = p_stream->lang[0];
1900             data[1] = p_stream->lang[1];
1901             data[2] = p_stream->lang[2];
1902             data[3] = 0x00; /* audio type: 0x00 undefined */
1903
1904             dvbpsi_PMTESAddDescriptor( p_es, 0x0a, 4, data );
1905         }
1906     }
1907
1908     p_section = dvbpsi_GenPMTSections( &pmt );
1909
1910     p_pmt = WritePSISection( p_mux->p_sout, p_section );
1911
1912     PEStoTS( p_mux->p_sout, c, p_pmt, &p_sys->pmt );
1913
1914     dvbpsi_DeletePSISections( p_section );
1915     dvbpsi_EmptyPMT( &pmt );
1916 }