]> git.sesse.net Git - vlc/blob - src/video_output/video_output.c
* src/video_output: fixed a CPU heating loop in pause mode (fixes the problem with...
[vlc] / src / video_output / video_output.c
1 /*****************************************************************************
2  * video_output.c : video output thread
3  * This module describes the programming interface for video output threads.
4  * It includes functions allowing to open a new thread, send pictures to a
5  * thread, and destroy a previously oppened video output thread.
6  *****************************************************************************
7  * Copyright (C) 2000-2004 VideoLAN
8  * $Id$
9  *
10  * Authors: Vincent Seguin <seguin@via.ecp.fr>
11  *
12  * This program is free software; you can redistribute it and/or modify
13  * it under the terms of the GNU General Public License as published by
14  * the Free Software Foundation; either version 2 of the License, or
15  * (at your option) any later version.
16  *
17  * This program is distributed in the hope that it will be useful,
18  * but WITHOUT ANY WARRANTY; without even the implied warranty of
19  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
20  * GNU General Public License for more details.
21  *
22  * You should have received a copy of the GNU General Public License
23  * along with this program; if not, write to the Free Software
24  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
25  *****************************************************************************/
26
27 /*****************************************************************************
28  * Preamble
29  *****************************************************************************/
30 #include <stdlib.h>                                                /* free() */
31
32 #include <vlc/vlc.h>
33
34 #ifdef HAVE_SYS_TIMES_H
35 #   include <sys/times.h>
36 #endif
37
38 #include "vlc_video.h"
39 #include "video_output.h"
40 #include <vlc/input.h>                 /* for input_thread_t and i_pts_delay */
41
42 #if defined( SYS_DARWIN )
43 #include "darwin_specific.h"
44 #endif
45
46 /*****************************************************************************
47  * Local prototypes
48  *****************************************************************************/
49 static int      InitThread        ( vout_thread_t * );
50 static void     RunThread         ( vout_thread_t * );
51 static void     ErrorThread       ( vout_thread_t * );
52 static void     EndThread         ( vout_thread_t * );
53 static void     DestroyThread     ( vout_thread_t * );
54
55 static void     AspectRatio       ( int, int *, int * );
56 static int      BinaryLog         ( uint32_t );
57 static void     MaskToShift       ( int *, int *, uint32_t );
58 static void     InitWindowSize    ( vout_thread_t *, int *, int * );
59
60 /* Object variables callbacks */
61 static int DeinterlaceCallback( vlc_object_t *, char const *,
62                                 vlc_value_t, vlc_value_t, void * );
63 static int FilterCallback( vlc_object_t *, char const *,
64                            vlc_value_t, vlc_value_t, void * );
65
66 /*****************************************************************************
67  * vout_Request: find a video output thread, create one, or destroy one.
68  *****************************************************************************
69  * This function looks for a video output thread matching the current
70  * properties. If not found, it spawns a new one.
71  *****************************************************************************/
72 vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout,
73                                  unsigned int i_width, unsigned int i_height,
74                                  vlc_fourcc_t i_chroma, unsigned int i_aspect )
75 {
76     if( !i_width || !i_height || !i_chroma )
77     {
78         /* Reattach video output to input before bailing out */
79         if( p_vout )
80         {
81             vlc_object_t *p_playlist;
82
83             p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
84                                           FIND_ANYWHERE );
85
86             if( p_playlist )
87             {
88                 vout_AttachSPU( p_vout, p_this, VLC_FALSE );
89                 vlc_object_detach( p_vout );
90                 vlc_object_attach( p_vout, p_playlist );
91
92                 vlc_object_release( p_playlist );
93             }
94             else
95             {
96                 msg_Dbg( p_this, "cannot find playlist, destroying vout" );
97                 vlc_object_detach( p_vout );
98                 vout_Destroy( p_vout );
99             }
100         }
101         return NULL;
102     }
103
104     /* If a video output was provided, lock it, otherwise look for one. */
105     if( p_vout )
106     {
107         vlc_object_yield( p_vout );
108     }
109     else
110     {
111         p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_CHILD );
112
113         if( !p_vout )
114         {
115             vlc_object_t *p_playlist;
116
117             p_playlist = vlc_object_find( p_this,
118                                           VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
119             if( p_playlist )
120             {
121                 p_vout = vlc_object_find( p_playlist,
122                                           VLC_OBJECT_VOUT, FIND_CHILD );
123                 /* only first children of p_input for unused vout */
124                 if( p_vout && p_vout->p_parent != p_playlist )
125                 {
126                     vlc_object_release( p_vout );
127                     p_vout = NULL;
128                 }
129                 vlc_object_release( p_playlist );
130             }
131         }
132     }
133
134     /* If we now have a video output, check it has the right properties */
135     if( p_vout )
136     {
137         char *psz_filter_chain;
138
139         /* We don't directly check for the "filter" variable for obvious
140          * performance reasons. */
141         if( p_vout->b_filter_change )
142         {
143             psz_filter_chain = config_GetPsz( p_this, "filter" );
144
145             if( psz_filter_chain && !*psz_filter_chain )
146             {
147                 free( psz_filter_chain );
148                 psz_filter_chain = NULL;
149             }
150             if( p_vout->psz_filter_chain && !*p_vout->psz_filter_chain )
151             {
152                 free( p_vout->psz_filter_chain );
153                 p_vout->psz_filter_chain = NULL;
154             }
155
156             if( ( !psz_filter_chain && !p_vout->psz_filter_chain ) ||
157                 ( psz_filter_chain && p_vout->psz_filter_chain &&
158                   !strcmp( psz_filter_chain, p_vout->psz_filter_chain ) ) )
159             {
160                 p_vout->b_filter_change = VLC_FALSE;
161             }
162
163             if( psz_filter_chain ) free( psz_filter_chain );
164         }
165
166         if( ( p_vout->render.i_width != i_width ) ||
167             ( p_vout->render.i_height != i_height ) ||
168             ( p_vout->render.i_chroma != i_chroma ) ||
169             ( p_vout->render.i_aspect != i_aspect
170                     && !p_vout->b_override_aspect ) ||
171             p_vout->b_filter_change )
172         {
173             /* We are not interested in this format, close this vout */
174             vlc_object_detach( p_vout );
175             vlc_object_release( p_vout );
176             vout_Destroy( p_vout );
177             p_vout = NULL;
178         }
179         else
180         {
181             /* This video output is cool! Hijack it. */
182             vlc_object_detach( p_vout );
183             vout_AttachSPU( p_vout, p_this, VLC_TRUE );
184             vlc_object_attach( p_vout, p_this );
185             vlc_object_release( p_vout );
186         }
187     }
188
189     if( !p_vout )
190     {
191         msg_Dbg( p_this, "no usable vout present, spawning one" );
192
193         p_vout = vout_Create( p_this, i_width, i_height, i_chroma, i_aspect );
194     }
195
196     return p_vout;
197 }
198
199 /*****************************************************************************
200  * vout_Create: creates a new video output thread
201  *****************************************************************************
202  * This function creates a new video output thread, and returns a pointer
203  * to its description. On error, it returns NULL.
204  *****************************************************************************/
205 vout_thread_t * __vout_Create( vlc_object_t *p_parent,
206                                unsigned int i_width, unsigned int i_height,
207                                vlc_fourcc_t i_chroma, unsigned int i_aspect )
208 {
209     vout_thread_t  * p_vout;                            /* thread descriptor */
210     input_thread_t * p_input_thread;
211     int              i_index;                               /* loop variable */
212     char           * psz_plugin;
213     vlc_value_t      val, text;
214
215     /* Allocate descriptor */
216     p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
217     if( p_vout == NULL )
218     {
219         msg_Err( p_parent, "out of memory" );
220         return NULL;
221     }
222
223     /* Initialize pictures - translation tables and functions
224      * will be initialized later in InitThread */
225     for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++)
226     {
227         p_vout->p_picture[i_index].pf_lock = NULL;
228         p_vout->p_picture[i_index].pf_unlock = NULL;
229         p_vout->p_picture[i_index].i_status = FREE_PICTURE;
230         p_vout->p_picture[i_index].i_type   = EMPTY_PICTURE;
231         p_vout->p_picture[i_index].b_slow   = 0;
232     }
233
234     /* No images in the heap */
235     p_vout->i_heap_size = 0;
236
237     /* Register the default subpicture channel */
238     p_vout->p_default_channel = NULL;
239     p_vout->i_channel_count = 1;
240
241     /* Initialize the rendering heap */
242     I_RENDERPICTURES = 0;
243     p_vout->render.i_width    = i_width;
244     p_vout->render.i_height   = i_height;
245     p_vout->render.i_chroma   = i_chroma;
246     p_vout->render.i_aspect   = i_aspect;
247
248     p_vout->render.i_rmask    = 0;
249     p_vout->render.i_gmask    = 0;
250     p_vout->render.i_bmask    = 0;
251
252     p_vout->render.i_last_used_pic = -1;
253     p_vout->render.b_allow_modify_pics = 1;
254
255     /* Zero the output heap */
256     I_OUTPUTPICTURES = 0;
257     p_vout->output.i_width    = 0;
258     p_vout->output.i_height   = 0;
259     p_vout->output.i_chroma   = 0;
260     p_vout->output.i_aspect   = 0;
261
262     p_vout->output.i_rmask    = 0;
263     p_vout->output.i_gmask    = 0;
264     p_vout->output.i_bmask    = 0;
265
266     /* Initialize misc stuff */
267     p_vout->i_changes    = 0;
268     p_vout->f_gamma      = 0;
269     p_vout->b_grayscale  = 0;
270     p_vout->b_info       = 0;
271     p_vout->b_interface  = 0;
272     p_vout->b_scale      = 1;
273     p_vout->b_fullscreen = 0;
274     p_vout->i_alignment  = 0;
275     p_vout->render_time  = 10;
276     p_vout->c_fps_samples = 0;
277     p_vout->b_filter_change = 0;
278     p_vout->pf_control = 0;
279     p_vout->p_parent_intf = 0;
280
281     /* Initialize locks */
282     vlc_mutex_init( p_vout, &p_vout->picture_lock );
283     vlc_mutex_init( p_vout, &p_vout->subpicture_lock );
284     vlc_mutex_init( p_vout, &p_vout->change_lock );
285
286     /* Mouse coordinates */
287     var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
288     var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
289     var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
290     var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
291     var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
292
293     /* Initialize subpicture unit */
294     vout_InitSPU( p_vout );
295     vout_AttachSPU( p_vout, p_parent, VLC_TRUE );
296
297     /* Attach the new object now so we can use var inheritance below */
298     vlc_object_attach( p_vout, p_parent );
299
300     /* Take care of some "interface/control" related initialisations */
301     vout_IntfInit( p_vout );
302
303     p_vout->b_override_aspect = VLC_FALSE;
304
305     /* If the parent is not a VOUT object, that means we are at the start of
306      * the video output pipe */
307     if( p_parent->i_object_type != VLC_OBJECT_VOUT )
308     {
309         var_Get( p_vout, "aspect-ratio", &val );
310
311         /* Check whether the user tried to override aspect ratio */
312         if( val.psz_string )
313         {
314             unsigned int i_new_aspect = i_aspect;
315             char *psz_parser = strchr( val.psz_string, ':' );
316
317             if( psz_parser )
318             {
319                 *psz_parser++ = '\0';
320                 i_new_aspect = atoi( val.psz_string ) * VOUT_ASPECT_FACTOR
321                                                       / atoi( psz_parser );
322             }
323             else
324             {
325                 i_new_aspect = i_width * VOUT_ASPECT_FACTOR
326                                        * atof( val.psz_string )
327                                        / i_height;
328             }
329
330             free( val.psz_string );
331
332             if( i_new_aspect && i_new_aspect != i_aspect )
333             {
334                 int i_aspect_x, i_aspect_y;
335
336                 AspectRatio( i_new_aspect, &i_aspect_x, &i_aspect_y );
337
338                 msg_Dbg( p_vout, "overriding source aspect ratio to %i:%i",
339                          i_aspect_x, i_aspect_y );
340
341                 p_vout->render.i_aspect = i_new_aspect;
342
343                 p_vout->b_override_aspect = VLC_TRUE;
344             }
345         }
346
347         /* Look for the default filter configuration */
348         var_Create( p_vout, "filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
349         var_Get( p_vout, "filter", &val );
350         p_vout->psz_filter_chain = val.psz_string;
351     }
352     else
353     {
354         /* continue the parent's filter chain */
355         char *psz_end;
356
357         psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' );
358         if( psz_end && *(psz_end+1) )
359             p_vout->psz_filter_chain = strdup( psz_end+1 );
360         else p_vout->psz_filter_chain = NULL;
361     }
362
363     /* Choose the video output module */
364     if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain )
365     {
366         var_Create( p_vout, "vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
367         var_Get( p_vout, "vout", &val );
368         psz_plugin = val.psz_string;
369     }
370     else
371     {
372         /* the filter chain is a string list of filters separated by double
373          * colons */
374         char *psz_end;
375
376         psz_end = strchr( p_vout->psz_filter_chain, ':' );
377         if( psz_end )
378             psz_plugin = strndup( p_vout->psz_filter_chain,
379                                   psz_end - p_vout->psz_filter_chain );
380         else psz_plugin = strdup( p_vout->psz_filter_chain );
381     }
382
383     /* Initialize the dimensions of the video window */
384     InitWindowSize( p_vout, &p_vout->i_window_width,
385                     &p_vout->i_window_height );
386
387     /* Create the vout thread */
388     p_vout->p_module = module_Need( p_vout,
389         ( p_vout->psz_filter_chain && *p_vout->psz_filter_chain ) ?
390         "video filter" : "video output", psz_plugin, 0 );
391
392     if( psz_plugin ) free( psz_plugin );
393     if( p_vout->p_module == NULL )
394     {
395         msg_Err( p_vout, "no suitable vout module" );
396         vlc_object_detach( p_vout );
397         vlc_object_destroy( p_vout );
398         return NULL;
399     }
400
401     /* Create a few object variables for interface interaction */
402     var_Create( p_vout, "deinterlace", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
403     text.psz_string = _("Deinterlace");
404     var_Change( p_vout, "deinterlace", VLC_VAR_SETTEXT, &text, NULL );
405     val.psz_string = ""; text.psz_string = _("Disable");
406     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
407     val.psz_string = "discard"; text.psz_string = _("Discard");
408     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
409     val.psz_string = "blend"; text.psz_string = _("Blend");
410     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
411     val.psz_string = "mean"; text.psz_string = _("Mean");
412     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
413     val.psz_string = "bob"; text.psz_string = _("Bob");
414     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
415     val.psz_string = "linear"; text.psz_string = _("Linear");
416     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
417     if( var_Get( p_vout, "deinterlace-mode", &val ) == VLC_SUCCESS )
418     {
419         var_Set( p_vout, "deinterlace", val );
420         if( val.psz_string ) free( val.psz_string );
421     }
422     var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );
423
424
425     var_Create( p_vout, "filter", VLC_VAR_STRING );
426     text.psz_string = _("Filters");
427     var_Change( p_vout, "filter", VLC_VAR_SETTEXT, &text, NULL );
428     var_Change( p_vout, "filter", VLC_VAR_INHERITVALUE, &val, NULL );
429     if( val.psz_string )
430     {
431         var_Set( p_vout, "filter", val );
432         free( val.psz_string );
433     }
434     var_AddCallback( p_vout, "filter", FilterCallback, NULL );
435
436     /* Calculate delay created by internal caching */
437     p_input_thread = (input_thread_t *)vlc_object_find( p_vout,
438                                            VLC_OBJECT_INPUT, FIND_ANYWHERE );
439     if( p_input_thread )
440     {
441         p_vout->i_pts_delay = p_input_thread->i_pts_delay;
442         vlc_object_release( p_input_thread );
443     }
444     else
445     {
446         p_vout->i_pts_delay = DEFAULT_PTS_DELAY;
447     }
448
449     if( vlc_thread_create( p_vout, "video output", RunThread,
450                            VLC_THREAD_PRIORITY_OUTPUT, VLC_TRUE ) )
451     {
452         msg_Err( p_vout, "out of memory" );
453         module_Unneed( p_vout, p_vout->p_module );
454         vlc_object_detach( p_vout );
455         vlc_object_destroy( p_vout );
456         return NULL;
457     }
458
459     if( p_vout->b_error )
460     {
461         msg_Err( p_vout, "video output creation failed" );
462
463         /* Make sure the thread is destroyed */
464         p_vout->b_die = VLC_TRUE;
465
466         vlc_thread_join( p_vout );
467
468         vlc_object_detach( p_vout );
469         vlc_object_destroy( p_vout );
470         return NULL;
471     }
472
473     return p_vout;
474 }
475
476 /*****************************************************************************
477  * vout_Destroy: destroys a previously created video output
478  *****************************************************************************
479  * Destroy a terminated thread.
480  * The function will request a destruction of the specified thread. If pi_error
481  * is NULL, it will return once the thread is destroyed. Else, it will be
482  * update using one of the THREAD_* constants.
483  *****************************************************************************/
484 void vout_Destroy( vout_thread_t *p_vout )
485 {
486     vlc_object_t *p_playlist;
487
488     /* Request thread destruction */
489     p_vout->b_die = VLC_TRUE;
490     vlc_thread_join( p_vout );
491
492     var_Destroy( p_vout, "intf-change" );
493
494     p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
495                                   FIND_ANYWHERE );
496
497     if( p_vout->psz_filter_chain ) free( p_vout->psz_filter_chain );
498
499     /* Free structure */
500     vlc_object_destroy( p_vout );
501
502     /* If it was the last vout, tell the interface to show up */
503     if( p_playlist != NULL )
504     {
505         vout_thread_t *p_another_vout = vlc_object_find( p_playlist,
506                                             VLC_OBJECT_VOUT, FIND_ANYWHERE );
507         if( p_another_vout == NULL )
508         {
509             vlc_value_t val;
510             val.b_bool = VLC_TRUE;
511             var_Set( p_playlist, "intf-show", val );
512         }
513         else
514         {
515             vlc_object_release( p_another_vout );
516         }
517         vlc_object_release( p_playlist );
518     }
519 }
520
521 /*****************************************************************************
522  * InitThread: initialize video output thread
523  *****************************************************************************
524  * This function is called from RunThread and performs the second step of the
525  * initialization. It returns 0 on success. Note that the thread's flag are not
526  * modified inside this function.
527  *****************************************************************************/
528 static int InitThread( vout_thread_t *p_vout )
529 {
530     int i, i_aspect_x, i_aspect_y;
531
532     vlc_mutex_lock( &p_vout->change_lock );
533
534 #ifdef STATS
535     p_vout->c_loops = 0;
536 #endif
537
538     /* Initialize output method, it allocates direct buffers for us */
539     if( p_vout->pf_init( p_vout ) )
540     {
541         vlc_mutex_unlock( &p_vout->change_lock );
542         return VLC_EGENERIC;
543     }
544
545     if( !I_OUTPUTPICTURES )
546     {
547         msg_Err( p_vout, "plugin was unable to allocate at least "
548                          "one direct buffer" );
549         p_vout->pf_end( p_vout );
550         vlc_mutex_unlock( &p_vout->change_lock );
551         return VLC_EGENERIC;
552     }
553
554     if( I_OUTPUTPICTURES > VOUT_MAX_PICTURES )
555     {
556         msg_Err( p_vout, "plugin allocated too many direct buffers, "
557                          "our internal buffers must have overflown." );
558         p_vout->pf_end( p_vout );
559         vlc_mutex_unlock( &p_vout->change_lock );
560         return VLC_EGENERIC;
561     }
562
563     msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
564
565 #if 0
566     if( !p_vout->psz_filter_chain )
567     {
568         char *psz_aspect = config_GetPsz( p_vout, "pixel-ratio" );
569
570         if( psz_aspect )
571         {
572             int i_new_aspect = p_vout->output.i_width * VOUT_ASPECT_FACTOR
573                                                       * atof( psz_aspect )
574                                                       / p_vout->output.i_height;
575             free( psz_aspect );
576
577             if( i_new_aspect && i_new_aspect != p_vout->output.i_aspect )
578             {
579                 AspectRatio( i_new_aspect, &i_aspect_x, &i_aspect_y );
580
581                 msg_Dbg( p_vout, "output ratio forced to %i:%i\n",
582                          i_aspect_x, i_aspect_y );
583                 p_vout->output.i_aspect = i_new_aspect;
584             }
585         }
586     }
587 #endif
588
589     AspectRatio( p_vout->render.i_aspect, &i_aspect_x, &i_aspect_y );
590     msg_Dbg( p_vout,
591              "picture in %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i",
592              p_vout->render.i_width, p_vout->render.i_height,
593              p_vout->render.i_chroma, (char*)&p_vout->render.i_chroma,
594              i_aspect_x, i_aspect_y );
595
596     AspectRatio( p_vout->output.i_aspect, &i_aspect_x, &i_aspect_y );
597     msg_Dbg( p_vout,
598              "picture out %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i",
599              p_vout->output.i_width, p_vout->output.i_height,
600              p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma,
601              i_aspect_x, i_aspect_y );
602
603     /* Calculate shifts from system-updated masks */
604     MaskToShift( &p_vout->output.i_lrshift, &p_vout->output.i_rrshift,
605                  p_vout->output.i_rmask );
606     MaskToShift( &p_vout->output.i_lgshift, &p_vout->output.i_rgshift,
607                  p_vout->output.i_gmask );
608     MaskToShift( &p_vout->output.i_lbshift, &p_vout->output.i_rbshift,
609                  p_vout->output.i_bmask );
610
611     /* Check whether we managed to create direct buffers similar to
612      * the render buffers, ie same size and chroma */
613     if( ( p_vout->output.i_width == p_vout->render.i_width )
614      && ( p_vout->output.i_height == p_vout->render.i_height )
615      && ( vout_ChromaCmp( p_vout->output.i_chroma, p_vout->render.i_chroma ) ) )
616     {
617         /* Cool ! We have direct buffers, we can ask the decoder to
618          * directly decode into them ! Map the first render buffers to
619          * the first direct buffers, but keep the first direct buffer
620          * for memcpy operations */
621         p_vout->b_direct = 1;
622
623         for( i = 1; i < VOUT_MAX_PICTURES; i++ )
624         {
625             if( p_vout->p_picture[ i ].i_type != DIRECT_PICTURE &&
626                 I_RENDERPICTURES >= VOUT_MIN_DIRECT_PICTURES - 1 &&
627                 p_vout->p_picture[ i - 1 ].i_type == DIRECT_PICTURE )
628             {
629                 /* We have enough direct buffers so there's no need to
630                  * try to use system memory buffers. */
631                 break;
632             }
633             PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
634             I_RENDERPICTURES++;
635         }
636
637         msg_Dbg( p_vout, "direct render, mapping "
638                  "render pictures 0-%i to system pictures 1-%i",
639                  VOUT_MAX_PICTURES - 2, VOUT_MAX_PICTURES - 1 );
640     }
641     else
642     {
643         /* Rats... Something is wrong here, we could not find an output
644          * plugin able to directly render what we decode. See if we can
645          * find a chroma plugin to do the conversion */
646         p_vout->b_direct = 0;
647
648         /* Choose the best module */
649         p_vout->chroma.p_module = module_Need( p_vout, "chroma", NULL, 0 );
650
651         if( p_vout->chroma.p_module == NULL )
652         {
653             msg_Err( p_vout, "no chroma module for %4.4s to %4.4s",
654                      (char*)&p_vout->render.i_chroma,
655                      (char*)&p_vout->output.i_chroma );
656             p_vout->pf_end( p_vout );
657             vlc_mutex_unlock( &p_vout->change_lock );
658             return VLC_EGENERIC;
659         }
660
661         msg_Dbg( p_vout, "indirect render, mapping "
662                  "render pictures 0-%i to system pictures %i-%i",
663                  VOUT_MAX_PICTURES - 1, I_OUTPUTPICTURES,
664                  I_OUTPUTPICTURES + VOUT_MAX_PICTURES - 1 );
665
666         /* Append render buffers after the direct buffers */
667         for( i = I_OUTPUTPICTURES; i < 2 * VOUT_MAX_PICTURES; i++ )
668         {
669             PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
670             I_RENDERPICTURES++;
671
672             /* Check if we have enough render pictures */
673             if( I_RENDERPICTURES == VOUT_MAX_PICTURES )
674                 break;
675         }
676     }
677
678     /* Link pictures back to their heap */
679     for( i = 0 ; i < I_RENDERPICTURES ; i++ )
680     {
681         PP_RENDERPICTURE[ i ]->p_heap = &p_vout->render;
682     }
683
684     for( i = 0 ; i < I_OUTPUTPICTURES ; i++ )
685     {
686         PP_OUTPUTPICTURE[ i ]->p_heap = &p_vout->output;
687     }
688
689 /* XXX XXX mark thread ready */
690     return VLC_SUCCESS;
691 }
692
693 /*****************************************************************************
694  * RunThread: video output thread
695  *****************************************************************************
696  * Video output thread. This function does only returns when the thread is
697  * terminated. It handles the pictures arriving in the video heap and the
698  * display device events.
699  *****************************************************************************/
700 static void RunThread( vout_thread_t *p_vout)
701 {
702     int             i_index;                                /* index in heap */
703     int             i_idle_loops = 0;  /* loops without displaying a picture */
704     mtime_t         current_date;                            /* current date */
705     mtime_t         display_date;                            /* display date */
706
707     picture_t *     p_picture;                            /* picture pointer */
708     picture_t *     p_last_picture = NULL;                   /* last picture */
709     picture_t *     p_directbuffer;              /* direct buffer to display */
710
711     subpicture_t *  p_subpic;                          /* subpicture pointer */
712
713     /*
714      * Initialize thread
715      */
716     p_vout->b_error = InitThread( p_vout );
717
718     /* signal the creation of the vout */
719     vlc_thread_ready( p_vout );
720
721     if( p_vout->b_error )
722     {
723         /* Destroy thread structures allocated by Create and InitThread */
724         DestroyThread( p_vout );
725         return;
726     }
727
728     /*
729      * Main loop - it is not executed if an error occurred during
730      * initialization
731      */
732     while( (!p_vout->b_die) && (!p_vout->b_error) )
733     {
734         /* Initialize loop variables */
735         p_picture = NULL;
736         display_date = 0;
737         current_date = mdate();
738
739 #if 0
740         p_vout->c_loops++;
741         if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
742         {
743             msg_Dbg( p_vout, "picture heap: %d/%d",
744                      I_RENDERPICTURES, p_vout->i_heap_size );
745         }
746 #endif
747
748         /*
749          * Find the picture to display (the one with the earliest date).
750          * This operation does not need lock, since only READY_PICTUREs
751          * are handled. */
752         for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
753         {
754             if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
755                 && ( (p_picture == NULL) ||
756                      (PP_RENDERPICTURE[i_index]->date < display_date) ) )
757             {
758                 p_picture = PP_RENDERPICTURE[i_index];
759                 display_date = p_picture->date;
760             }
761         }
762
763         if( p_picture )
764         {
765             /* If we met the last picture, parse again to see whether there is
766              * a more appropriate one. */
767             if( p_picture == p_last_picture )
768             {
769                 for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
770                 {
771                     if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
772                         && (PP_RENDERPICTURE[i_index] != p_last_picture)
773                         && ((p_picture == p_last_picture) ||
774                             (PP_RENDERPICTURE[i_index]->date < display_date)) )
775                     {
776                         p_picture = PP_RENDERPICTURE[i_index];
777                         display_date = p_picture->date;
778                     }
779                 }
780             }
781
782             /* If we found better than the last picture, destroy it */
783             if( p_last_picture && p_picture != p_last_picture )
784             {
785                 vlc_mutex_lock( &p_vout->picture_lock );
786                 if( p_last_picture->i_refcount )
787                 {
788                     p_last_picture->i_status = DISPLAYED_PICTURE;
789                 }
790                 else
791                 {
792                     p_last_picture->i_status = DESTROYED_PICTURE;
793                     p_vout->i_heap_size--;
794                 }
795                 vlc_mutex_unlock( &p_vout->picture_lock );
796                 p_last_picture = NULL;
797             }
798
799             /* Compute FPS rate */
800             p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ]
801                 = display_date;
802
803             if( !p_picture->b_force &&
804                 p_picture != p_last_picture &&
805                 display_date < current_date + p_vout->render_time )
806             {
807                 /* Picture is late: it will be destroyed and the thread
808                  * will directly choose the next picture */
809                 vlc_mutex_lock( &p_vout->picture_lock );
810                 if( p_picture->i_refcount )
811                 {
812                     /* Pretend we displayed the picture, but don't destroy
813                      * it since the decoder might still need it. */
814                     p_picture->i_status = DISPLAYED_PICTURE;
815                 }
816                 else
817                 {
818                     /* Destroy the picture without displaying it */
819                     p_picture->i_status = DESTROYED_PICTURE;
820                     p_vout->i_heap_size--;
821                 }
822                 msg_Warn( p_vout, "late picture skipped ("I64Fd")",
823                                   current_date - display_date );
824                 vlc_mutex_unlock( &p_vout->picture_lock );
825
826                 continue;
827             }
828
829             if( display_date >
830                 current_date + p_vout->i_pts_delay + VOUT_BOGUS_DELAY )
831             {
832                 /* Picture is waaay too early: it will be destroyed */
833                 vlc_mutex_lock( &p_vout->picture_lock );
834                 if( p_picture->i_refcount )
835                 {
836                     /* Pretend we displayed the picture, but don't destroy
837                      * it since the decoder might still need it. */
838                     p_picture->i_status = DISPLAYED_PICTURE;
839                 }
840                 else
841                 {
842                     /* Destroy the picture without displaying it */
843                     p_picture->i_status = DESTROYED_PICTURE;
844                     p_vout->i_heap_size--;
845                 }
846                 msg_Warn( p_vout, "vout warning: early picture skipped "
847                           "("I64Fd")", display_date - current_date
848                           - p_vout->i_pts_delay );
849                 vlc_mutex_unlock( &p_vout->picture_lock );
850
851                 continue;
852             }
853
854             if( display_date > current_date + VOUT_DISPLAY_DELAY )
855             {
856                 /* A picture is ready to be rendered, but its rendering date
857                  * is far from the current one so the thread will perform an
858                  * empty loop as if no picture were found. The picture state
859                  * is unchanged */
860                 p_picture    = NULL;
861                 display_date = 0;
862             }
863             else if( p_picture == p_last_picture )
864             {
865                 /* We are asked to repeat the previous picture, but we first
866                  * wait for a couple of idle loops */
867                 if( i_idle_loops < 4 )
868                 {
869                     p_picture    = NULL;
870                     display_date = 0;
871                 }
872                 else
873                 {
874                     /* We set the display date to something high, otherwise
875                      * we'll have lots of problems with late pictures */
876                     display_date = current_date + p_vout->render_time;
877                 }
878             }
879         }
880
881         if( p_picture == NULL )
882         {
883             i_idle_loops++;
884         }
885
886         /*
887          * Check for subpictures to display
888          */
889         p_subpic = vout_SortSubPictures( p_vout, display_date );
890
891         /*
892          * Perform rendering
893          */
894         p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );
895
896         /*
897          * Call the plugin-specific rendering method if there is one
898          */
899         if( p_picture != NULL && p_directbuffer != NULL && p_vout->pf_render )
900         {
901             /* Render the direct buffer returned by vout_RenderPicture */
902             p_vout->pf_render( p_vout, p_directbuffer );
903         }
904
905         /*
906          * Sleep, wake up
907          */
908         if( display_date != 0 && p_directbuffer != NULL )
909         {
910             mtime_t current_render_time = mdate() - current_date;
911             /* if render time is very large we don't include it in the mean */
912             if( current_render_time < p_vout->render_time +
913                 VOUT_DISPLAY_DELAY )
914             {
915                 /* Store render time using a sliding mean weighting to
916                  * current value in a 3 to 1 ratio*/
917                 p_vout->render_time *= 3;
918                 p_vout->render_time += current_render_time;
919                 p_vout->render_time >>= 2;
920             }
921         }
922
923         /* Give back change lock */
924         vlc_mutex_unlock( &p_vout->change_lock );
925
926         /* Sleep a while or until a given date */
927         if( display_date != 0 )
928         {
929             /* If there are filters in the chain, better give them the picture
930              * in advance */
931             if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain )
932             {
933                 mwait( display_date - VOUT_MWAIT_TOLERANCE );
934             }
935         }
936         else
937         {
938             msleep( VOUT_IDLE_SLEEP );
939         }
940
941         /* On awakening, take back lock and send immediately picture
942          * to display. */
943         vlc_mutex_lock( &p_vout->change_lock );
944
945         /*
946          * Display the previously rendered picture
947          */
948         if( p_picture != NULL && p_directbuffer != NULL )
949         {
950             /* Display the direct buffer returned by vout_RenderPicture */
951             if( p_vout->pf_display )
952             {
953                 p_vout->pf_display( p_vout, p_directbuffer );
954             }
955
956             /* Tell the vout this was the last picture and that it does not
957              * need to be forced anymore. */
958             p_last_picture = p_picture;
959             p_last_picture->b_force = 0;
960         }
961
962         if( p_picture != NULL )
963         {
964             /* Reinitialize idle loop count */
965             i_idle_loops = 0;
966         }
967
968         /*
969          * Check events and manage thread
970          */
971         if( p_vout->pf_manage && p_vout->pf_manage( p_vout ) )
972         {
973             /* A fatal error occurred, and the thread must terminate
974              * immediately, without displaying anything - setting b_error to 1
975              * causes the immediate end of the main while() loop. */
976             p_vout->b_error = 1;
977         }
978
979         if( p_vout->i_changes & VOUT_SIZE_CHANGE )
980         {
981             /* this must only happen when the vout plugin is incapable of
982              * rescaling the picture itself. In this case we need to destroy
983              * the current picture buffers and recreate new ones with the right
984              * dimensions */
985             int i;
986
987             p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
988
989             p_vout->pf_end( p_vout );
990             for( i = 0; i < I_OUTPUTPICTURES; i++ )
991                  p_vout->p_picture[ i ].i_status = FREE_PICTURE;
992
993             I_OUTPUTPICTURES = 0;
994             if( p_vout->pf_init( p_vout ) )
995             {
996                 msg_Err( p_vout, "cannot resize display" );
997                 /* FIXME: pf_end will be called again in EndThread() */
998                 p_vout->b_error = 1;
999             }
1000
1001             /* Need to reinitialise the chroma plugin */
1002             if( p_vout->chroma.p_module )
1003             {
1004                 if( p_vout->chroma.p_module->pf_deactivate )
1005                     p_vout->chroma.p_module->pf_deactivate( VLC_OBJECT(p_vout) );
1006                 p_vout->chroma.p_module->pf_activate( VLC_OBJECT(p_vout) );
1007             }
1008         }
1009
1010         if( p_vout->i_changes & VOUT_PICTURE_BUFFERS_CHANGE )
1011         {
1012             /* This happens when the picture buffers need to be recreated.
1013              * This is useful on multimonitor displays for instance.
1014              *
1015              * Warning: This only works when the vout creates only 1 picture
1016              * buffer!! */
1017             p_vout->i_changes &= ~VOUT_PICTURE_BUFFERS_CHANGE;
1018
1019             if( !p_vout->b_direct )
1020             {
1021                 module_Unneed( p_vout, p_vout->chroma.p_module );
1022             }
1023
1024             vlc_mutex_lock( &p_vout->picture_lock );
1025
1026             p_vout->pf_end( p_vout );
1027
1028             I_OUTPUTPICTURES = I_RENDERPICTURES = 0;
1029
1030             p_vout->b_error = InitThread( p_vout );
1031
1032             vlc_mutex_unlock( &p_vout->picture_lock );
1033         }
1034     }
1035
1036     /*
1037      * Error loop - wait until the thread destruction is requested
1038      */
1039     if( p_vout->b_error )
1040     {
1041         ErrorThread( p_vout );
1042     }
1043
1044     /* End of thread */
1045     EndThread( p_vout );
1046
1047     /* Destroy thread structures allocated by CreateThread */
1048     DestroyThread( p_vout );
1049 }
1050
1051 /*****************************************************************************
1052  * ErrorThread: RunThread() error loop
1053  *****************************************************************************
1054  * This function is called when an error occurred during thread main's loop.
1055  * The thread can still receive feed, but must be ready to terminate as soon
1056  * as possible.
1057  *****************************************************************************/
1058 static void ErrorThread( vout_thread_t *p_vout )
1059 {
1060     /* Wait until a `die' order */
1061     while( !p_vout->b_die )
1062     {
1063         /* Sleep a while */
1064         msleep( VOUT_IDLE_SLEEP );
1065     }
1066 }
1067
1068 /*****************************************************************************
1069  * EndThread: thread destruction
1070  *****************************************************************************
1071  * This function is called when the thread ends after a sucessful
1072  * initialization. It frees all resources allocated by InitThread.
1073  *****************************************************************************/
1074 static void EndThread( vout_thread_t *p_vout )
1075 {
1076     int     i_index;                                        /* index in heap */
1077
1078 #ifdef STATS
1079     {
1080         struct tms cpu_usage;
1081         times( &cpu_usage );
1082
1083         msg_Dbg( p_vout, "cpu usage (user: %d, system: %d)",
1084                  cpu_usage.tms_utime, cpu_usage.tms_stime );
1085     }
1086 #endif
1087
1088     if( !p_vout->b_direct )
1089     {
1090         module_Unneed( p_vout, p_vout->chroma.p_module );
1091     }
1092
1093     /* Destroy all remaining pictures */
1094     for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++ )
1095     {
1096         if ( p_vout->p_picture[i_index].i_type == MEMORY_PICTURE )
1097         {
1098             free( p_vout->p_picture[i_index].p_data_orig );
1099         }
1100     }
1101
1102     /* Destroy subpicture unit */
1103     vout_DestroySPU( p_vout );
1104
1105     /* Destroy translation tables */
1106     p_vout->pf_end( p_vout );
1107
1108     /* Release the change lock */
1109     vlc_mutex_unlock( &p_vout->change_lock );
1110 }
1111
1112 /*****************************************************************************
1113  * DestroyThread: thread destruction
1114  *****************************************************************************
1115  * This function is called when the thread ends. It frees all ressources
1116  * allocated by CreateThread. Status is available at this stage.
1117  *****************************************************************************/
1118 static void DestroyThread( vout_thread_t *p_vout )
1119 {
1120     /* Destroy the locks */
1121     vlc_mutex_destroy( &p_vout->picture_lock );
1122     vlc_mutex_destroy( &p_vout->subpicture_lock );
1123     vlc_mutex_destroy( &p_vout->change_lock );
1124
1125     /* Release the module */
1126     if( p_vout && p_vout->p_module )
1127     {
1128         module_Unneed( p_vout, p_vout->p_module );
1129     }
1130 }
1131
1132 /* following functions are local */
1133
1134 static int ReduceHeight( int i_ratio )
1135 {
1136     int i_dummy = VOUT_ASPECT_FACTOR;
1137     int i_pgcd  = 1;
1138
1139     if( !i_ratio )
1140     {
1141         return i_pgcd;
1142     }
1143
1144     /* VOUT_ASPECT_FACTOR is (2^7 * 3^3 * 5^3), we just check for 2, 3 and 5 */
1145     while( !(i_ratio & 1) && !(i_dummy & 1) )
1146     {
1147         i_ratio >>= 1;
1148         i_dummy >>= 1;
1149         i_pgcd  <<= 1;
1150     }
1151
1152     while( !(i_ratio % 3) && !(i_dummy % 3) )
1153     {
1154         i_ratio /= 3;
1155         i_dummy /= 3;
1156         i_pgcd  *= 3;
1157     }
1158
1159     while( !(i_ratio % 5) && !(i_dummy % 5) )
1160     {
1161         i_ratio /= 5;
1162         i_dummy /= 5;
1163         i_pgcd  *= 5;
1164     }
1165
1166     return i_pgcd;
1167 }
1168
1169 static void AspectRatio( int i_aspect, int *i_aspect_x, int *i_aspect_y )
1170 {
1171     unsigned int i_pgcd = ReduceHeight( i_aspect );
1172     *i_aspect_x = i_aspect / i_pgcd;
1173     *i_aspect_y = VOUT_ASPECT_FACTOR / i_pgcd;
1174 }
1175
1176 /*****************************************************************************
1177  * BinaryLog: computes the base 2 log of a binary value
1178  *****************************************************************************
1179  * This functions is used by MaskToShift, to get a bit index from a binary
1180  * value.
1181  *****************************************************************************/
1182 static int BinaryLog( uint32_t i )
1183 {
1184     int i_log = 0;
1185
1186     if( i == 0 ) return -31337;
1187
1188     if( i & 0xffff0000 ) i_log += 16;
1189     if( i & 0xff00ff00 ) i_log += 8;
1190     if( i & 0xf0f0f0f0 ) i_log += 4;
1191     if( i & 0xcccccccc ) i_log += 2;
1192     if( i & 0xaaaaaaaa ) i_log += 1;
1193
1194     return i_log;
1195 }
1196
1197 /*****************************************************************************
1198  * MaskToShift: transform a color mask into right and left shifts
1199  *****************************************************************************
1200  * This function is used for obtaining color shifts from masks.
1201  *****************************************************************************/
1202 static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask )
1203 {
1204     uint32_t i_low, i_high;            /* lower hand higher bits of the mask */
1205
1206     if( !i_mask )
1207     {
1208         *pi_left = *pi_right = 0;
1209         return;
1210     }
1211
1212     /* Get bits */
1213     i_low =  i_mask & (- (int32_t)i_mask);          /* lower bit of the mask */
1214     i_high = i_mask + i_low;                       /* higher bit of the mask */
1215
1216     /* Transform bits into an index */
1217     i_low =  BinaryLog (i_low);
1218     i_high = BinaryLog (i_high);
1219
1220     /* Update pointers and return */
1221     *pi_left =   i_low;
1222     *pi_right = (8 - i_high + i_low);
1223 }
1224
1225 /*****************************************************************************
1226  * InitWindowSize: find the initial dimensions the video window should have.
1227  *****************************************************************************
1228  * This function will check the "width", "height" and "zoom" config options and
1229  * will calculate the size that the video window should have.
1230  *****************************************************************************/
1231 static void InitWindowSize( vout_thread_t *p_vout, int *pi_width,
1232                             int *pi_height )
1233 {
1234     vlc_value_t val;
1235     int i_width, i_height;
1236     uint64_t ll_zoom;
1237
1238 #define FP_FACTOR 1000                             /* our fixed point factor */
1239
1240     var_Get( p_vout, "align", &val );
1241     p_vout->i_alignment = val.i_int;
1242
1243     var_Get( p_vout, "width", &val );
1244     i_width = val.i_int;
1245     var_Get( p_vout, "height", &val );
1246     i_height = val.i_int;
1247     var_Get( p_vout, "zoom", &val );
1248     ll_zoom = (uint64_t)( FP_FACTOR * val.f_float );
1249
1250     if( i_width > 0 && i_height > 0)
1251     {
1252         *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
1253         *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
1254         return;
1255     }
1256     else if( i_width > 0 )
1257     {
1258         *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
1259         *pi_height = (int)( i_width * ll_zoom * VOUT_ASPECT_FACTOR /
1260                             p_vout->render.i_aspect / FP_FACTOR );
1261         return;
1262     }
1263     else if( i_height > 0 )
1264     {
1265         *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
1266         *pi_width = (int)( i_height * ll_zoom * p_vout->render.i_aspect /
1267                            VOUT_ASPECT_FACTOR / FP_FACTOR );
1268         return;
1269     }
1270
1271     if( p_vout->render.i_height * p_vout->render.i_aspect
1272         >= p_vout->render.i_width * VOUT_ASPECT_FACTOR )
1273     {
1274         *pi_width = (int)( p_vout->render.i_height * ll_zoom
1275           * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR / FP_FACTOR );
1276         *pi_height = (int)( p_vout->render.i_height * ll_zoom / FP_FACTOR );
1277     }
1278     else
1279     {
1280         *pi_width = (int)( p_vout->render.i_width * ll_zoom / FP_FACTOR );
1281         *pi_height = (int)( p_vout->render.i_width * ll_zoom
1282           * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect / FP_FACTOR );
1283     }
1284
1285 #undef FP_FACTOR
1286 }
1287
1288 /*****************************************************************************
1289  * vout_VarCallback: generic callback for intf variables
1290  *****************************************************************************/
1291 int vout_VarCallback( vlc_object_t * p_this, const char * psz_variable,
1292                       vlc_value_t old_value, vlc_value_t new_value,
1293                       void * unused )
1294 {
1295     vout_thread_t * p_vout = (vout_thread_t *)p_this;
1296     vlc_value_t val;
1297     val.b_bool = VLC_TRUE;
1298     var_Set( p_vout, "intf-change", val );
1299     return VLC_SUCCESS;
1300 }
1301
1302 /*****************************************************************************
1303  * object variables callbacks: a bunch of object variables are used by the
1304  * interfaces to interact with the vout.
1305  *****************************************************************************/
1306 static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
1307                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
1308 {
1309     vout_thread_t *p_vout = (vout_thread_t *)p_this;
1310     input_thread_t *p_input;
1311     vlc_value_t val;
1312
1313     char *psz_mode = newval.psz_string;
1314     char *psz_filter;
1315
1316     psz_filter = config_GetPsz( p_vout, "filter" );
1317
1318     if( !psz_mode || !*psz_mode )
1319     {
1320         config_PutPsz( p_vout, "filter", "" );
1321     }
1322     else
1323     {
1324         if( !psz_filter || !*psz_filter )
1325         {
1326             config_PutPsz( p_vout, "filter", "deinterlace" );
1327         }
1328         else
1329         {
1330             if( strstr( psz_filter, "deinterlace" ) == NULL )
1331             {
1332                 psz_filter = realloc( psz_filter, strlen( psz_filter ) + 20 );
1333                 strcat( psz_filter, ",deinterlace" );
1334             }
1335             config_PutPsz( p_vout, "filter", psz_filter );
1336         }
1337     }
1338
1339     if( psz_filter ) free( psz_filter );
1340
1341
1342     p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT,
1343                                                  FIND_PARENT );
1344     if( !p_input ) return VLC_EGENERIC;
1345
1346     if( psz_mode && *psz_mode )
1347     {
1348         val.psz_string = psz_mode;
1349         var_Set( p_vout, "deinterlace-mode", val );
1350         /* Modify input as well because the vout might have to be restarted */
1351         var_Create( p_input, "deinterlace-mode", VLC_VAR_STRING );
1352         var_Set( p_input, "deinterlace-mode", val );
1353     }
1354
1355     /* Now restart current video stream */
1356     var_Get( p_input, "video-es", &val );
1357     if( val.i_int >= 0 )
1358     {
1359         p_vout->b_filter_change = VLC_TRUE;
1360         var_Set( p_input, "video-es", (vlc_value_t)-VIDEO_ES );
1361         var_Set( p_input, "video-es", val );
1362     }
1363
1364     vlc_object_release( p_input );
1365
1366     val.b_bool = VLC_TRUE;
1367     var_Set( p_vout, "intf-change", val );
1368     return VLC_SUCCESS;
1369 }
1370
1371 static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd,
1372                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
1373 {
1374     vout_thread_t *p_vout = (vout_thread_t *)p_this;
1375     input_thread_t *p_input;
1376     vlc_value_t val;
1377
1378     p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT,
1379                                                  FIND_PARENT );
1380
1381     if (!p_input)
1382     {
1383         msg_Err( p_vout, "Input not found" );
1384         return( VLC_EGENERIC );
1385     }
1386
1387     /* Now restart current video stream */
1388     var_Get( p_input, "video-es", &val );
1389     if( val.i_int >= 0 )
1390     {
1391         p_vout->b_filter_change = VLC_TRUE;
1392         var_Set( p_input, "video-es", (vlc_value_t)-VIDEO_ES );
1393         var_Set( p_input, "video-es", val );
1394     }
1395
1396     vlc_object_release( p_input );
1397
1398     val.b_bool = VLC_TRUE;
1399     var_Set( p_vout, "intf-change", val );
1400     return VLC_SUCCESS;
1401 }