]> git.sesse.net Git - vlc/blob - modules/stream_out/mosaic_bridge.c
Fix memory leak in mosaic bridge
[vlc] / modules / stream_out / mosaic_bridge.c
1 /*****************************************************************************
2  * mosaic_bridge.c:
3  *****************************************************************************
4  * Copyright (C) 2004-2007 the VideoLAN team
5  * $Id$
6  *
7  * Authors: Antoine Cellerier <dionoea@videolan.org>
8  *          Christophe Massiot <massiot@via.ecp.fr>
9  *
10  * This program is free software; you can redistribute it and/or modify
11  * it under the terms of the GNU General Public License as published by
12  * the Free Software Foundation; either version 2 of the License, or
13  * (at your option) any later version.
14  *
15  * This program is distributed in the hope that it will be useful,
16  * but WITHOUT ANY WARRANTY; without even the implied warranty of
17  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18  * GNU General Public License for more details.
19  *
20  * You should have received a copy of the GNU General Public License
21  * along with this program; if not, write to the Free Software
22  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
23  *****************************************************************************/
24
25 /*****************************************************************************
26  * Preamble
27  *****************************************************************************/
28 #include <errno.h>                                                 /* ENOMEM */
29
30 #ifdef HAVE_CONFIG_H
31 # include "config.h"
32 #endif
33
34 #include <vlc/vlc.h>
35 #include <vlc_plugin.h>
36 #include <vlc_sout.h>
37 #include <vlc_block.h>
38 #include <vlc_codec.h>
39
40 #include <vlc_image.h>
41 #include <vlc_filter.h>
42
43 #include "../video_filter/mosaic.h"
44
45 /*****************************************************************************
46  * Local structures
47  *****************************************************************************/
48 struct sout_stream_sys_t
49 {
50     bridged_es_t *p_es;
51     vlc_mutex_t *p_lock;
52
53     decoder_t       *p_decoder;
54     image_handler_t *p_image; /* filter for resizing */
55     int i_height, i_width;
56     unsigned int i_sar_num, i_sar_den;
57     char *psz_id;
58     bool b_inited;
59
60     int i_chroma; /* force image format chroma */
61
62     filter_t **pp_vfilters;
63     int i_vfilters;
64 };
65
66 #define PICTURE_RING_SIZE 4
67 struct decoder_owner_sys_t
68 {
69     picture_t *pp_pics[PICTURE_RING_SIZE];
70
71     /* Current format in use by the output */
72     video_format_t video;
73 };
74
75 typedef void (* pf_release_t)( picture_t * );
76 static void ReleasePicture( picture_t *p_pic )
77 {
78     p_pic->i_refcount--;
79
80     if ( p_pic->i_refcount <= 0 )
81     {
82         if ( p_pic->p_sys != NULL )
83         {
84             pf_release_t pf_release = (pf_release_t)p_pic->p_sys;
85             p_pic->p_sys = NULL;
86             pf_release( p_pic );
87         }
88         else
89         {
90             if( p_pic )
91             {
92                 free( p_pic->p_data_orig );
93                 free( p_pic );
94             }
95         }
96     }
97 }
98
99 /*****************************************************************************
100  * Local prototypes
101  *****************************************************************************/
102 static int  Open    ( vlc_object_t * );
103 static void Close   ( vlc_object_t * );
104 static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
105 static int               Del ( sout_stream_t *, sout_stream_id_t * );
106 static int               Send( sout_stream_t *, sout_stream_id_t *, block_t * );
107
108 inline static void video_del_buffer_decoder( decoder_t *, picture_t * );
109 inline static void video_del_buffer_filter( filter_t *, picture_t * );
110 static void video_del_buffer( picture_t * );
111
112 inline static picture_t *video_new_buffer_decoder( decoder_t * );
113 inline static picture_t *video_new_buffer_filter( filter_t * );
114 static picture_t *video_new_buffer( vlc_object_t *, decoder_owner_sys_t *,
115                                     es_format_t *, void (*)( picture_t * ) );
116
117 static void video_link_picture_decoder( decoder_t *, picture_t * );
118 static void video_unlink_picture_decoder( decoder_t *, picture_t * );
119
120 static int HeightCallback( vlc_object_t *, char const *,
121                            vlc_value_t, vlc_value_t, void * );
122 static int WidthCallback( vlc_object_t *, char const *,
123                           vlc_value_t, vlc_value_t, void * );
124 static int alphaCallback( vlc_object_t *, char const *,
125                           vlc_value_t, vlc_value_t, void * );
126 static int xCallback( vlc_object_t *, char const *,
127                       vlc_value_t, vlc_value_t, void * );
128 static int yCallback( vlc_object_t *, char const *,
129                       vlc_value_t, vlc_value_t, void * );
130
131 /*****************************************************************************
132  * Module descriptor
133  *****************************************************************************/
134 #define ID_TEXT N_("ID")
135 #define ID_LONGTEXT N_( \
136     "Specify an identifier string for this subpicture" )
137
138 #define WIDTH_TEXT N_("Video width")
139 #define WIDTH_LONGTEXT N_( \
140     "Output video width." )
141 #define HEIGHT_TEXT N_("Video height")
142 #define HEIGHT_LONGTEXT N_( \
143     "Output video height." )
144 #define RATIO_TEXT N_("Sample aspect ratio")
145 #define RATIO_LONGTEXT N_( \
146     "Sample aspect ratio of the destination (1:1, 3:4, 2:3)." )
147
148 #define VFILTER_TEXT N_("Video filter")
149 #define VFILTER_LONGTEXT N_( \
150     "Video filters will be applied to the video stream." )
151
152 #define CHROMA_TEXT N_("Image chroma")
153 #define CHROMA_LONGTEXT N_( \
154     "Force the use of a specific chroma. Use YUVA if you're planning " \
155     "to use the Alphamask or Bluescreen video filter." )
156
157 #define ALPHA_TEXT N_("Transparency")
158 #define ALPHA_LONGTEXT N_( \
159     "Transparency of the mosaic picture." )
160
161 #define X_TEXT N_("X offset")
162 #define X_LONGTEXT N_( \
163     "X coordinate of the upper left corner in the mosaic if non negative." )
164
165 #define Y_TEXT N_("Y offset")
166 #define Y_LONGTEXT N_( \
167     "Y coordinate of the upper left corner in the mosaic if non negative." )
168
169 #define CFG_PREFIX "sout-mosaic-bridge-"
170
171 vlc_module_begin();
172     set_shortname( _( "Mosaic bridge" ) );
173     set_description(_("Mosaic bridge stream output") );
174     set_capability( "sout stream", 0 );
175     add_shortcut( "mosaic-bridge" );
176
177     add_string( CFG_PREFIX "id", "Id", NULL, ID_TEXT, ID_LONGTEXT,
178                 false );
179     add_integer( CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
180                  WIDTH_LONGTEXT, true );
181     add_integer( CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
182                  HEIGHT_LONGTEXT, true );
183     add_string( CFG_PREFIX "sar", "1:1", NULL, RATIO_TEXT,
184                 RATIO_LONGTEXT, false );
185     add_string( CFG_PREFIX "chroma", 0, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
186                 false );
187
188     add_module_list( CFG_PREFIX "vfilter", "video filter2",
189                      NULL, NULL, VFILTER_TEXT, VFILTER_LONGTEXT, false );
190
191     add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
192                             ALPHA_TEXT, ALPHA_LONGTEXT, false );
193     add_integer( CFG_PREFIX "x", -1, NULL, X_TEXT, X_LONGTEXT, false );
194     add_integer( CFG_PREFIX "y", -1, NULL, Y_TEXT, Y_LONGTEXT, false );
195
196     set_callbacks( Open, Close );
197 vlc_module_end();
198
199 static const char *ppsz_sout_options[] = {
200     "id", "width", "height", "sar", "vfilter", "chroma", "alpha", "x", "y", NULL
201 };
202
203 /*****************************************************************************
204  * Open
205  *****************************************************************************/
206 static int Open( vlc_object_t *p_this )
207 {
208     sout_stream_t        *p_stream = (sout_stream_t *)p_this;
209     sout_stream_sys_t    *p_sys;
210     vlc_object_t         *p_libvlc = VLC_OBJECT( p_this->p_libvlc );
211     vlc_value_t           val;
212
213     config_ChainParse( p_stream, CFG_PREFIX, ppsz_sout_options,
214                        p_stream->p_cfg );
215
216     p_sys = malloc( sizeof( sout_stream_sys_t ) );
217     if( !p_sys )
218     {
219         return VLC_ENOMEM;
220     }
221
222     p_stream->p_sys = p_sys;
223     p_sys->b_inited = false;
224
225     var_Create( p_libvlc, "mosaic-lock", VLC_VAR_MUTEX );
226     var_Get( p_libvlc, "mosaic-lock", &val );
227     p_sys->p_lock = val.p_address;
228
229     var_Get( p_stream, CFG_PREFIX "id", &val );
230     p_sys->psz_id = val.psz_string;
231
232     p_sys->i_height =
233         var_CreateGetIntegerCommand( p_stream, CFG_PREFIX "height" );
234     var_AddCallback( p_stream, CFG_PREFIX "height", HeightCallback, p_stream );
235
236     p_sys->i_width =
237         var_CreateGetIntegerCommand( p_stream, CFG_PREFIX "width" );
238     var_AddCallback( p_stream, CFG_PREFIX "width", WidthCallback, p_stream );
239
240     var_Get( p_stream, CFG_PREFIX "sar", &val );
241     if ( val.psz_string )
242     {
243         char *psz_parser = strchr( val.psz_string, ':' );
244
245         if( psz_parser )
246         {
247             *psz_parser++ = '\0';
248             p_sys->i_sar_num = atoi( val.psz_string );
249             p_sys->i_sar_den = atoi( psz_parser );
250             vlc_ureduce( &p_sys->i_sar_num, &p_sys->i_sar_den,
251                          p_sys->i_sar_num, p_sys->i_sar_den, 0 );
252         }
253         else
254         {
255             msg_Warn( p_stream, "bad aspect ratio %s", val.psz_string );
256             p_sys->i_sar_num = p_sys->i_sar_den = 1;
257         }
258
259         free( val.psz_string );
260     }
261     else
262     {
263         p_sys->i_sar_num = p_sys->i_sar_den = 1;
264     }
265
266     p_sys->i_chroma = 0;
267     val.psz_string = var_GetNonEmptyString( p_stream, CFG_PREFIX "chroma" );
268     if( val.psz_string && strlen( val.psz_string ) >= 4 )
269     {
270         memcpy( &p_sys->i_chroma, val.psz_string, 4 );
271         msg_Dbg( p_stream, "Forcing image chroma to 0x%.8x (%4.4s)", p_sys->i_chroma, (char*)&p_sys->i_chroma );
272     }
273
274 #define INT_COMMAND( a ) \
275     var_Create( p_stream, CFG_PREFIX #a, \
276                 VLC_VAR_INTEGER | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND ); \
277     var_AddCallback( p_stream, CFG_PREFIX #a, a ## Callback, \
278                      p_stream );
279     INT_COMMAND( alpha )
280     INT_COMMAND( x )
281     INT_COMMAND( y )
282
283     p_stream->pf_add    = Add;
284     p_stream->pf_del    = Del;
285     p_stream->pf_send   = Send;
286
287     p_stream->p_sout->i_out_pace_nocontrol++;
288
289     return VLC_SUCCESS;
290 }
291
292 /*****************************************************************************
293  * Close
294  *****************************************************************************/
295 static void Close( vlc_object_t * p_this )
296 {
297     sout_stream_t     *p_stream = (sout_stream_t*)p_this;
298     sout_stream_sys_t *p_sys = p_stream->p_sys;
299
300     p_stream->p_sout->i_out_pace_nocontrol--;
301
302     free( p_sys->psz_id );
303
304     free( p_sys );
305 }
306
307 static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
308 {
309     sout_stream_sys_t *p_sys = p_stream->p_sys;
310     bridge_t *p_bridge;
311     bridged_es_t *p_es;
312     char *psz_chain, *psz_parser;
313     int i;
314
315     if ( p_sys->b_inited )
316     {
317         return NULL;
318     }
319
320     /* Create decoder object */
321     p_sys->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER );
322     vlc_object_attach( p_sys->p_decoder, p_stream );
323     p_sys->p_decoder->p_module = NULL;
324     p_sys->p_decoder->fmt_in = *p_fmt;
325     p_sys->p_decoder->b_pace_control = false;
326     p_sys->p_decoder->fmt_out = p_sys->p_decoder->fmt_in;
327     p_sys->p_decoder->fmt_out.i_extra = 0;
328     p_sys->p_decoder->fmt_out.p_extra = 0;
329     p_sys->p_decoder->pf_decode_video = 0;
330     p_sys->p_decoder->pf_vout_buffer_new = video_new_buffer_decoder;
331     p_sys->p_decoder->pf_vout_buffer_del = video_del_buffer_decoder;
332     p_sys->p_decoder->pf_picture_link    = video_link_picture_decoder;
333     p_sys->p_decoder->pf_picture_unlink  = video_unlink_picture_decoder;
334     p_sys->p_decoder->p_owner = malloc( sizeof(decoder_owner_sys_t) );
335     for( i = 0; i < PICTURE_RING_SIZE; i++ )
336         p_sys->p_decoder->p_owner->pp_pics[i] = 0;
337     p_sys->p_decoder->p_owner->video = p_fmt->video;
338     //p_sys->p_decoder->p_cfg = p_sys->p_video_cfg;
339
340     p_sys->p_decoder->p_module =
341         module_Need( p_sys->p_decoder, "decoder", "$codec", 0 );
342
343     if( !p_sys->p_decoder->p_module )
344     {
345         msg_Err( p_stream, "cannot find decoder" );
346         vlc_object_detach( p_sys->p_decoder );
347         vlc_object_release( p_sys->p_decoder );
348         return NULL;
349     }
350
351     p_sys->b_inited = true;
352     vlc_mutex_lock( p_sys->p_lock );
353
354     p_bridge = GetBridge( p_stream );
355     if ( p_bridge == NULL )
356     {
357         vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
358         vlc_value_t val;
359
360         p_bridge = malloc( sizeof( bridge_t ) );
361
362         var_Create( p_libvlc, "mosaic-struct", VLC_VAR_ADDRESS );
363         val.p_address = p_bridge;
364         var_Set( p_libvlc, "mosaic-struct", val );
365
366         p_bridge->i_es_num = 0;
367         p_bridge->pp_es = NULL;
368     }
369
370     for ( i = 0; i < p_bridge->i_es_num; i++ )
371     {
372         if ( p_bridge->pp_es[i]->b_empty )
373             break;
374     }
375
376     if ( i == p_bridge->i_es_num )
377     {
378         p_bridge->pp_es = realloc( p_bridge->pp_es,
379                                    (p_bridge->i_es_num + 1)
380                                      * sizeof(bridged_es_t *) );
381         p_bridge->i_es_num++;
382         p_bridge->pp_es[i] = malloc( sizeof(bridged_es_t) );
383     }
384
385     p_sys->p_es = p_es = p_bridge->pp_es[i];
386
387     p_es->i_alpha = var_GetInteger( p_stream, CFG_PREFIX "alpha" );
388     p_es->i_x = var_GetInteger( p_stream, CFG_PREFIX "x" );
389     p_es->i_y = var_GetInteger( p_stream, CFG_PREFIX "y" );
390
391     //p_es->fmt = *p_fmt;
392     p_es->psz_id = p_sys->psz_id;
393     p_es->p_picture = NULL;
394     p_es->pp_last = &p_es->p_picture;
395     p_es->b_empty = false;
396
397     vlc_mutex_unlock( p_sys->p_lock );
398
399     if ( p_sys->i_height || p_sys->i_width )
400     {
401         p_sys->p_image = image_HandlerCreate( p_stream );
402     }
403     else
404     {
405         p_sys->p_image = NULL;
406     }
407
408     msg_Dbg( p_stream, "mosaic bridge id=%s pos=%d", p_es->psz_id, i );
409
410     /* Create user specified video filters */
411     psz_chain = var_GetNonEmptyString( p_stream, CFG_PREFIX "vfilter" );
412     msg_Dbg( p_stream, "psz_chain: %s\n", psz_chain );
413     {
414         config_chain_t *p_cfg;
415         for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
416         {
417             msg_Dbg( p_stream, " - %s\n", p_cfg->psz_value );
418         }
419     }
420     p_sys->i_vfilters = 0;
421     p_sys->pp_vfilters = NULL;
422     psz_parser = psz_chain;
423     while( psz_parser && *psz_parser )
424     {
425         config_chain_t *p_cfg;
426         char *psz_name;
427         filter_t **pp_vfilter;
428         psz_parser = config_ChainCreate( &psz_name, &p_cfg, psz_parser );
429         p_sys->i_vfilters++;
430         p_sys->pp_vfilters =
431             (filter_t **)realloc( p_sys->pp_vfilters,
432                                   p_sys->i_vfilters * sizeof(filter_t *) );
433         pp_vfilter = p_sys->pp_vfilters+(p_sys->i_vfilters - 1);
434         *pp_vfilter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
435         vlc_object_attach( *pp_vfilter, p_stream );
436         (*pp_vfilter)->pf_vout_buffer_new = video_new_buffer_filter;
437         (*pp_vfilter)->pf_vout_buffer_del = video_del_buffer_filter;
438         (*pp_vfilter)->fmt_in = p_sys->p_decoder->fmt_out;
439         if( p_sys->i_chroma )
440             (*pp_vfilter)->fmt_in.video.i_chroma = p_sys->i_chroma;
441         (*pp_vfilter)->fmt_out = (*pp_vfilter)->fmt_in;
442         (*pp_vfilter)->p_cfg = p_cfg;
443         (*pp_vfilter)->p_module =
444             module_Need( *pp_vfilter, "video filter2", psz_name, true );
445         if( (*pp_vfilter)->p_module )
446         {
447             /* It worked! */
448             (*pp_vfilter)->p_owner = (filter_owner_sys_t *)
449                 p_sys->p_decoder->p_owner;
450             msg_Err( p_stream, "Added video filter %s to the chain",
451                      psz_name );
452         }
453         else
454         {
455             /* Crap ... we didn't find a filter */
456             msg_Warn( p_stream,
457                       "no video filter matching name \"%s\" found",
458                       psz_name );
459             vlc_object_detach( *pp_vfilter );
460             vlc_object_release( *pp_vfilter );
461             p_sys->i_vfilters--;
462         }
463     }
464     free( psz_chain );
465
466     return (sout_stream_id_t *)p_sys;
467 }
468
469 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
470 {
471     VLC_UNUSED(id);
472     sout_stream_sys_t *p_sys = p_stream->p_sys;
473     bridge_t *p_bridge;
474     bridged_es_t *p_es;
475     bool b_last_es = true;
476     filter_t **pp_vfilter, **pp_end;
477     int i;
478
479     if ( !p_sys->b_inited )
480     {
481         return VLC_SUCCESS;
482     }
483
484     if ( p_sys->p_decoder != NULL )
485     {
486         decoder_owner_sys_t *p_owner = p_sys->p_decoder->p_owner;
487
488         if( p_sys->p_decoder->p_module )
489             module_Unneed( p_sys->p_decoder, p_sys->p_decoder->p_module );
490         vlc_object_detach( p_sys->p_decoder );
491         vlc_object_release( p_sys->p_decoder );
492
493         picture_t **pp_ring = p_owner->pp_pics;
494         for( i = 0; i < PICTURE_RING_SIZE; i++ )
495         {
496             if ( pp_ring[i] != NULL )
497             {
498                 free( pp_ring[i]->p_data_orig );
499                 free( pp_ring[i]->p_sys );
500                 free( pp_ring[i] );
501             }
502         }
503         free( p_owner );
504     }
505
506     /* Destroy user specified video filters */
507     pp_vfilter = p_sys->pp_vfilters;
508     pp_end = pp_vfilter + p_sys->i_vfilters;
509     for( ; pp_vfilter < pp_end; pp_vfilter++ )
510     {
511         vlc_object_detach( *pp_vfilter );
512         if( (*pp_vfilter)->p_module )
513             module_Unneed( *pp_vfilter, (*pp_vfilter)->p_module );
514         vlc_object_release( *pp_vfilter );
515     }
516     free( p_sys->pp_vfilters );
517
518     vlc_mutex_lock( p_sys->p_lock );
519
520     p_bridge = GetBridge( p_stream );
521     p_es = p_sys->p_es;
522
523     p_es->b_empty = true;
524     while ( p_es->p_picture )
525     {
526         picture_t *p_next = p_es->p_picture->p_next;
527         p_es->p_picture->pf_release( p_es->p_picture );
528         p_es->p_picture = p_next;
529     }
530
531     for ( i = 0; i < p_bridge->i_es_num; i++ )
532     {
533         if ( !p_bridge->pp_es[i]->b_empty )
534         {
535             b_last_es = false;
536             break;
537         }
538     }
539
540     if ( b_last_es )
541     {
542         vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
543         for ( i = 0; i < p_bridge->i_es_num; i++ )
544             free( p_bridge->pp_es[i] );
545         free( p_bridge->pp_es );
546         free( p_bridge );
547         var_Destroy( p_libvlc, "mosaic-struct" );
548     }
549
550     vlc_mutex_unlock( p_sys->p_lock );
551
552     if ( p_sys->p_image )
553     {
554         image_HandlerDelete( p_sys->p_image );
555     }
556
557     p_sys->b_inited = false;
558
559     return VLC_SUCCESS;
560 }
561
562 /*****************************************************************************
563  * PushPicture : push a picture in the mosaic-struct structure
564  *****************************************************************************/
565 static void PushPicture( sout_stream_t *p_stream, picture_t *p_picture )
566 {
567     sout_stream_sys_t *p_sys = p_stream->p_sys;
568     bridged_es_t *p_es = p_sys->p_es;
569
570     vlc_mutex_lock( p_sys->p_lock );
571
572     *p_es->pp_last = p_picture;
573     p_picture->p_next = NULL;
574     p_es->pp_last = &p_picture->p_next;
575
576     vlc_mutex_unlock( p_sys->p_lock );
577 }
578
579 static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
580                  block_t *p_buffer )
581 {
582     sout_stream_sys_t *p_sys = p_stream->p_sys;
583     picture_t *p_pic;
584
585     if ( (sout_stream_sys_t *)id != p_sys )
586     {
587         block_ChainRelease( p_buffer );
588         return VLC_SUCCESS;
589     }
590
591     while ( (p_pic = p_sys->p_decoder->pf_decode_video( p_sys->p_decoder,
592                                                         &p_buffer )) )
593     {
594         picture_t *p_new_pic;
595
596         if( p_sys->i_height || p_sys->i_width )
597         {
598             video_format_t fmt_out, fmt_in;
599
600             memset( &fmt_in, 0, sizeof(video_format_t) );
601             memset( &fmt_out, 0, sizeof(video_format_t) );
602             fmt_in = p_sys->p_decoder->fmt_out.video;
603
604
605             if( p_sys->i_chroma )
606                 fmt_out.i_chroma = p_sys->i_chroma;
607             else
608                 fmt_out.i_chroma = VLC_FOURCC('I','4','2','0');
609
610             if ( !p_sys->i_height )
611             {
612                 fmt_out.i_width = p_sys->i_width;
613                 fmt_out.i_height = (p_sys->i_width * VOUT_ASPECT_FACTOR
614                     * p_sys->i_sar_num / p_sys->i_sar_den / fmt_in.i_aspect)
615                       & ~0x1;
616             }
617             else if ( !p_sys->i_width )
618             {
619                 fmt_out.i_height = p_sys->i_height;
620                 fmt_out.i_width = (p_sys->i_height * fmt_in.i_aspect
621                     * p_sys->i_sar_den / p_sys->i_sar_num / VOUT_ASPECT_FACTOR)
622                       & ~0x1;
623             }
624             else
625             {
626                 fmt_out.i_width = p_sys->i_width;
627                 fmt_out.i_height = p_sys->i_height;
628             }
629             fmt_out.i_visible_width = fmt_out.i_width;
630             fmt_out.i_visible_height = fmt_out.i_height;
631
632             p_new_pic = image_Convert( p_sys->p_image,
633                                        p_pic, &fmt_in, &fmt_out );
634             if ( p_new_pic == NULL )
635             {
636                 msg_Err( p_stream, "image conversion failed" );
637                 continue;
638             }
639         }
640         else
641         {
642             /* TODO: chroma conversion if needed */
643
644             p_new_pic = (picture_t*)malloc( sizeof(picture_t) );
645             if( p_new_pic == NULL )
646             {
647                 msg_Err( p_stream, "image conversion failed" );
648                 continue;
649             }
650
651             if( vout_AllocatePicture(
652                                   p_stream, p_new_pic, p_pic->format.i_chroma,
653                                   p_pic->format.i_width, p_pic->format.i_height,
654                                   p_sys->p_decoder->fmt_out.video.i_aspect )
655                 != VLC_SUCCESS )
656             {
657                 free( p_new_pic );
658                 msg_Err( p_stream, "image allocation failed" );
659                 continue;
660             }
661
662             vout_CopyPicture( p_stream, p_new_pic, p_pic );
663         }
664
665         p_new_pic->i_refcount = 1;
666         p_new_pic->i_status = DESTROYED_PICTURE;
667         p_new_pic->i_type   = DIRECT_PICTURE;
668         p_new_pic->p_sys = (picture_sys_t *)p_new_pic->pf_release;
669         p_new_pic->pf_release = ReleasePicture;
670         p_new_pic->date = p_pic->date;
671         p_pic->pf_release( p_pic );
672
673         if( p_sys->pp_vfilters )
674         {
675             /* Apply user specified video filters */
676             filter_t **pp_vfilter = p_sys->pp_vfilters;
677             filter_t **pp_end = pp_vfilter + p_sys->i_vfilters;
678             for( ; pp_vfilter < pp_end; pp_vfilter++ )
679             {
680                 (*pp_vfilter)->fmt_in.i_codec = p_new_pic->format.i_chroma;
681                 (*pp_vfilter)->fmt_out.i_codec = p_new_pic->format.i_chroma;
682                 (*pp_vfilter)->fmt_in.video = p_new_pic->format;
683                 (*pp_vfilter)->fmt_out.video = p_new_pic->format;
684                 p_new_pic = (*pp_vfilter)->pf_video_filter( *pp_vfilter,
685                                                              p_new_pic );
686                 if( !p_new_pic )
687                 {
688                     msg_Err( p_stream, "video filter failed" );
689                     break;
690                 }
691             }
692             if( !p_new_pic ) continue;
693         }
694
695         PushPicture( p_stream, p_new_pic );
696     }
697
698     return VLC_SUCCESS;
699 }
700
701 struct picture_sys_t
702 {
703     vlc_object_t *p_owner;
704     bool b_dead;
705 };
706
707 static void video_release_buffer_decoder( picture_t *p_pic )
708 {
709     if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys )
710     {
711         video_del_buffer_decoder( (decoder_t *)p_pic->p_sys->p_owner, p_pic );
712     }
713     else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--;
714 }
715
716 static void video_release_buffer_filter( picture_t *p_pic )
717 {
718     if( p_pic && !p_pic->i_refcount && p_pic->pf_release && p_pic->p_sys )
719     {
720         video_del_buffer_filter( (filter_t *)p_pic->p_sys->p_owner, p_pic );
721     }
722     else if( p_pic && p_pic->i_refcount > 0 ) p_pic->i_refcount--;
723 }
724
725 inline static picture_t *video_new_buffer_decoder( decoder_t *p_dec )
726 {
727     return video_new_buffer( VLC_OBJECT( p_dec ),
728                              (decoder_owner_sys_t *)p_dec->p_owner,
729                              &p_dec->fmt_out,
730                              video_release_buffer_decoder );
731 }
732
733 inline static picture_t *video_new_buffer_filter( filter_t *p_filter )
734 {
735     return video_new_buffer( VLC_OBJECT( p_filter ),
736                              (decoder_owner_sys_t *)p_filter->p_owner,
737                              &p_filter->fmt_out,
738                              video_release_buffer_filter );
739 }
740
741 static picture_t *video_new_buffer( vlc_object_t *p_this,
742                                     decoder_owner_sys_t *p_sys,
743                                     es_format_t *fmt_out,
744                                     void ( *pf_release )( picture_t * ) )
745 {
746     picture_t **pp_ring = p_sys->pp_pics;
747     picture_t *p_pic;
748     int i;
749
750     if( fmt_out->video.i_width != p_sys->video.i_width ||
751         fmt_out->video.i_height != p_sys->video.i_height ||
752         fmt_out->video.i_chroma != p_sys->video.i_chroma ||
753         fmt_out->video.i_aspect != p_sys->video.i_aspect )
754     {
755         if( !fmt_out->video.i_sar_num ||
756             !fmt_out->video.i_sar_den )
757         {
758             fmt_out->video.i_sar_num =
759                 fmt_out->video.i_aspect * fmt_out->video.i_height;
760
761             fmt_out->video.i_sar_den =
762                 VOUT_ASPECT_FACTOR * fmt_out->video.i_width;
763         }
764
765         vlc_ureduce( &fmt_out->video.i_sar_num,
766                      &fmt_out->video.i_sar_den,
767                      fmt_out->video.i_sar_num,
768                      fmt_out->video.i_sar_den, 0 );
769
770         if( !fmt_out->video.i_visible_width ||
771             !fmt_out->video.i_visible_height )
772         {
773             fmt_out->video.i_visible_width = fmt_out->video.i_width;
774             fmt_out->video.i_visible_height = fmt_out->video.i_height;
775         }
776
777         fmt_out->video.i_chroma = fmt_out->i_codec;
778         p_sys->video = fmt_out->video;
779
780         for( i = 0; i < PICTURE_RING_SIZE; i++ )
781         {
782             if ( pp_ring[i] != NULL )
783             {
784                 if ( pp_ring[i]->i_status == DESTROYED_PICTURE )
785                 {
786                     free( pp_ring[i]->p_data_orig );
787                     free( pp_ring[i]->p_sys );
788                     free( pp_ring[i] );
789                 }
790                 else
791                 {
792                     pp_ring[i]->p_sys->b_dead = true;
793                 }
794                 pp_ring[i] = NULL;
795             }
796         }
797     }
798
799     /* Find an empty space in the picture ring buffer */
800     for( i = 0; i < PICTURE_RING_SIZE; i++ )
801     {
802         if( pp_ring[i] != NULL && pp_ring[i]->i_status == DESTROYED_PICTURE )
803         {
804             pp_ring[i]->i_status = RESERVED_PICTURE;
805             return pp_ring[i];
806         }
807     }
808     for( i = 0; i < PICTURE_RING_SIZE; i++ )
809     {
810         if( pp_ring[i] == NULL ) break;
811     }
812
813     if( i == PICTURE_RING_SIZE )
814     {
815         msg_Err( p_this, "decoder/filter is leaking pictures, "
816                  "resetting its ring buffer" );
817
818         for( i = 0; i < PICTURE_RING_SIZE; i++ )
819         {
820             pp_ring[i]->pf_release( pp_ring[i] );
821         }
822
823         i = 0;
824     }
825
826     p_pic = malloc( sizeof(picture_t) );
827     if( !p_pic ) return NULL;
828     fmt_out->video.i_chroma = fmt_out->i_codec;
829     vout_AllocatePicture( p_this, p_pic,
830                           fmt_out->video.i_chroma,
831                           fmt_out->video.i_width,
832                           fmt_out->video.i_height,
833                           fmt_out->video.i_aspect );
834
835     if( !p_pic->i_planes )
836     {
837         free( p_pic );
838         return NULL;
839     }
840
841     p_pic->pf_release = pf_release;
842     p_pic->p_sys = malloc( sizeof(picture_sys_t) );
843     p_pic->p_sys->p_owner = p_this;
844     p_pic->p_sys->b_dead = false;
845     p_pic->i_status = RESERVED_PICTURE;
846
847     pp_ring[i] = p_pic;
848
849     return p_pic;
850 }
851
852 inline static void video_del_buffer_decoder( decoder_t *p_this,
853                                              picture_t *p_pic )
854 {
855     VLC_UNUSED(p_this);
856     video_del_buffer( p_pic );
857 }
858
859 inline static void video_del_buffer_filter( filter_t *p_this,
860                                             picture_t *p_pic )
861 {
862     VLC_UNUSED(p_this);
863     video_del_buffer( p_pic );
864 }
865
866 static void video_del_buffer( picture_t *p_pic )
867 {
868     p_pic->i_refcount = 0;
869     p_pic->i_status = DESTROYED_PICTURE;
870     if ( p_pic->p_sys->b_dead )
871     {
872         free( p_pic->p_data_orig );
873         free( p_pic->p_sys );
874         free( p_pic );
875     }
876 }
877
878 static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
879 {
880     VLC_UNUSED(p_dec);
881     p_pic->i_refcount++;
882 }
883
884 static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
885 {
886     VLC_UNUSED(p_dec);
887     video_release_buffer_decoder( p_pic );
888 }
889
890
891 /**********************************************************************
892  * Callback to update (some) params on the fly
893  **********************************************************************/
894 static int HeightCallback( vlc_object_t *p_this, char const *psz_var,
895                            vlc_value_t oldval, vlc_value_t newval,
896                            void *p_data )
897 {
898     VLC_UNUSED(p_this); VLC_UNUSED(oldval);
899     sout_stream_t *p_stream = (sout_stream_t *)p_data;
900     sout_stream_sys_t *p_sys = p_stream->p_sys;
901
902     /* We create the handler before updating the value in p_sys
903      * so we don't have to worry about locking */
904     if( !p_sys->p_image && newval.i_int )
905         p_sys->p_image = image_HandlerCreate( p_stream );
906     p_sys->i_height = newval.i_int;
907
908     return VLC_SUCCESS;
909 }
910
911 static int WidthCallback( vlc_object_t *p_this, char const *psz_var,
912                            vlc_value_t oldval, vlc_value_t newval,
913                            void *p_data )
914 {
915     VLC_UNUSED(p_this); VLC_UNUSED(oldval);
916     sout_stream_t *p_stream = (sout_stream_t *)p_data;
917     sout_stream_sys_t *p_sys = p_stream->p_sys;
918
919     /* We create the handler before updating the value in p_sys
920      * so we don't have to worry about locking */
921     if( !p_sys->p_image && newval.i_int )
922         p_sys->p_image = image_HandlerCreate( p_stream );
923     p_sys->i_width = newval.i_int;
924
925     return VLC_SUCCESS;
926 }
927
928 static int alphaCallback( vlc_object_t *p_this, char const *psz_var,
929                           vlc_value_t oldval, vlc_value_t newval,
930                           void *p_data )
931 {
932     VLC_UNUSED(p_this); VLC_UNUSED(oldval);
933     sout_stream_t *p_stream = (sout_stream_t *)p_data;
934     sout_stream_sys_t *p_sys = p_stream->p_sys;
935
936     if( p_sys->p_es )
937         p_sys->p_es->i_alpha = newval.i_int;
938
939     return VLC_SUCCESS;
940 }
941
942 static int xCallback( vlc_object_t *p_this, char const *psz_var,
943                       vlc_value_t oldval, vlc_value_t newval,
944                       void *p_data )
945 {
946     VLC_UNUSED(p_this); VLC_UNUSED(oldval);
947     sout_stream_t *p_stream = (sout_stream_t *)p_data;
948     sout_stream_sys_t *p_sys = p_stream->p_sys;
949
950     if( p_sys->p_es )
951         p_sys->p_es->i_x = newval.i_int;
952
953     return VLC_SUCCESS;
954 }
955
956 static int yCallback( vlc_object_t *p_this, char const *psz_var,
957                       vlc_value_t oldval, vlc_value_t newval,
958                       void *p_data )
959 {
960     VLC_UNUSED(p_this); VLC_UNUSED(oldval);
961     sout_stream_t *p_stream = (sout_stream_t *)p_data;
962     sout_stream_sys_t *p_sys = p_stream->p_sys;
963
964     if( p_sys->p_es )
965         p_sys->p_es->i_y = newval.i_int;
966
967     return VLC_SUCCESS;
968 }