]> git.sesse.net Git - vlc/blob - modules/stream_out/transcode.c
* modules/stream_out/transcode.c: got rid of useless nearbyint().
[vlc] / modules / stream_out / transcode.c
1 /*****************************************************************************
2  * transcode.c: transcoding stream output module
3  *****************************************************************************
4  * Copyright (C) 2003-2004 VideoLAN
5  * $Id$
6  *
7  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8  *          Gildas Bazin <gbazin@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 #include <string.h>
30 #include <math.h>
31
32 #include <vlc/vlc.h>
33 #include <vlc/input.h>
34 #include <vlc/sout.h>
35 #include <vlc/vout.h>
36 #include <vlc/decoder.h>
37 #include "vlc_filter.h"
38 #include "osd.h"
39
40 /*****************************************************************************
41  * Module descriptor
42  *****************************************************************************/
43 #define VENC_TEXT N_("Video encoder")
44 #define VENC_LONGTEXT N_( \
45     "Allows you to specify the video encoder to use and its associated " \
46     "options." )
47 #define VCODEC_TEXT N_("Destination video codec")
48 #define VCODEC_LONGTEXT N_( \
49     "Allows you to specify the destination video codec used for the " \
50     "streaming output." )
51 #define VB_TEXT N_("Video bitrate")
52 #define VB_LONGTEXT N_( \
53     "Allows you to specify the video bitrate used for the streaming " \
54     "output." )
55 #define SCALE_TEXT N_("Video scaling")
56 #define SCALE_LONGTEXT N_( \
57     "Allows you to scale the video before encoding." )
58 #define FPS_TEXT N_("Video frame-rate")
59 #define FPS_LONGTEXT N_( \
60     "Allows you to specify an output frame rate for the video." )
61 #define DEINTERLACE_TEXT N_("Deinterlace video")
62 #define DEINTERLACE_LONGTEXT N_( \
63     "Allows you to deinterlace the video before encoding." )
64 #define DEINTERLACE_MODULE_TEXT N_("Deinterlace module")
65 #define DEINTERLACE_MODULE_LONGTEXT N_( \
66     "Specifies the deinterlace module to use (ffmpeg-deinterlace or " \
67     "deinterlace)." )
68 #define WIDTH_TEXT N_("Video width")
69 #define WIDTH_LONGTEXT N_( \
70     "Allows you to specify the output video width." )
71 #define HEIGHT_TEXT N_("Video height")
72 #define HEIGHT_LONGTEXT N_( \
73     "Allows you to specify the output video height." )
74
75 #define CROPTOP_TEXT N_("Video crop top")
76 #define CROPTOP_LONGTEXT N_( \
77     "Allows you to specify the top coordinate for the video cropping." )
78 #define CROPLEFT_TEXT N_("Video crop left")
79 #define CROPLEFT_LONGTEXT N_( \
80     "Allows you to specify the left coordinate for the video cropping." )
81 #define CROPBOTTOM_TEXT N_("Video crop bottom")
82 #define CROPBOTTOM_LONGTEXT N_( \
83     "Allows you to specify the bottom coordinate for the video cropping." )
84 #define CROPRIGHT_TEXT N_("Video crop right")
85 #define CROPRIGHT_LONGTEXT N_( \
86     "Allows you to specify the right coordinate for the video cropping." )
87
88 #define AENC_TEXT N_("Audio encoder")
89 #define AENC_LONGTEXT N_( \
90     "Allows you to specify the audio encoder to use and its associated " \
91     "options." )
92 #define ACODEC_TEXT N_("Destination audio codec")
93 #define ACODEC_LONGTEXT N_( \
94     "Allows you to specify the destination audio codec used for the " \
95     "streaming output." )
96 #define AB_TEXT N_("Audio bitrate")
97 #define AB_LONGTEXT N_( \
98     "Allows you to specify the audio bitrate used for the streaming " \
99     "output." )
100 #define ARATE_TEXT N_("Audio sample rate")
101 #define ARATE_LONGTEXT N_( \
102     "Allows you to specify the audio sample rate used for the streaming " \
103     "output." )
104 #define ACHANS_TEXT N_("Audio channels")
105 #define ACHANS_LONGTEXT N_( \
106     "Allows you to specify the number of audio channels used for the " \
107     "streaming output." )
108
109 #define SENC_TEXT N_("Subtitles encoder")
110 #define SENC_LONGTEXT N_( \
111     "Allows you to specify the subtitles encoder to use and its associated " \
112     "options." )
113 #define SCODEC_TEXT N_("Destination subtitles codec")
114 #define SCODEC_LONGTEXT N_( \
115     "Allows you to specify the destination subtitles codec used for the " \
116     "streaming output." )
117 #define SFILTER_TEXT N_("Subpictures filter")
118 #define SFILTER_LONGTEXT N_( \
119     "Allows you to specify subpictures filters used during the video " \
120     "transcoding. The subpictures produced by the filters will be overlayed " \
121     "directly onto the video." )
122
123 #define THREADS_TEXT N_("Number of threads")
124 #define THREADS_LONGTEXT N_( \
125     "Allows you to specify the number of threads used for the transcoding." )
126
127 #define ASYNC_TEXT N_("Synchronise on audio track")
128 #define ASYNC_LONGTEXT N_( \
129     "This option will drop/duplicate video frames to synchronise the video " \
130     "track on the audio track." )
131
132 #define HURRYUP_TEXT N_( "Hurry up" )
133 #define HURRYUP_LONGTEXT N_( "Allows you to specify if the transcoder " \
134   "should drop frames if your CPU can't keep up with the encoding rate." )
135
136 static int  Open ( vlc_object_t * );
137 static void Close( vlc_object_t * );
138
139 #define SOUT_CFG_PREFIX "sout-transcode-"
140
141 vlc_module_begin();
142     set_shortname( _("Transcode"));
143     set_description( _("Transcode stream output") );
144     set_capability( "sout stream", 50 );
145     add_shortcut( "transcode" );
146     set_callbacks( Open, Close );
147     set_category( CAT_SOUT );
148     set_subcategory( SUBCAT_SOUT_STREAM );
149     set_section( N_("Video"), NULL );
150     add_string( SOUT_CFG_PREFIX "venc", NULL, NULL, VENC_TEXT,
151                 VENC_LONGTEXT, VLC_FALSE );
152     add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
153                 VCODEC_LONGTEXT, VLC_FALSE );
154     add_integer( SOUT_CFG_PREFIX "vb", 800 * 1000, NULL, VB_TEXT,
155                  VB_LONGTEXT, VLC_FALSE );
156     add_float( SOUT_CFG_PREFIX "scale", 1, NULL, SCALE_TEXT,
157                SCALE_LONGTEXT, VLC_FALSE );
158     add_float( SOUT_CFG_PREFIX "fps", 0, NULL, FPS_TEXT,
159                FPS_LONGTEXT, VLC_FALSE );
160     add_bool( SOUT_CFG_PREFIX "hurry-up", VLC_TRUE, NULL, HURRYUP_TEXT,
161                HURRYUP_LONGTEXT, VLC_FALSE );
162     add_bool( SOUT_CFG_PREFIX "deinterlace", 0, NULL, DEINTERLACE_TEXT,
163               DEINTERLACE_LONGTEXT, VLC_FALSE );
164     add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL,
165                 DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
166                 VLC_FALSE );
167     add_integer( SOUT_CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
168                  WIDTH_LONGTEXT, VLC_TRUE );
169     add_integer( SOUT_CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
170                  HEIGHT_LONGTEXT, VLC_TRUE );
171
172     add_integer( SOUT_CFG_PREFIX "croptop", 0, NULL, CROPTOP_TEXT,
173                  CROPTOP_LONGTEXT, VLC_TRUE );
174     add_integer( SOUT_CFG_PREFIX "cropleft", 0, NULL, CROPLEFT_TEXT,
175                  CROPLEFT_LONGTEXT, VLC_TRUE );
176     add_integer( SOUT_CFG_PREFIX "cropbottom", 0, NULL, CROPBOTTOM_TEXT,
177                  CROPBOTTOM_LONGTEXT, VLC_TRUE );
178     add_integer( SOUT_CFG_PREFIX "cropright", 0, NULL, CROPRIGHT_TEXT,
179                  CROPRIGHT_LONGTEXT, VLC_TRUE );
180
181     set_section( N_("Audio"), NULL );
182     add_string( SOUT_CFG_PREFIX "aenc", NULL, NULL, AENC_TEXT,
183                 AENC_LONGTEXT, VLC_FALSE );
184     add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT,
185                 ACODEC_LONGTEXT, VLC_FALSE );
186     add_integer( SOUT_CFG_PREFIX "ab", 64000, NULL, AB_TEXT,
187                  AB_LONGTEXT, VLC_FALSE );
188     add_integer( SOUT_CFG_PREFIX "channels", 0, NULL, ACHANS_TEXT,
189                  ACHANS_LONGTEXT, VLC_FALSE );
190     add_integer( SOUT_CFG_PREFIX "samplerate", 0, NULL, ARATE_TEXT,
191                  ARATE_LONGTEXT, VLC_TRUE );
192     add_bool( SOUT_CFG_PREFIX "audio-sync", 0, NULL, ASYNC_TEXT,
193               ASYNC_LONGTEXT, VLC_FALSE );
194
195     set_section( N_("Overlays/Subtitles"), NULL );
196     add_string( SOUT_CFG_PREFIX "senc", NULL, NULL, SENC_TEXT,
197                 SENC_LONGTEXT, VLC_FALSE );
198     add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT,
199                 SCODEC_LONGTEXT, VLC_FALSE );
200     add_bool( SOUT_CFG_PREFIX "soverlay", 0, NULL, SCODEC_TEXT,
201                SCODEC_LONGTEXT, VLC_FALSE );
202     add_module_list_cat( SOUT_CFG_PREFIX "sfilter", SUBCAT_VIDEO_SUBPIC,
203                      NULL, NULL,
204                      SFILTER_TEXT, SFILTER_LONGTEXT, VLC_FALSE );
205
206     set_section( N_("Miscellaneous"), NULL );
207     add_integer( SOUT_CFG_PREFIX "threads", 0, NULL, THREADS_TEXT,
208                  THREADS_LONGTEXT, VLC_TRUE );
209
210 vlc_module_end();
211
212 static const char *ppsz_sout_options[] = {
213     "venc", "vcodec", "vb", "croptop", "cropbottom", "cropleft", "cropright",
214     "scale", "fps", "width", "height", "deinterlace", "deinterlace-module",
215     "threads", "hurry-up", "aenc", "acodec", "ab", "samplerate", "channels",
216     "senc", "scodec", "soverlay", "sfilter",
217     "audio-sync", NULL
218 };
219
220 /*****************************************************************************
221  * Exported prototypes
222  *****************************************************************************/
223 static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
224 static int               Del ( sout_stream_t *, sout_stream_id_t * );
225 static int               Send( sout_stream_t *, sout_stream_id_t *, block_t* );
226
227 static int  transcode_audio_new    ( sout_stream_t *, sout_stream_id_t * );
228 static void transcode_audio_close  ( sout_stream_t *, sout_stream_id_t * );
229 static int  transcode_audio_process( sout_stream_t *, sout_stream_id_t *,
230                                      block_t *, block_t ** );
231
232 static aout_buffer_t *audio_new_buffer( decoder_t *, int );
233 static void audio_del_buffer( decoder_t *, aout_buffer_t * );
234
235 static int  transcode_video_new    ( sout_stream_t *, sout_stream_id_t * );
236 static void transcode_video_close  ( sout_stream_t *, sout_stream_id_t * );
237 static int  transcode_video_encoder_open( sout_stream_t *, sout_stream_id_t *);
238 static int  transcode_video_process( sout_stream_t *, sout_stream_id_t *,
239                                      block_t *, block_t ** );
240
241 static void video_del_buffer( vlc_object_t *, picture_t * );
242 static picture_t *video_new_buffer_decoder( decoder_t * );
243 static void video_del_buffer_decoder( decoder_t *, picture_t * );
244 static void video_link_picture_decoder( decoder_t *, picture_t * );
245 static void video_unlink_picture_decoder( decoder_t *, picture_t * );
246 static picture_t *video_new_buffer_filter( filter_t * );
247 static void video_del_buffer_filter( filter_t *, picture_t * );
248
249 static int  transcode_spu_new    ( sout_stream_t *, sout_stream_id_t * );
250 static void transcode_spu_close  ( sout_stream_t *, sout_stream_id_t * );
251 static int  transcode_spu_process( sout_stream_t *, sout_stream_id_t *,
252                                    block_t *, block_t ** );
253
254 static int  EncoderThread( struct sout_stream_sys_t * p_sys );
255
256 static int pi_channels_maps[6] =
257 {
258     0,
259     AOUT_CHAN_CENTER,   AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
260     AOUT_CHAN_CENTER | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
261     AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
262      | AOUT_CHAN_REARRIGHT,
263     AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
264      | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
265 };
266
267 #define PICTURE_RING_SIZE 64
268 #define SUBPICTURE_RING_SIZE 20
269
270 struct sout_stream_sys_t
271 {
272     VLC_COMMON_MEMBERS
273
274     sout_stream_t   *p_out;
275     sout_stream_id_t *id_video;
276     block_t         *p_buffers;
277     vlc_mutex_t     lock_out;
278     vlc_cond_t      cond;
279     picture_t *     pp_pics[PICTURE_RING_SIZE];
280     int             i_first_pic, i_last_pic;
281
282     /* Audio */
283     vlc_fourcc_t    i_acodec;   /* codec audio (0 if not transcode) */
284     char            *psz_aenc;
285     sout_cfg_t      *p_audio_cfg;
286     int             i_sample_rate;
287     int             i_channels;
288     int             i_abitrate;
289
290     /* Video */
291     vlc_fourcc_t    i_vcodec;   /* codec video (0 if not transcode) */
292     char            *psz_venc;
293     sout_cfg_t      *p_video_cfg;
294     int             i_vbitrate;
295     double          f_scale;
296     double          f_fps;
297     int             i_width;
298     int             i_height;
299     vlc_bool_t      b_deinterlace;
300     char            *psz_deinterlace;
301     sout_cfg_t      *p_deinterlace_cfg;
302     int             i_threads;
303     vlc_bool_t      b_hurry_up;
304
305     int             i_crop_top;
306     int             i_crop_bottom;
307     int             i_crop_right;
308     int             i_crop_left;
309
310     /* SPU */
311     vlc_fourcc_t    i_scodec;   /* codec spu (0 if not transcode) */
312     char            *psz_senc;
313     vlc_bool_t      b_soverlay;
314     sout_cfg_t      *p_spu_cfg;
315     spu_t           *p_spu;
316
317     /* Sync */
318     vlc_bool_t      b_master_sync;
319     mtime_t         i_master_drift;
320 };
321
322 struct decoder_owner_sys_t
323 {
324     picture_t *pp_pics[PICTURE_RING_SIZE];
325 };
326 struct filter_owner_sys_t
327 {
328     picture_t *pp_pics[PICTURE_RING_SIZE];
329 };
330
331 /*****************************************************************************
332  * Open:
333  *****************************************************************************/
334 static int Open( vlc_object_t *p_this )
335 {
336     sout_stream_t     *p_stream = (sout_stream_t*)p_this;
337     sout_stream_sys_t *p_sys;
338     vlc_value_t       val;
339
340     p_sys = vlc_object_create( p_this, sizeof( sout_stream_sys_t ) );
341
342     p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
343     if( !p_sys->p_out )
344     {
345         msg_Err( p_stream, "cannot create chain" );
346         vlc_object_destroy( p_sys );
347         return VLC_EGENERIC;
348     }
349
350     p_sys->i_master_drift = 0;
351
352     sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
353                    p_stream->p_cfg );
354
355     /* Audio transcoding parameters */
356     var_Get( p_stream, SOUT_CFG_PREFIX "aenc", &val );
357     p_sys->psz_aenc = NULL;
358     p_sys->p_audio_cfg = NULL;
359     if( val.psz_string && *val.psz_string )
360     {
361         char *psz_next;
362         psz_next = sout_CfgCreate( &p_sys->psz_aenc, &p_sys->p_audio_cfg,
363                                    val.psz_string );
364         if( psz_next ) free( psz_next );
365     }
366     if( val.psz_string ) free( val.psz_string );
367
368     var_Get( p_stream, SOUT_CFG_PREFIX "acodec", &val );
369     p_sys->i_acodec = 0;
370     if( val.psz_string && *val.psz_string )
371     {
372         char fcc[4] = "    ";
373         memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
374         p_sys->i_acodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
375     }
376     if( val.psz_string ) free( val.psz_string );
377
378     var_Get( p_stream, SOUT_CFG_PREFIX "ab", &val );
379     p_sys->i_abitrate = val.i_int;
380     if( p_sys->i_abitrate < 4000 ) p_sys->i_abitrate *= 1000;
381
382     var_Get( p_stream, SOUT_CFG_PREFIX "samplerate", &val );
383     p_sys->i_sample_rate = val.i_int;
384
385     var_Get( p_stream, SOUT_CFG_PREFIX "channels", &val );
386     p_sys->i_channels = val.i_int;
387
388     if( p_sys->i_acodec )
389     {
390         msg_Dbg( p_stream, "codec audio=%4.4s %dHz %d channels %dKb/s",
391                  (char *)&p_sys->i_acodec, p_sys->i_sample_rate,
392                  p_sys->i_channels, p_sys->i_abitrate / 1000 );
393     }
394
395     /* Video transcoding parameters */
396     var_Get( p_stream, SOUT_CFG_PREFIX "venc", &val );
397     p_sys->psz_venc = NULL;
398     p_sys->p_video_cfg = NULL;
399     if( val.psz_string && *val.psz_string )
400     {
401         char *psz_next;
402         psz_next = sout_CfgCreate( &p_sys->psz_venc, &p_sys->p_video_cfg,
403                                    val.psz_string );
404         if( psz_next ) free( psz_next );
405     }
406     if( val.psz_string ) free( val.psz_string );
407
408     var_Get( p_stream, SOUT_CFG_PREFIX "vcodec", &val );
409     p_sys->i_vcodec = 0;
410     if( val.psz_string && *val.psz_string )
411     {
412         char fcc[4] = "    ";
413         memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
414         p_sys->i_vcodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
415     }
416     if( val.psz_string ) free( val.psz_string );
417
418     var_Get( p_stream, SOUT_CFG_PREFIX "vb", &val );
419     p_sys->i_vbitrate = val.i_int;
420     if( p_sys->i_vbitrate < 16000 ) p_sys->i_vbitrate *= 1000;
421
422     var_Get( p_stream, SOUT_CFG_PREFIX "scale", &val );
423     p_sys->f_scale = val.f_float;
424
425     var_Get( p_stream, SOUT_CFG_PREFIX "fps", &val );
426     p_sys->f_fps = val.f_float;
427
428     var_Get( p_stream, SOUT_CFG_PREFIX "hurry-up", &val );
429     p_sys->b_hurry_up = val.b_bool;
430
431     var_Get( p_stream, SOUT_CFG_PREFIX "width", &val );
432     p_sys->i_width = val.i_int;
433
434     var_Get( p_stream, SOUT_CFG_PREFIX "height", &val );
435     p_sys->i_height = val.i_int;
436
437     var_Get( p_stream, SOUT_CFG_PREFIX "deinterlace", &val );
438     p_sys->b_deinterlace = val.b_bool;
439
440     var_Get( p_stream, SOUT_CFG_PREFIX "deinterlace-module", &val );
441     p_sys->psz_deinterlace = NULL;
442     p_sys->p_deinterlace_cfg = NULL;
443     if( val.psz_string && *val.psz_string )
444     {
445         char *psz_next;
446         psz_next = sout_CfgCreate( &p_sys->psz_deinterlace,
447                                    &p_sys->p_deinterlace_cfg,
448                                    val.psz_string );
449         if( psz_next ) free( psz_next );
450     }
451     if( val.psz_string ) free( val.psz_string );
452
453     var_Get( p_stream, SOUT_CFG_PREFIX "croptop", &val );
454     p_sys->i_crop_top = val.i_int;
455     var_Get( p_stream, SOUT_CFG_PREFIX "cropbottom", &val );
456     p_sys->i_crop_bottom = val.i_int;
457     var_Get( p_stream, SOUT_CFG_PREFIX "cropleft", &val );
458     p_sys->i_crop_left = val.i_int;
459     var_Get( p_stream, SOUT_CFG_PREFIX "cropright", &val );
460     p_sys->i_crop_right = val.i_int;
461
462     var_Get( p_stream, SOUT_CFG_PREFIX "threads", &val );
463     p_sys->i_threads = val.i_int;
464
465     if( p_sys->i_vcodec )
466     {
467         msg_Dbg( p_stream, "codec video=%4.4s %dx%d scaling: %f %dkb/s",
468                  (char *)&p_sys->i_vcodec, p_sys->i_width, p_sys->i_height,
469                  p_sys->f_scale, p_sys->i_vbitrate / 1000 );
470     }
471
472     /* Subpictures transcoding parameters */
473     p_sys->p_spu = 0;
474     p_sys->psz_senc = NULL;
475     p_sys->p_spu_cfg = NULL;
476     p_sys->i_scodec = 0;
477
478     var_Get( p_stream, SOUT_CFG_PREFIX "senc", &val );
479     if( val.psz_string && *val.psz_string )
480     {
481         char *psz_next;
482         psz_next = sout_CfgCreate( &p_sys->psz_senc, &p_sys->p_spu_cfg,
483                                    val.psz_string );
484         if( psz_next ) free( psz_next );
485     }
486     if( val.psz_string ) free( val.psz_string );
487
488     var_Get( p_stream, SOUT_CFG_PREFIX "scodec", &val );
489     if( val.psz_string && *val.psz_string )
490     {
491         char fcc[4] = "    ";
492         memcpy( fcc, val.psz_string, __MIN( strlen( val.psz_string ), 4 ) );
493         p_sys->i_scodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
494     }
495     if( val.psz_string ) free( val.psz_string );
496
497     if( p_sys->i_scodec )
498     {
499         msg_Dbg( p_stream, "codec spu=%4.4s", (char *)&p_sys->i_scodec );
500     }
501
502     var_Get( p_stream, SOUT_CFG_PREFIX "soverlay", &val );
503     p_sys->b_soverlay = val.b_bool;
504
505     var_Get( p_stream, SOUT_CFG_PREFIX "sfilter", &val );
506     if( val.psz_string && *val.psz_string )
507     {
508         p_sys->p_spu = spu_Create( p_stream );
509         var_Create( p_sys->p_spu, "sub-filter", VLC_VAR_STRING );
510         var_Set( p_sys->p_spu, "sub-filter", val );
511         spu_Init( p_sys->p_spu );
512     }
513     if( val.psz_string ) free( val.psz_string );
514
515     var_Get( p_stream, SOUT_CFG_PREFIX "audio-sync", &val );
516     p_sys->b_master_sync = val.b_bool;
517     if( p_sys->f_fps > 0 ) p_sys->b_master_sync = VLC_TRUE;
518
519     p_stream->pf_add    = Add;
520     p_stream->pf_del    = Del;
521     p_stream->pf_send   = Send;
522     p_stream->p_sys     = p_sys;
523
524     return VLC_SUCCESS;
525 }
526
527 /*****************************************************************************
528  * Close:
529  *****************************************************************************/
530 static void Close( vlc_object_t * p_this )
531 {
532     sout_stream_t       *p_stream = (sout_stream_t*)p_this;
533     sout_stream_sys_t   *p_sys = p_stream->p_sys;
534
535     sout_StreamDelete( p_sys->p_out );
536
537     while( p_sys->p_audio_cfg != NULL )
538     {
539         sout_cfg_t *p_next = p_sys->p_audio_cfg->p_next;
540
541         if( p_sys->p_audio_cfg->psz_name )
542             free( p_sys->p_audio_cfg->psz_name );
543         if( p_sys->p_audio_cfg->psz_value )
544             free( p_sys->p_audio_cfg->psz_value );
545         free( p_sys->p_audio_cfg );
546
547         p_sys->p_audio_cfg = p_next;
548     }
549     if( p_sys->psz_aenc ) free( p_sys->psz_aenc );
550
551     while( p_sys->p_video_cfg != NULL )
552     {
553         sout_cfg_t *p_next = p_sys->p_video_cfg->p_next;
554
555         if( p_sys->p_video_cfg->psz_name )
556             free( p_sys->p_video_cfg->psz_name );
557         if( p_sys->p_video_cfg->psz_value )
558             free( p_sys->p_video_cfg->psz_value );
559         free( p_sys->p_video_cfg );
560
561         p_sys->p_video_cfg = p_next;
562     }
563     if( p_sys->psz_venc ) free( p_sys->psz_venc );
564
565     while( p_sys->p_deinterlace_cfg != NULL )
566     {
567         sout_cfg_t *p_next = p_sys->p_deinterlace_cfg->p_next;
568
569         if( p_sys->p_deinterlace_cfg->psz_name )
570             free( p_sys->p_deinterlace_cfg->psz_name );
571         if( p_sys->p_deinterlace_cfg->psz_value )
572             free( p_sys->p_deinterlace_cfg->psz_value );
573         free( p_sys->p_deinterlace_cfg );
574
575         p_sys->p_deinterlace_cfg = p_next;
576     }
577     if( p_sys->psz_deinterlace ) free( p_sys->psz_deinterlace );
578
579     while( p_sys->p_spu_cfg != NULL )
580     {
581         sout_cfg_t *p_next = p_sys->p_spu_cfg->p_next;
582
583         if( p_sys->p_spu_cfg->psz_name )
584             free( p_sys->p_spu_cfg->psz_name );
585         if( p_sys->p_spu_cfg->psz_value )
586             free( p_sys->p_spu_cfg->psz_value );
587         free( p_sys->p_spu_cfg );
588
589         p_sys->p_spu_cfg = p_next;
590     }
591     if( p_sys->psz_senc ) free( p_sys->psz_senc );
592
593     if( p_sys->p_spu ) spu_Destroy( p_sys->p_spu );
594
595     vlc_object_destroy( p_sys );
596 }
597
598 struct sout_stream_id_t
599 {
600     vlc_fourcc_t  b_transcode;
601
602     /* id of the out stream */
603     void *id;
604
605     /* Decoder */
606     decoder_t       *p_decoder;
607
608     /* Filters */
609     filter_t        *pp_filter[10];
610     int             i_filter;
611
612     /* Encoder */
613     encoder_t       *p_encoder;
614
615     /* Sync */
616     date_t          interpolated_pts;
617 };
618
619
620 static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
621 {
622     sout_stream_sys_t *p_sys = p_stream->p_sys;
623     sout_stream_id_t *id;
624
625     id = malloc( sizeof( sout_stream_id_t ) );
626     memset( id, 0, sizeof(sout_stream_id_t) );
627
628     id->id = NULL;
629     id->p_decoder = NULL;
630     id->p_encoder = NULL;
631
632     /* Create decoder object */
633     id->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER );
634     if( !id->p_decoder )
635     {
636         msg_Err( p_stream, "out of memory" );
637         goto error;
638     }
639     vlc_object_attach( id->p_decoder, p_stream );
640     id->p_decoder->p_module = NULL;
641     id->p_decoder->fmt_in = *p_fmt;
642     id->p_decoder->b_pace_control = VLC_TRUE;
643
644     /* Create encoder object */
645     id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
646     if( !id->p_encoder )
647     {
648         msg_Err( p_stream, "out of memory" );
649         goto error;
650     }
651     vlc_object_attach( id->p_encoder, p_stream );
652     id->p_encoder->p_module = NULL;
653
654     /* Create destination format */
655     es_format_Init( &id->p_encoder->fmt_out, p_fmt->i_cat, 0 );
656     id->p_encoder->fmt_out.i_id    = p_fmt->i_id;
657     id->p_encoder->fmt_out.i_group = p_fmt->i_group;
658     if( p_fmt->psz_language )
659         id->p_encoder->fmt_out.psz_language = strdup( p_fmt->psz_language );
660
661     if( p_fmt->i_cat == AUDIO_ES && (p_sys->i_acodec || p_sys->psz_aenc) )
662     {
663         msg_Dbg( p_stream,
664                  "creating audio transcoding from fcc=`%4.4s' to fcc=`%4.4s'",
665                  (char*)&p_fmt->i_codec, (char*)&p_sys->i_acodec );
666
667         /* Complete destination format */
668         id->p_encoder->fmt_out.i_codec = p_sys->i_acodec;
669         id->p_encoder->fmt_out.audio.i_rate = p_sys->i_sample_rate > 0 ?
670             p_sys->i_sample_rate : (int)p_fmt->audio.i_rate;
671         id->p_encoder->fmt_out.i_bitrate = p_sys->i_abitrate;
672         id->p_encoder->fmt_out.audio.i_bitspersample =
673             p_fmt->audio.i_bitspersample;
674         id->p_encoder->fmt_out.audio.i_channels = p_sys->i_channels > 0 ?
675             p_sys->i_channels : p_fmt->audio.i_channels;
676         /* Sanity check for audio channels */
677         id->p_encoder->fmt_out.audio.i_channels =
678             __MIN( id->p_encoder->fmt_out.audio.i_channels,
679                    id->p_decoder->fmt_in.audio.i_channels );
680         id->p_encoder->fmt_out.audio.i_original_channels =
681             id->p_decoder->fmt_in.audio.i_physical_channels;
682         if( id->p_decoder->fmt_in.audio.i_channels ==
683             id->p_encoder->fmt_out.audio.i_channels )
684         {
685             id->p_encoder->fmt_out.audio.i_physical_channels =
686                 id->p_decoder->fmt_in.audio.i_physical_channels;
687         }
688         else
689         {
690             id->p_encoder->fmt_out.audio.i_physical_channels =
691                 pi_channels_maps[id->p_encoder->fmt_out.audio.i_channels];
692         }
693
694         /* Build decoder -> filter -> encoder chain */
695         if( transcode_audio_new( p_stream, id ) )
696         {
697             msg_Err( p_stream, "cannot create audio chain" );
698             goto error;
699         }
700
701         /* Open output stream */
702         id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
703         id->b_transcode = VLC_TRUE;
704
705         if( !id->id ) goto error;
706
707         date_Init( &id->interpolated_pts, p_fmt->audio.i_rate, 1 );
708     }
709     else if( p_fmt->i_cat == VIDEO_ES &&
710              (p_sys->i_vcodec != 0 || p_sys->psz_venc) )
711     {
712         msg_Dbg( p_stream,
713                  "creating video transcoding from fcc=`%4.4s' to fcc=`%4.4s'",
714                  (char*)&p_fmt->i_codec, (char*)&p_sys->i_vcodec );
715
716         /* Complete destination format */
717         id->p_encoder->fmt_out.i_codec = p_sys->i_vcodec;
718         id->p_encoder->fmt_out.video.i_width  = p_sys->i_width;
719         id->p_encoder->fmt_out.video.i_height = p_sys->i_height;
720         id->p_encoder->fmt_out.i_bitrate = p_sys->i_vbitrate;
721
722         /* Build decoder -> filter -> encoder chain */
723         if( transcode_video_new( p_stream, id ) )
724         {
725             msg_Err( p_stream, "cannot create video chain" );
726             goto error;
727         }
728
729         /* Stream will be added later on because we don't know
730          * all the characteristics of the decoded stream yet */
731         id->b_transcode = VLC_TRUE;
732
733         if( p_sys->f_fps > 0 )
734         {
735             id->p_encoder->fmt_out.video.i_frame_rate =
736                 (p_sys->f_fps * 1001) + 0.5;
737             id->p_encoder->fmt_out.video.i_frame_rate_base = 1001;
738         }
739     }
740     else if( p_fmt->i_cat == SPU_ES && (p_sys->i_scodec || p_sys->psz_senc) )
741     {
742         msg_Dbg( p_stream, "creating subtitles transcoding from fcc=`%4.4s' "
743                  "to fcc=`%4.4s'", (char*)&p_fmt->i_codec,
744                  (char*)&p_sys->i_scodec );
745
746         /* Complete destination format */
747         id->p_encoder->fmt_out.i_codec = p_sys->i_scodec;
748
749         /* build decoder -> filter -> encoder */
750         if( transcode_spu_new( p_stream, id ) )
751         {
752             msg_Err( p_stream, "cannot create subtitles chain" );
753             goto error;
754         }
755
756         /* open output stream */
757         id->id = p_sys->p_out->pf_add( p_sys->p_out, &id->p_encoder->fmt_out );
758         id->b_transcode = VLC_TRUE;
759
760         if( !id->id ) goto error;
761     }
762     else if( p_fmt->i_cat == SPU_ES && p_sys->b_soverlay )
763     {
764         msg_Dbg( p_stream, "subtitles (fcc=`%4.4s') overlaying",
765                  (char*)&p_fmt->i_codec );
766
767         id->b_transcode = VLC_TRUE;
768
769         /* Build decoder -> filter -> overlaying chain */
770         if( transcode_spu_new( p_stream, id ) )
771         {
772             msg_Err( p_stream, "cannot create subtitles chain" );
773             goto error;
774         }
775     }
776     else
777     {
778         msg_Dbg( p_stream, "not transcoding a stream (fcc=`%4.4s')",
779                  (char*)&p_fmt->i_codec );
780         id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
781         id->b_transcode = VLC_FALSE;
782
783         if( !id->id ) goto error;
784     }
785
786     return id;
787
788  error:
789     if( id->p_decoder )
790     {
791         vlc_object_detach( id->p_decoder );
792         vlc_object_destroy( id->p_decoder );
793     }
794
795     if( id->p_encoder )
796     {
797         vlc_object_detach( id->p_encoder );
798         vlc_object_destroy( id->p_encoder );
799     }
800
801     free( id );
802     return NULL;
803 }
804
805 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
806 {
807     sout_stream_sys_t *p_sys = p_stream->p_sys;
808
809     if( id->b_transcode )
810     {
811         switch( id->p_decoder->fmt_in.i_cat )
812         {
813         case AUDIO_ES:
814             transcode_audio_close( p_stream, id );
815             break;
816         case VIDEO_ES:
817             transcode_video_close( p_stream, id );
818             break;
819         case SPU_ES:
820             transcode_spu_close( p_stream, id );
821             break;
822         }
823     }
824
825     if( id->id ) p_sys->p_out->pf_del( p_sys->p_out, id->id );
826
827     if( id->p_decoder )
828     {
829         vlc_object_detach( id->p_decoder );
830         vlc_object_destroy( id->p_decoder );
831     }
832
833     if( id->p_encoder )
834     {
835         vlc_object_detach( id->p_encoder );
836         vlc_object_destroy( id->p_encoder );
837     }
838
839     free( id );
840
841     return VLC_SUCCESS;
842 }
843
844 static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
845                  block_t *p_buffer )
846 {
847     sout_stream_sys_t *p_sys = p_stream->p_sys;
848     block_t *p_out;
849
850     if( !id->b_transcode && id->id )
851     {
852         if( p_sys->b_master_sync && p_sys->i_master_drift )
853         {
854             if( p_buffer->i_dts > 0 )
855             {
856                 p_buffer->i_dts -= p_sys->i_master_drift;
857                 if( p_buffer->i_dts < 0 )
858                 {
859                     block_Release( p_buffer );
860                     return VLC_EGENERIC;
861                 }
862             }
863             if( p_buffer->i_pts > 0 )
864             {
865                 p_buffer->i_pts -= p_sys->i_master_drift;
866                 if( p_buffer->i_pts < 0 )
867                 {
868                     block_Release( p_buffer );
869                     return VLC_EGENERIC;
870                 }
871             }
872         }
873
874         return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
875     }
876     else if( !id->b_transcode )
877     {
878         block_Release( p_buffer );
879         return VLC_EGENERIC;
880     }
881
882     switch( id->p_decoder->fmt_in.i_cat )
883     {
884     case AUDIO_ES:
885         transcode_audio_process( p_stream, id, p_buffer, &p_out );
886         break;
887
888     case VIDEO_ES:
889         if( transcode_video_process( p_stream, id, p_buffer, &p_out )
890             != VLC_SUCCESS )
891         {
892             return VLC_EGENERIC;
893         }
894         break;
895
896     case SPU_ES:
897         if( transcode_spu_process( p_stream, id, p_buffer, &p_out ) !=
898             VLC_SUCCESS )
899         {
900             return VLC_EGENERIC;
901         }
902         break;
903
904     default:
905         block_Release( p_buffer );
906         break;
907     }
908
909     if( p_out ) return p_sys->p_out->pf_send( p_sys->p_out, id->id, p_out );
910     return VLC_SUCCESS;
911 }
912
913 /****************************************************************************
914  * decoder reencoder part
915  ****************************************************************************/
916 int audio_BitsPerSample( vlc_fourcc_t i_format )
917 {
918     switch( i_format )
919     {
920     case VLC_FOURCC('u','8',' ',' '):
921     case VLC_FOURCC('s','8',' ',' '):
922         return 8;
923
924     case VLC_FOURCC('u','1','6','l'):
925     case VLC_FOURCC('s','1','6','l'):
926     case VLC_FOURCC('u','1','6','b'):
927     case VLC_FOURCC('s','1','6','b'):
928         return 16;
929
930     case VLC_FOURCC('u','2','4','l'):
931     case VLC_FOURCC('s','2','4','l'):
932     case VLC_FOURCC('u','2','4','b'):
933     case VLC_FOURCC('s','2','4','b'):
934         return 24;
935
936     case VLC_FOURCC('u','3','2','l'):
937     case VLC_FOURCC('s','3','2','l'):
938     case VLC_FOURCC('u','3','2','b'):
939     case VLC_FOURCC('s','3','2','b'):
940     case VLC_FOURCC('f','l','3','2'):
941     case VLC_FOURCC('f','i','3','2'):
942         return 32;
943
944     case VLC_FOURCC('f','l','6','4'):
945         return 64;
946     }
947
948     return 0;
949 }
950
951 static filter_t *transcode_audio_filter_new( sout_stream_t *p_stream,
952                                              sout_stream_id_t *id,
953                                              es_format_t *p_fmt_in,
954                                              es_format_t *p_fmt_out )
955 {
956     filter_t *p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
957
958     vlc_object_attach( p_filter, p_stream );
959     p_filter->pf_audio_buffer_new = __block_New;
960
961     p_filter->fmt_in = *p_fmt_in;
962     p_filter->fmt_out = *p_fmt_out;
963
964     p_filter->p_module = module_Need( p_filter, "audio filter2", 0, 0 );
965     if( p_filter->p_module )
966     {
967         p_filter->fmt_out.audio.i_bitspersample = 
968             audio_BitsPerSample( p_filter->fmt_out.i_codec );
969         *p_fmt_in = p_filter->fmt_out;
970     }
971     else
972     {
973         vlc_object_detach( p_filter );
974         vlc_object_destroy( p_filter );
975         p_filter = 0;
976     }
977
978     return p_filter;
979 }
980
981 static int transcode_audio_new( sout_stream_t *p_stream,
982                                 sout_stream_id_t *id )
983 {
984     sout_stream_sys_t *p_sys = p_stream->p_sys;
985     es_format_t fmt_last;
986     int i_pass = 6;
987
988     /*
989      * Open decoder
990      */
991
992     /* Initialization of decoder structures */
993     id->p_decoder->fmt_out = id->p_decoder->fmt_in;
994     id->p_decoder->fmt_out.i_extra = 0;
995     id->p_decoder->fmt_out.p_extra = 0;
996     id->p_decoder->pf_decode_audio = 0;
997     id->p_decoder->pf_aout_buffer_new = audio_new_buffer;
998     id->p_decoder->pf_aout_buffer_del = audio_del_buffer;
999     //id->p_decoder->p_cfg = p_sys->p_video_cfg;
1000
1001     id->p_decoder->p_module =
1002         module_Need( id->p_decoder, "decoder", "$codec", 0 );
1003
1004     if( !id->p_decoder->p_module )
1005     {
1006         msg_Err( p_stream, "cannot find decoder" );
1007         return VLC_EGENERIC;
1008     }
1009     id->p_decoder->fmt_out.audio.i_bitspersample = 
1010         audio_BitsPerSample( id->p_decoder->fmt_out.i_codec );
1011     fmt_last = id->p_decoder->fmt_out;
1012     /* FIX decoders so we don't have to do this */
1013     fmt_last.audio.i_rate = id->p_decoder->fmt_in.audio.i_rate;
1014
1015     /*
1016      * Open encoder
1017      */
1018
1019     /* Initialization of encoder format structures */
1020     es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
1021                     id->p_decoder->fmt_out.i_codec );
1022     id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec;
1023
1024     /* Initialization of encoder format structures */
1025     es_format_Init( &id->p_encoder->fmt_in, AUDIO_ES, AOUT_FMT_S16_NE );
1026     id->p_encoder->fmt_in.audio.i_format = AOUT_FMT_S16_NE;
1027     id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate;
1028     id->p_encoder->fmt_in.audio.i_physical_channels =
1029         id->p_encoder->fmt_out.audio.i_physical_channels;
1030     id->p_encoder->fmt_in.audio.i_original_channels =
1031         id->p_encoder->fmt_out.audio.i_original_channels;
1032     id->p_encoder->fmt_in.audio.i_channels =
1033         id->p_encoder->fmt_out.audio.i_channels;
1034     id->p_encoder->fmt_in.audio.i_bitspersample =
1035         audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
1036
1037     id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg;
1038
1039     id->p_encoder->p_module =
1040         module_Need( id->p_encoder, "encoder", p_sys->psz_aenc, VLC_TRUE );
1041     if( !id->p_encoder->p_module )
1042     {
1043         msg_Err( p_stream, "cannot find encoder" );
1044         module_Unneed( id->p_decoder, id->p_decoder->p_module );
1045         id->p_decoder->p_module = 0;
1046         return VLC_EGENERIC;
1047     }
1048     id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec;
1049     id->p_encoder->fmt_in.audio.i_bitspersample =
1050         audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
1051
1052     /* Load conversion filters */
1053     if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||
1054         fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
1055     {
1056         /* We'll have to go through fl32 first */
1057         es_format_t fmt_out = id->p_encoder->fmt_in;
1058         fmt_out.i_codec = fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2');
1059
1060         id->pp_filter[id->i_filter] =
1061             transcode_audio_filter_new( p_stream, id, &fmt_last, &fmt_out );
1062
1063         if( id->pp_filter[id->i_filter] ) id->i_filter++;
1064     }
1065
1066     while( i_pass-- )
1067     {
1068         if( fmt_last.audio.i_channels !=
1069             id->p_encoder->fmt_in.audio.i_channels ||
1070             fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate ||
1071             fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
1072         {
1073             id->pp_filter[id->i_filter] =
1074                 transcode_audio_filter_new( p_stream, id, &fmt_last,
1075                                             &id->p_encoder->fmt_in );
1076
1077             if( id->pp_filter[id->i_filter] ) id->i_filter++;
1078             else break;
1079         }
1080     }
1081
1082     /* Final checks to see if conversions were successful */
1083     if( fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
1084     {
1085         msg_Dbg( p_stream, "no audio filter found (%4.4s->%4.4s)",
1086                  (char *)&fmt_last.i_codec,
1087                  (char *)&id->p_encoder->fmt_in.i_codec );
1088         transcode_audio_close( p_stream, id );
1089         return VLC_EGENERIC;
1090     }
1091
1092     if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels )
1093     {
1094         msg_Dbg( p_stream, "no audio filter found for mixing from"
1095                  " %i to %i channels", fmt_last.audio.i_channels,
1096                  id->p_encoder->fmt_in.audio.i_channels );
1097
1098         id->p_encoder->fmt_in.audio.i_channels = fmt_last.audio.i_channels;
1099         id->p_encoder->fmt_out.audio.i_channels = fmt_last.audio.i_channels;
1100
1101         id->p_encoder->fmt_in.audio.i_physical_channels =
1102             id->p_encoder->fmt_in.audio.i_original_channels =
1103                 fmt_last.audio.i_physical_channels;
1104         id->p_encoder->fmt_out.audio.i_physical_channels =
1105             id->p_encoder->fmt_out.audio.i_original_channels =
1106                 fmt_last.audio.i_physical_channels;
1107     }
1108
1109     if( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
1110     {
1111         msg_Dbg( p_stream, "no audio filter found for resampling from"
1112                  " %iHz to %iHz", fmt_last.audio.i_rate,
1113                  id->p_encoder->fmt_in.audio.i_rate );
1114         id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
1115         id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
1116     }
1117
1118     /* FIXME: Hack for mp3 transcoding support */
1119     if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC( 'm','p','3',' ' ) )
1120         id->p_encoder->fmt_out.i_codec = VLC_FOURCC( 'm','p','g','a' );
1121
1122     return VLC_SUCCESS;
1123 }
1124
1125 static void transcode_audio_close( sout_stream_t *p_stream,
1126                                    sout_stream_id_t *id )
1127 {
1128     int i;
1129
1130     /* Close decoder */
1131     if( id->p_decoder->p_module )
1132         module_Unneed( id->p_decoder, id->p_decoder->p_module );
1133     id->p_decoder->p_module = 0;
1134
1135     /* Close encoder */
1136     if( id->p_encoder->p_module )
1137         module_Unneed( id->p_encoder, id->p_encoder->p_module );
1138     id->p_encoder->p_module = 0;
1139
1140     /* Close filters */
1141     for( i = 0; i < id->i_filter; i++ )
1142     {
1143         vlc_object_detach( id->pp_filter[i] );
1144         if( id->pp_filter[i]->p_module )
1145             module_Unneed( id->pp_filter[i], id->pp_filter[i]->p_module );
1146         vlc_object_destroy( id->pp_filter[i] );
1147     }
1148 }
1149
1150 static int transcode_audio_process( sout_stream_t *p_stream,
1151                                     sout_stream_id_t *id,
1152                                     block_t *in, block_t **out )
1153 {
1154     sout_stream_sys_t *p_sys = p_stream->p_sys;
1155     aout_buffer_t *p_audio_buf;
1156     block_t *p_block, *p_audio_block;
1157     int i;
1158     *out = NULL;
1159
1160     while( (p_audio_buf = id->p_decoder->pf_decode_audio( id->p_decoder,
1161                                                           &in )) )
1162     {
1163         if( p_sys->b_master_sync )
1164         {
1165             mtime_t i_dts = date_Get( &id->interpolated_pts ) + 1;
1166             p_sys->i_master_drift = p_audio_buf->start_date - i_dts;
1167             date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
1168             p_audio_buf->start_date -= p_sys->i_master_drift;
1169             p_audio_buf->end_date -= p_sys->i_master_drift;
1170         }
1171
1172         p_audio_block = p_audio_buf->p_sys;
1173         p_audio_block->i_buffer = p_audio_buf->i_nb_bytes;
1174         p_audio_block->i_dts = p_audio_block->i_pts =
1175             p_audio_buf->start_date;
1176         p_audio_block->i_length = p_audio_buf->end_date -
1177             p_audio_buf->start_date;
1178         p_audio_block->i_samples = p_audio_buf->i_nb_samples;
1179
1180         /* Run filter chain */
1181         for( i = 0; i < id->i_filter; i++ )
1182         {
1183             p_audio_block =
1184                 id->pp_filter[i]->pf_audio_filter( id->pp_filter[i],
1185                                                    p_audio_block );
1186         }
1187
1188         p_audio_buf->p_buffer = p_audio_block->p_buffer;
1189         p_audio_buf->i_nb_bytes = p_audio_block->i_buffer;
1190         p_audio_buf->i_nb_samples = p_audio_block->i_samples;
1191         p_audio_buf->start_date = p_audio_block->i_dts;
1192         p_audio_buf->end_date = p_audio_block->i_dts + p_audio_block->i_length;
1193
1194         p_block = id->p_encoder->pf_encode_audio( id->p_encoder, p_audio_buf );
1195         block_ChainAppend( out, p_block );
1196         block_Release( p_audio_block );
1197         free( p_audio_buf );
1198     }
1199
1200     return VLC_SUCCESS;
1201 }
1202
1203 static void audio_release_buffer( aout_buffer_t *p_buffer )
1204 {
1205     if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
1206     if( p_buffer ) free( p_buffer );
1207 }
1208
1209 static aout_buffer_t *audio_new_buffer( decoder_t *p_dec, int i_samples )
1210 {
1211     aout_buffer_t *p_buffer;
1212     block_t *p_block;
1213     int i_size;
1214
1215     if( p_dec->fmt_out.audio.i_bitspersample )
1216     {
1217         i_size = i_samples * p_dec->fmt_out.audio.i_bitspersample / 8 *
1218             p_dec->fmt_out.audio.i_channels;
1219     }
1220     else if( p_dec->fmt_out.audio.i_bytes_per_frame &&
1221              p_dec->fmt_out.audio.i_frame_length )
1222     {
1223         i_size = i_samples * p_dec->fmt_out.audio.i_bytes_per_frame /
1224             p_dec->fmt_out.audio.i_frame_length;
1225     }
1226     else
1227     {
1228         i_size = i_samples * 4 * p_dec->fmt_out.audio.i_channels;
1229     }
1230
1231     p_buffer = malloc( sizeof(aout_buffer_t) );
1232     p_buffer->pf_release = audio_release_buffer;
1233     p_buffer->p_sys = p_block = block_New( p_dec, i_size );
1234
1235     p_buffer->p_buffer = p_block->p_buffer;
1236     p_buffer->i_size = p_buffer->i_nb_bytes = p_block->i_buffer;
1237     p_buffer->i_nb_samples = i_samples;
1238     p_block->i_samples = i_samples;
1239
1240     return p_buffer;
1241 }
1242
1243 static void audio_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
1244 {
1245     if( p_buffer && p_buffer->p_sys ) block_Release( p_buffer->p_sys );
1246     if( p_buffer ) free( p_buffer );
1247 }
1248
1249 /*
1250  * video
1251  */
1252 static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
1253 {
1254     sout_stream_sys_t *p_sys = p_stream->p_sys;
1255     int i;
1256
1257     /*
1258      * Open decoder
1259      */
1260
1261     /* Initialization of decoder structures */
1262     id->p_decoder->fmt_out = id->p_decoder->fmt_in;
1263     id->p_decoder->fmt_out.i_extra = 0;
1264     id->p_decoder->fmt_out.p_extra = 0;
1265     id->p_decoder->pf_decode_video = 0;
1266     id->p_decoder->pf_vout_buffer_new = video_new_buffer_decoder;
1267     id->p_decoder->pf_vout_buffer_del = video_del_buffer_decoder;
1268     id->p_decoder->pf_picture_link    = video_link_picture_decoder;
1269     id->p_decoder->pf_picture_unlink  = video_unlink_picture_decoder;
1270     id->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) );
1271     for( i = 0; i < PICTURE_RING_SIZE; i++ )
1272         id->p_decoder->p_owner->pp_pics[i] = 0;
1273     //id->p_decoder->p_cfg = p_sys->p_video_cfg;
1274
1275     id->p_decoder->p_module =
1276         module_Need( id->p_decoder, "decoder", "$codec", 0 );
1277
1278     if( !id->p_decoder->p_module )
1279     {
1280         msg_Err( p_stream, "cannot find decoder" );
1281         return VLC_EGENERIC;
1282     }
1283
1284     /*
1285      * Open encoder.
1286      * Because some info about the decoded input will only be available
1287      * once the first frame is decoded, we actually only test the availability
1288      * of the encoder here.
1289      */
1290
1291     /* Initialization of encoder format structures */
1292     es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
1293                     id->p_decoder->fmt_out.i_codec );
1294     id->p_encoder->fmt_in.video.i_chroma = id->p_decoder->fmt_out.i_codec;
1295
1296     /* The dimensions will be set properly later on.
1297      * Just put sensible values so we can test an encoder is available. */
1298     id->p_encoder->fmt_in.video.i_width =
1299         id->p_encoder->fmt_out.video.i_width ?
1300         id->p_encoder->fmt_out.video.i_width :
1301         id->p_decoder->fmt_in.video.i_width ?
1302         id->p_decoder->fmt_in.video.i_width : 16;
1303     id->p_encoder->fmt_in.video.i_height =
1304         id->p_encoder->fmt_out.video.i_height ?
1305         id->p_encoder->fmt_out.video.i_height :
1306         id->p_decoder->fmt_in.video.i_height ?
1307         id->p_decoder->fmt_in.video.i_height : 16;
1308     id->p_encoder->fmt_in.video.i_frame_rate = 25;
1309     id->p_encoder->fmt_in.video.i_frame_rate_base = 1;
1310
1311     id->p_encoder->i_threads = p_sys->i_threads;
1312     id->p_encoder->p_cfg = p_sys->p_video_cfg;
1313
1314     id->p_encoder->p_module =
1315         module_Need( id->p_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
1316     if( !id->p_encoder->p_module )
1317     {
1318         msg_Err( p_stream, "cannot find encoder" );
1319         module_Unneed( id->p_decoder, id->p_decoder->p_module );
1320         id->p_decoder->p_module = 0;
1321         return VLC_EGENERIC;
1322     }
1323
1324     /* Close the encoder.
1325      * We'll open it only when we have the first frame. */
1326     module_Unneed( id->p_encoder, id->p_encoder->p_module );
1327     id->p_encoder->p_module = NULL;
1328
1329     if( p_sys->i_threads >= 1 )
1330     {
1331         p_sys->id_video = id;
1332         vlc_mutex_init( p_stream, &p_sys->lock_out );
1333         vlc_cond_init( p_stream, &p_sys->cond );
1334         memset( p_sys->pp_pics, 0, sizeof(p_sys->pp_pics) );
1335         p_sys->i_first_pic = 0;
1336         p_sys->i_last_pic = 0;
1337         p_sys->p_buffers = NULL;
1338         p_sys->b_die = p_sys->b_error = 0;
1339         if( vlc_thread_create( p_sys, "encoder", EncoderThread,
1340                                VLC_THREAD_PRIORITY_VIDEO, VLC_FALSE ) )
1341         {
1342             msg_Err( p_stream, "cannot spawn encoder thread" );
1343             module_Unneed( id->p_decoder, id->p_decoder->p_module );
1344             id->p_decoder->p_module = 0;
1345             return VLC_EGENERIC;
1346         }
1347     }
1348
1349     date_Set( &id->interpolated_pts, 0 );
1350
1351     return VLC_SUCCESS;
1352 }
1353
1354 static int transcode_video_encoder_open( sout_stream_t *p_stream,
1355                                          sout_stream_id_t *id )
1356 {
1357     sout_stream_sys_t *p_sys = p_stream->p_sys;
1358
1359     /* Hack because of the copy packetizer which can fail to detect the
1360      * proper size (which forces us to wait until the 1st frame
1361      * is decoded) */
1362     int i_width = id->p_decoder->fmt_out.video.i_width -
1363         p_sys->i_crop_left - p_sys->i_crop_right;
1364     int i_height = id->p_decoder->fmt_out.video.i_height -
1365         p_sys->i_crop_top - p_sys->i_crop_bottom;
1366
1367     if( id->p_encoder->fmt_out.video.i_width <= 0 &&
1368         id->p_encoder->fmt_out.video.i_height <= 0 && p_sys->f_scale )
1369     {
1370         /* Apply the scaling */
1371         id->p_encoder->fmt_out.video.i_width = i_width * p_sys->f_scale;
1372         id->p_encoder->fmt_out.video.i_height = i_height * p_sys->f_scale;
1373     }
1374     else if( id->p_encoder->fmt_out.video.i_width > 0 &&
1375              id->p_encoder->fmt_out.video.i_height <= 0 )
1376     {
1377         id->p_encoder->fmt_out.video.i_height =
1378             id->p_encoder->fmt_out.video.i_width / (double)i_width * i_height;
1379     }
1380     else if( id->p_encoder->fmt_out.video.i_width <= 0 &&
1381              id->p_encoder->fmt_out.video.i_height > 0 )
1382     {
1383         id->p_encoder->fmt_out.video.i_width =
1384             id->p_encoder->fmt_out.video.i_height / (double)i_height * i_width;
1385     }
1386
1387     /* Make sure the size is at least a multiple of 2 */
1388     id->p_encoder->fmt_out.video.i_width =
1389         (id->p_encoder->fmt_out.video.i_width + 1) >> 1 << 1;
1390     id->p_encoder->fmt_out.video.i_height =
1391         (id->p_encoder->fmt_out.video.i_height + 1) >> 1 << 1;
1392
1393     id->p_encoder->fmt_in.video.i_width =
1394         id->p_encoder->fmt_out.video.i_width;
1395     id->p_encoder->fmt_in.video.i_height =
1396         id->p_encoder->fmt_out.video.i_height;
1397
1398     if( !id->p_encoder->fmt_out.video.i_frame_rate ||
1399         !id->p_encoder->fmt_out.video.i_frame_rate_base )
1400     {
1401         if( id->p_decoder->fmt_out.video.i_frame_rate &&
1402             id->p_decoder->fmt_out.video.i_frame_rate_base )
1403         {
1404             id->p_encoder->fmt_out.video.i_frame_rate =
1405                 id->p_decoder->fmt_out.video.i_frame_rate;
1406             id->p_encoder->fmt_out.video.i_frame_rate_base =
1407                 id->p_decoder->fmt_out.video.i_frame_rate_base;
1408         }
1409         else
1410         {
1411             /* Pick a sensible default value */
1412             id->p_encoder->fmt_out.video.i_frame_rate = 25;
1413             id->p_encoder->fmt_out.video.i_frame_rate_base = 1;
1414         }
1415     }
1416
1417     id->p_encoder->fmt_in.video.i_frame_rate =
1418         id->p_encoder->fmt_out.video.i_frame_rate;
1419     id->p_encoder->fmt_in.video.i_frame_rate_base =
1420         id->p_encoder->fmt_out.video.i_frame_rate_base;
1421
1422     date_Init( &id->interpolated_pts,
1423                id->p_encoder->fmt_out.video.i_frame_rate,
1424                id->p_encoder->fmt_out.video.i_frame_rate_base );
1425
1426     /* Check whether a particular aspect ratio was requested */
1427     if( !id->p_encoder->fmt_out.video.i_aspect )
1428     {
1429         id->p_encoder->fmt_out.video.i_aspect =
1430             id->p_decoder->fmt_out.video.i_aspect;
1431     }
1432     id->p_encoder->fmt_in.video.i_aspect =
1433         id->p_encoder->fmt_out.video.i_aspect;
1434
1435     id->p_encoder->p_module =
1436         module_Need( id->p_encoder, "encoder", p_sys->psz_venc, VLC_TRUE );
1437     if( !id->p_encoder->p_module )
1438     {
1439         msg_Err( p_stream, "cannot find encoder" );
1440         return VLC_EGENERIC;
1441     }
1442
1443     id->p_encoder->fmt_in.video.i_chroma = id->p_encoder->fmt_in.i_codec;
1444
1445     /* Hack for mp2v/mp1v transcoding support */
1446     if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('m','p','1','v') ||
1447         id->p_encoder->fmt_out.i_codec == VLC_FOURCC('m','p','2','v') )
1448     {
1449         id->p_encoder->fmt_out.i_codec = VLC_FOURCC('m','p','g','v');
1450     }
1451
1452     id->id = p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out,
1453                                              &id->p_encoder->fmt_out );
1454     if( !id->id )
1455     {
1456         msg_Err( p_stream, "cannot add this stream" );
1457         return VLC_EGENERIC;
1458     }
1459
1460     return VLC_SUCCESS;
1461 }
1462
1463 static void transcode_video_close( sout_stream_t *p_stream,
1464                                    sout_stream_id_t *id )
1465 {
1466     int i, j;
1467
1468     if( p_stream->p_sys->i_threads >= 1 )
1469     {
1470         vlc_mutex_lock( &p_stream->p_sys->lock_out );
1471         p_stream->p_sys->b_die = 1;
1472         vlc_cond_signal( &p_stream->p_sys->cond );
1473         vlc_mutex_unlock( &p_stream->p_sys->lock_out );
1474         vlc_thread_join( p_stream->p_sys );
1475         vlc_mutex_destroy( &p_stream->p_sys->lock_out );
1476         vlc_cond_destroy( &p_stream->p_sys->cond );
1477     }
1478
1479     /* Close decoder */
1480     if( id->p_decoder->p_module )
1481         module_Unneed( id->p_decoder, id->p_decoder->p_module );
1482
1483     if( id->p_decoder->p_owner )
1484     {
1485         /* Clean-up pictures ring buffer */
1486         for( i = 0; i < PICTURE_RING_SIZE; i++ )
1487         {
1488             if( id->p_decoder->p_owner->pp_pics[i] )
1489                 video_del_buffer( VLC_OBJECT(id->p_decoder),
1490                                   id->p_decoder->p_owner->pp_pics[i] );
1491         }
1492         free( id->p_decoder->p_owner );
1493     }
1494
1495     /* Close encoder */
1496     if( id->p_encoder->p_module )
1497         module_Unneed( id->p_encoder, id->p_encoder->p_module );
1498
1499     /* Close filters */
1500     for( i = 0; i < id->i_filter; i++ )
1501     {
1502         vlc_object_detach( id->pp_filter[i] );
1503         if( id->pp_filter[i]->p_module )
1504             module_Unneed( id->pp_filter[i], id->pp_filter[i]->p_module );
1505
1506         /* Clean-up pictures ring buffer */
1507         for( j = 0; j < PICTURE_RING_SIZE; j++ )
1508         {
1509             if( id->pp_filter[i]->p_owner->pp_pics[j] )
1510                 video_del_buffer( VLC_OBJECT(id->pp_filter[i]),
1511                                   id->pp_filter[i]->p_owner->pp_pics[j] );
1512         }
1513         free( id->pp_filter[i]->p_owner );
1514
1515         vlc_object_destroy( id->pp_filter[i] );
1516     }
1517 }
1518
1519 static int transcode_video_process( sout_stream_t *p_stream,
1520                                     sout_stream_id_t *id,
1521                                     block_t *in, block_t **out )
1522 {
1523     sout_stream_sys_t *p_sys = p_stream->p_sys;
1524     int i_duplicate = 1, i;
1525     picture_t *p_pic;
1526     *out = NULL;
1527
1528     while( (p_pic = id->p_decoder->pf_decode_video( id->p_decoder, &in )) )
1529     {
1530         subpicture_t *p_subpic = 0;
1531
1532         if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up )
1533         {
1534             mtime_t current_date = mdate();
1535             if( current_date + 50000 > p_pic->date )
1536             {
1537                 msg_Dbg( p_stream, "late picture skipped ("I64Fd")",
1538                          current_date + 50000 - p_pic->date );
1539                 p_pic->pf_release( p_pic );
1540                 continue;
1541             }
1542         }
1543
1544         if( p_sys->b_master_sync )
1545         {
1546             mtime_t i_video_drift;
1547             mtime_t i_master_drift = p_sys->i_master_drift;
1548             mtime_t i_pts;
1549
1550             if( !i_master_drift )
1551             {
1552                 /* No audio track ? */
1553                 p_sys->i_master_drift = i_master_drift = p_pic->date;
1554             }
1555
1556             i_pts = date_Get( &id->interpolated_pts ) + 1;
1557             i_video_drift = p_pic->date - i_pts;
1558             i_duplicate = 1;
1559
1560             /* Set the pts of the frame being encoded */
1561             p_pic->date = i_pts;
1562
1563             if( i_video_drift < i_master_drift - 50000 )
1564             {
1565 #if 0
1566                 msg_Dbg( p_stream, "dropping frame (%i)",
1567                          (int)(i_video_drift - i_master_drift) );
1568 #endif
1569                 p_pic->pf_release( p_pic );
1570                 continue;
1571             }
1572             else if( i_video_drift > i_master_drift + 50000 )
1573             {
1574 #if 0
1575                 msg_Dbg( p_stream, "adding frame (%i)",
1576                          (int)(i_video_drift - i_master_drift) );
1577 #endif
1578                 i_duplicate = 2;
1579             }
1580         }
1581
1582         if( !id->p_encoder->p_module )
1583         {
1584             if( transcode_video_encoder_open( p_stream, id ) != VLC_SUCCESS )
1585             {
1586                 p_pic->pf_release( p_pic );
1587                 transcode_video_close( p_stream, id );
1588                 id->b_transcode = VLC_FALSE;
1589                 return VLC_EGENERIC;
1590             }
1591
1592             /* Deinterlace */
1593             if( p_stream->p_sys->b_deinterlace )
1594             {
1595                 id->pp_filter[id->i_filter] =
1596                     vlc_object_create( p_stream, VLC_OBJECT_FILTER );
1597                 vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
1598
1599                 id->pp_filter[id->i_filter]->pf_vout_buffer_new =
1600                     video_new_buffer_filter;
1601                 id->pp_filter[id->i_filter]->pf_vout_buffer_del =
1602                     video_del_buffer_filter;
1603
1604                 id->pp_filter[id->i_filter]->fmt_in = id->p_decoder->fmt_out;
1605                 id->pp_filter[id->i_filter]->fmt_out = id->p_decoder->fmt_out;
1606                 id->pp_filter[id->i_filter]->p_cfg = p_sys->p_deinterlace_cfg;
1607                 id->pp_filter[id->i_filter]->p_module =
1608                     module_Need( id->pp_filter[id->i_filter],
1609                                  "video filter2", p_sys->psz_deinterlace, 0 );
1610                 if( id->pp_filter[id->i_filter]->p_module )
1611                 {
1612                     id->pp_filter[id->i_filter]->p_owner =
1613                         malloc( sizeof(filter_owner_sys_t) );
1614                     for( i = 0; i < PICTURE_RING_SIZE; i++ )
1615                         id->pp_filter[id->i_filter]->p_owner->pp_pics[i] = 0;
1616
1617                     id->i_filter++;
1618                 }
1619                 else
1620                 {
1621                     msg_Dbg( p_stream, "no video filter found" );
1622                     vlc_object_detach( id->pp_filter[id->i_filter] );
1623                     vlc_object_destroy( id->pp_filter[id->i_filter] );
1624                 }
1625             }
1626
1627             /* Check if we need a filter for chroma conversion or resizing */
1628             if( id->p_decoder->fmt_out.video.i_chroma !=
1629                 id->p_encoder->fmt_in.video.i_chroma ||
1630                 id->p_decoder->fmt_out.video.i_width !=
1631                 id->p_encoder->fmt_out.video.i_width ||
1632                 id->p_decoder->fmt_out.video.i_height !=
1633                 id->p_encoder->fmt_out.video.i_height ||
1634                 p_sys->i_crop_top > 0 || p_sys->i_crop_bottom > 0 ||
1635                 p_sys->i_crop_left > 0 || p_sys->i_crop_right > 0 )
1636             {
1637                 id->pp_filter[id->i_filter] =
1638                     vlc_object_create( p_stream, VLC_OBJECT_FILTER );
1639                 vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
1640
1641                 id->pp_filter[id->i_filter]->pf_vout_buffer_new =
1642                     video_new_buffer_filter;
1643                 id->pp_filter[id->i_filter]->pf_vout_buffer_del =
1644                     video_del_buffer_filter;
1645
1646                 id->pp_filter[id->i_filter]->fmt_in = id->p_decoder->fmt_out;
1647                 id->pp_filter[id->i_filter]->fmt_out = id->p_encoder->fmt_in;
1648                 id->pp_filter[id->i_filter]->p_cfg = NULL;
1649                 id->pp_filter[id->i_filter]->p_module =
1650                     module_Need( id->pp_filter[id->i_filter],
1651                                  "video filter2", 0, 0 );
1652                 if( id->pp_filter[id->i_filter]->p_module )
1653                 {
1654                     id->pp_filter[id->i_filter]->p_owner =
1655                         malloc( sizeof(filter_owner_sys_t) );
1656                     for( i = 0; i < PICTURE_RING_SIZE; i++ )
1657                         id->pp_filter[id->i_filter]->p_owner->pp_pics[i] = 0;
1658
1659                     id->i_filter++;
1660                 }
1661                 else
1662                 {
1663                     msg_Dbg( p_stream, "no video filter found" );
1664                     vlc_object_detach( id->pp_filter[id->i_filter] );
1665                     vlc_object_destroy( id->pp_filter[id->i_filter] );
1666
1667                     p_pic->pf_release( p_pic );
1668                     transcode_video_close( p_stream, id );
1669                     id->b_transcode = VLC_FALSE;
1670                     return VLC_EGENERIC;
1671                 }
1672             }
1673         }
1674
1675         /* Run filter chain */
1676         for( i = 0; i < id->i_filter; i++ )
1677         {
1678             p_pic = id->pp_filter[i]->pf_video_filter(id->pp_filter[i], p_pic);
1679         }
1680
1681         /*
1682          * Encoding
1683          */
1684
1685         /* Check if we have a subpicture to overlay */
1686         if( p_sys->p_spu )
1687         {
1688             p_subpic = spu_SortSubpictures( p_sys->p_spu, p_pic->date );
1689             /* TODO: get another pic */
1690         }
1691
1692         /* Overlay subpicture */
1693         if( p_subpic )
1694         {
1695             int i_scale_width, i_scale_height;
1696             video_format_t *p_fmt;
1697
1698             i_scale_width = id->p_encoder->fmt_in.video.i_width * 1000 /
1699                 id->p_decoder->fmt_out.video.i_width;
1700             i_scale_height = id->p_encoder->fmt_in.video.i_height * 1000 /
1701                 id->p_decoder->fmt_out.video.i_height;
1702
1703             if( p_pic->i_refcount && !id->i_filter )
1704             {
1705                 /* We can't modify the picture, we need to duplicate it */
1706                 picture_t *p_tmp = video_new_buffer_decoder( id->p_decoder );
1707                 if( p_tmp )
1708                 {
1709                     vout_CopyPicture( p_stream, p_tmp, p_pic );
1710                     p_pic->pf_release( p_pic );
1711                     p_pic = p_tmp;
1712                 }
1713             }
1714
1715             if( id->i_filter )
1716                 p_fmt = &id->pp_filter[id->i_filter -1]->fmt_out.video;
1717             else
1718                 p_fmt = &id->p_decoder->fmt_out.video;
1719
1720             /* FIXME (shouldn't have to be done here) */
1721             p_fmt->i_sar_num = p_fmt->i_aspect *
1722                 p_fmt->i_height / p_fmt->i_width;
1723             p_fmt->i_sar_den = VOUT_ASPECT_FACTOR;
1724
1725             spu_RenderSubpictures( p_sys->p_spu, p_fmt, p_pic, p_pic, p_subpic,
1726                                    i_scale_width, i_scale_height );
1727         }
1728
1729         if( p_sys->i_threads >= 1 )
1730         {
1731             vlc_mutex_lock( &p_sys->lock_out );
1732             p_sys->pp_pics[p_sys->i_last_pic++] = p_pic;
1733             p_sys->i_last_pic %= PICTURE_RING_SIZE;
1734             *out = p_sys->p_buffers;
1735             p_sys->p_buffers = NULL;
1736             vlc_cond_signal( &p_sys->cond );
1737             vlc_mutex_unlock( &p_sys->lock_out );
1738         }
1739         else
1740         {
1741             block_t *p_block;
1742             p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
1743             block_ChainAppend( out, p_block );
1744
1745             if( p_sys->b_master_sync )
1746                 date_Increment( &id->interpolated_pts, 1 );
1747
1748             if( p_sys->b_master_sync && i_duplicate > 1 )
1749             {
1750                 mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
1751                 date_Increment( &id->interpolated_pts, 1 );
1752                 p_pic->date = i_pts;
1753                 p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
1754                 block_ChainAppend( out, p_block );
1755             }
1756
1757             p_pic->pf_release( p_pic );
1758         }
1759     }
1760
1761     return VLC_SUCCESS;
1762 }
1763
1764 static int EncoderThread( sout_stream_sys_t *p_sys )
1765 {
1766     sout_stream_id_t *id = p_sys->id_video;
1767     picture_t *p_pic;
1768
1769     while( !p_sys->b_die && !p_sys->b_error )
1770     {
1771         block_t *p_block;
1772
1773         vlc_mutex_lock( &p_sys->lock_out );
1774         while( p_sys->i_last_pic == p_sys->i_first_pic )
1775         {
1776             vlc_cond_wait( &p_sys->cond, &p_sys->lock_out );
1777             if( p_sys->b_die || p_sys->b_error ) break;
1778         }
1779         if( p_sys->b_die || p_sys->b_error )
1780         {
1781             vlc_mutex_unlock( &p_sys->lock_out );
1782             break;
1783         }
1784
1785         p_pic = p_sys->pp_pics[p_sys->i_first_pic++];
1786         p_sys->i_first_pic %= PICTURE_RING_SIZE;
1787         vlc_mutex_unlock( &p_sys->lock_out );
1788
1789         p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
1790         vlc_mutex_lock( &p_sys->lock_out );
1791         block_ChainAppend( &p_sys->p_buffers, p_block );
1792
1793         if( p_sys->b_master_sync )
1794             date_Increment( &id->interpolated_pts, 1 );
1795
1796 #if 0
1797         if( p_sys->b_master_sync && i_duplicate > 1 )
1798         {
1799             mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
1800             date_Increment( &id->interpolated_pts, 1 );
1801             p_pic->date = i_pts;
1802             p_block = id->p_encoder->pf_encode_video(id->p_encoder, p_pic);
1803             block_ChainAppend( &p_sys->p_buffers, p_block );
1804         }
1805 #endif
1806         vlc_mutex_unlock( &p_sys->lock_out );
1807
1808         p_pic->pf_release( p_pic );
1809     }
1810
1811     while( p_sys->i_last_pic != p_sys->i_first_pic )
1812     {
1813         p_pic = p_sys->pp_pics[p_sys->i_first_pic++];
1814         p_sys->i_first_pic %= PICTURE_RING_SIZE;
1815
1816         p_pic->pf_release( p_pic );
1817     }
1818
1819     block_ChainRelease( p_sys->p_buffers );
1820
1821     return 0;
1822 }
1823
1824 struct picture_sys_t
1825 {
1826     vlc_object_t *p_owner;
1827 };
1828
1829 static void video_release_buffer( picture_t *p_pic )
1830 {
1831     if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys )
1832     {
1833         video_del_buffer_decoder( (decoder_t *)p_pic->p_sys->p_owner, p_pic );
1834     }
1835     else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--;
1836 }
1837
1838 static picture_t *video_new_buffer( vlc_object_t *p_this, picture_t **pp_ring )
1839 {
1840     decoder_t *p_dec = (decoder_t *)p_this;
1841     picture_t *p_pic;
1842     int i;
1843
1844     /* Find an empty space in the picture ring buffer */
1845     for( i = 0; i < PICTURE_RING_SIZE; i++ )
1846     {
1847         if( pp_ring[i] != 0 && pp_ring[i]->i_status == DESTROYED_PICTURE )
1848         {
1849             pp_ring[i]->i_status = RESERVED_PICTURE;
1850             return pp_ring[i];
1851         }
1852     }
1853     for( i = 0; i < PICTURE_RING_SIZE; i++ )
1854     {
1855         if( pp_ring[i] == 0 ) break;
1856     }
1857
1858     if( i == PICTURE_RING_SIZE )
1859     {
1860         msg_Err( p_this, "decoder/filter is leaking pictures, "
1861                  "resetting its ring buffer" );
1862
1863         for( i = 0; i < PICTURE_RING_SIZE; i++ )
1864         {
1865             pp_ring[i]->pf_release( pp_ring[i] );
1866         }
1867
1868         i = 0;
1869     }
1870
1871     p_pic = malloc( sizeof(picture_t) );
1872     p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
1873     vout_AllocatePicture( VLC_OBJECT(p_dec), p_pic,
1874                           p_dec->fmt_out.video.i_chroma,
1875                           p_dec->fmt_out.video.i_width,
1876                           p_dec->fmt_out.video.i_height,
1877                           p_dec->fmt_out.video.i_aspect );
1878
1879     if( !p_pic->i_planes )
1880     {
1881         free( p_pic );
1882         return 0;
1883     }
1884
1885     p_pic->pf_release = video_release_buffer;
1886     p_pic->p_sys = malloc( sizeof(picture_sys_t) );
1887     p_pic->p_sys->p_owner = p_this;
1888     p_pic->i_status = RESERVED_PICTURE;
1889
1890     pp_ring[i] = p_pic;
1891
1892     return p_pic;
1893 }
1894
1895 static picture_t *video_new_buffer_decoder( decoder_t *p_dec )
1896 {
1897     return video_new_buffer( VLC_OBJECT(p_dec),
1898                              p_dec->p_owner->pp_pics );
1899 }
1900
1901 static picture_t *video_new_buffer_filter( filter_t *p_filter )
1902 {
1903     return video_new_buffer( VLC_OBJECT(p_filter),
1904                              p_filter->p_owner->pp_pics );
1905 }
1906
1907 static void video_del_buffer( vlc_object_t *p_this, picture_t *p_pic )
1908 {
1909     if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
1910     if( p_pic && p_pic->p_sys ) free( p_pic->p_sys );
1911     if( p_pic ) free( p_pic );
1912 }
1913
1914 static void video_del_buffer_decoder( decoder_t *p_decoder, picture_t *p_pic )
1915 {
1916     p_pic->i_refcount = 0;
1917     p_pic->i_status = DESTROYED_PICTURE;
1918 }
1919
1920 static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
1921 {
1922     p_pic->i_refcount = 0;
1923     p_pic->i_status = DESTROYED_PICTURE;
1924 }
1925
1926 static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
1927 {
1928     p_pic->i_refcount++;
1929 }
1930
1931 static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
1932 {
1933     video_release_buffer( p_pic );
1934 }
1935
1936 /*
1937  * SPU
1938  */
1939 static subpicture_t *spu_new_buffer( decoder_t * );
1940 static void spu_del_buffer( decoder_t *, subpicture_t * );
1941
1942 static int transcode_spu_new( sout_stream_t *p_stream, sout_stream_id_t *id )
1943 {
1944     sout_stream_sys_t *p_sys = p_stream->p_sys;
1945
1946     /*
1947      * Open decoder
1948      */
1949
1950     /* Initialization of decoder structures */
1951     id->p_decoder->pf_spu_buffer_new = spu_new_buffer;
1952     id->p_decoder->pf_spu_buffer_del = spu_del_buffer;
1953     id->p_decoder->p_owner = (decoder_owner_sys_t *)p_stream;
1954     //id->p_decoder->p_cfg = p_sys->p_spu_cfg;
1955
1956     id->p_decoder->p_module =
1957         module_Need( id->p_decoder, "decoder", "$codec", 0 );
1958
1959     if( !id->p_decoder->p_module )
1960     {
1961         msg_Err( p_stream, "cannot find decoder" );
1962         return VLC_EGENERIC;
1963     }
1964
1965     if( !p_sys->b_soverlay )
1966     {
1967         /*
1968          * Open encoder
1969          */
1970
1971         /* Initialization of encoder format structures */
1972         es_format_Init( &id->p_encoder->fmt_in, id->p_decoder->fmt_in.i_cat,
1973                         id->p_decoder->fmt_in.i_codec );
1974
1975         id->p_encoder->p_cfg = p_sys->p_spu_cfg;
1976
1977         id->p_encoder->p_module =
1978             module_Need( id->p_encoder, "encoder", p_sys->psz_senc, VLC_TRUE );
1979
1980         if( !id->p_encoder->p_module )
1981         {
1982             module_Unneed( id->p_decoder, id->p_decoder->p_module );
1983             msg_Err( p_stream, "cannot find encoder" );
1984             return VLC_EGENERIC;
1985         }
1986     }
1987
1988     if( !p_sys->p_spu )
1989     {
1990         p_sys->p_spu = spu_Create( p_stream );
1991         spu_Init( p_sys->p_spu );
1992     }
1993
1994     return VLC_SUCCESS;
1995 }
1996
1997 static void transcode_spu_close( sout_stream_t *p_stream, sout_stream_id_t *id)
1998 {
1999     /* Close decoder */
2000     if( id->p_decoder->p_module )
2001         module_Unneed( id->p_decoder, id->p_decoder->p_module );
2002
2003     /* Close encoder */
2004     if( id->p_encoder->p_module )
2005         module_Unneed( id->p_encoder, id->p_encoder->p_module );
2006 }
2007
2008 static int transcode_spu_process( sout_stream_t *p_stream,
2009                                   sout_stream_id_t *id,
2010                                   block_t *in, block_t **out )
2011 {
2012     sout_stream_sys_t *p_sys = p_stream->p_sys;
2013     subpicture_t *p_subpic;
2014     *out = NULL;
2015
2016     p_subpic = id->p_decoder->pf_decode_sub( id->p_decoder, &in );
2017     if( !p_subpic ) return VLC_EGENERIC;
2018
2019     if( p_sys->b_master_sync && p_sys->i_master_drift )
2020     {
2021         p_subpic->i_start -= p_sys->i_master_drift;
2022         if( p_subpic->i_stop ) p_subpic->i_stop -= p_sys->i_master_drift;
2023     }
2024
2025     if( p_sys->b_soverlay )
2026     {
2027         spu_DisplaySubpicture( p_sys->p_spu, p_subpic );
2028     }
2029     else
2030     {
2031         block_t *p_block;
2032
2033         p_block = id->p_encoder->pf_encode_sub( id->p_encoder, p_subpic );
2034         spu_del_buffer( id->p_decoder, p_subpic );
2035
2036         if( p_block )
2037         {
2038             block_ChainAppend( out, p_block );
2039             return VLC_SUCCESS;
2040         }
2041     }
2042
2043     return VLC_EGENERIC;
2044 }
2045
2046 static subpicture_t *spu_new_buffer( decoder_t *p_dec )
2047 {
2048     sout_stream_t *p_stream = (sout_stream_t *)p_dec->p_owner;
2049     return spu_CreateSubpicture( p_stream->p_sys->p_spu );
2050 }
2051
2052 static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
2053 {
2054     sout_stream_t *p_stream = (sout_stream_t *)p_dec->p_owner;
2055     spu_DestroySubpicture( p_stream->p_sys->p_spu, p_subpic );
2056 }