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