video_output.c 46.6 KB
Newer Older
1
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
2 3 4
 * video_output.c : video output thread
 * This module describes the programming interface for video output threads.
 * It includes functions allowing to open a new thread, send pictures to a
5 6
 * thread, and destroy a previously oppened video output thread.
 *****************************************************************************
7
 * Copyright (C) 2000-2001 VideoLAN
gbazin's avatar
 
gbazin committed
8
 * $Id: video_output.c,v 1.231 2003/07/29 22:20:53 gbazin Exp $
9
 *
Sam Hocevar's avatar
 
Sam Hocevar committed
10
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
11 12 13 14 15
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
Sam Hocevar's avatar
Sam Hocevar committed
16
 *
17 18
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 20
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
21
 *
22 23 24
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
25
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
26

27
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
28
 * Preamble
29
 *****************************************************************************/
30
#include <stdlib.h>                                                /* free() */
Vincent Seguin's avatar
Vincent Seguin committed
31

32
#include <vlc/vlc.h>
Sam Hocevar's avatar
 
Sam Hocevar committed
33

34 35
#ifdef HAVE_SYS_TIMES_H
#   include <sys/times.h>
36
#endif
37

38
#include "vlc_video.h"
Michel Kaempf's avatar
Michel Kaempf committed
39
#include "video_output.h"
gbazin's avatar
 
gbazin committed
40
#include <vlc/input.h>                 /* for input_thread_t and i_pts_delay */
41

42 43 44 45
#if defined( SYS_DARWIN )
#include "darwin_specific.h"
#endif

46
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
47
 * Local prototypes
48
 *****************************************************************************/
49 50 51 52 53
static int      InitThread        ( vout_thread_t * );
static void     RunThread         ( vout_thread_t * );
static void     ErrorThread       ( vout_thread_t * );
static void     EndThread         ( vout_thread_t * );
static void     DestroyThread     ( vout_thread_t * );
Sam Hocevar's avatar
 
Sam Hocevar committed
54

Sam Hocevar's avatar
 
Sam Hocevar committed
55
static int      ReduceHeight      ( int );
56 57
static int      BinaryLog         ( uint32_t );
static void     MaskToShift       ( int *, int *, uint32_t );
gbazin's avatar
 
gbazin committed
58
static void     InitWindowSize    ( vout_thread_t *, int *, int * );
Michel Kaempf's avatar
Michel Kaempf committed
59

gbazin's avatar
 
gbazin committed
60 61 62
/* Object variables callbacks */
static int FullscreenCallback( vlc_object_t *, char const *,
                               vlc_value_t, vlc_value_t, void * );
gbazin's avatar
 
gbazin committed
63 64
static int DeinterlaceCallback( vlc_object_t *, char const *,
                                vlc_value_t, vlc_value_t, void * );
gbazin's avatar
 
gbazin committed
65

66
/*****************************************************************************
67 68 69 70 71 72 73 74 75 76 77
 * vout_Request: find a video output thread, create one, or destroy one.
 *****************************************************************************
 * This function looks for a video output thread matching the current
 * properties. If not found, it spawns a new one.
 *****************************************************************************/
vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout,
                                 unsigned int i_width, unsigned int i_height,
                                 vlc_fourcc_t i_chroma, unsigned int i_aspect )
{
    if( !i_width || !i_height || !i_chroma )
    {
gbazin's avatar
 
gbazin committed
78
        /* Reattach video output to input before bailing out */
79 80
        if( p_vout )
        {
gbazin's avatar
 
gbazin committed
81
            vlc_object_t *p_input;
82

gbazin's avatar
 
gbazin committed
83 84
            p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT );

85
            if( p_input )
86 87
            {
                vlc_object_detach( p_vout );
gbazin's avatar
 
gbazin committed
88
                vlc_object_attach( p_vout, p_input );
89 90

                vlc_object_release( p_input );
91 92 93 94
            }
            else
            {
                vlc_object_detach( p_vout );
95
                /* vlc_object_release( p_vout ); */
96 97
                vout_Destroy( p_vout );
            }
98 99 100 101 102 103 104 105 106 107 108 109 110 111 112
        }
        return NULL;
    }

    /* If a video output was provided, lock it, otherwise look for one. */
    if( p_vout )
    {
        vlc_object_yield( p_vout );
    }
    else
    {
        p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_CHILD );

        if( !p_vout )
        {
gbazin's avatar
 
gbazin committed
113 114 115 116 117 118 119
            vlc_object_t *p_input;

            p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT );
            if( p_input )
            {
                p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT,
                                          FIND_CHILD );
120 121 122 123 124 125
                /* only first children of p_input for unused vout */
                if( p_vout && p_vout->p_parent != p_input )
                {
                    vlc_object_release( p_vout );
                    p_vout = NULL;
                }
gbazin's avatar
 
gbazin committed
126 127
                vlc_object_release( p_input );
            }
128 129 130 131 132 133
        }
    }

    /* If we now have a video output, check it has the right properties */
    if( p_vout )
    {
gbazin's avatar
 
gbazin committed
134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159
        char *psz_filter_chain;

        /* We don't directly check for the "filter" variable for obvious
         * performance reasons. */
        if( p_vout->b_filter_change )
        {
            psz_filter_chain = config_GetPsz( p_this, "filter" );

            if( psz_filter_chain && !*psz_filter_chain )
            {
                free( psz_filter_chain );
                psz_filter_chain = NULL;
            }
            if( p_vout->psz_filter_chain && !*p_vout->psz_filter_chain )
            {
                free( p_vout->psz_filter_chain );
                p_vout->psz_filter_chain = NULL;
            }

            if( ( !psz_filter_chain && !p_vout->psz_filter_chain ) ||
                ( psz_filter_chain && p_vout->psz_filter_chain &&
                  !strcmp( psz_filter_chain, p_vout->psz_filter_chain ) ) )
            {
                p_vout->b_filter_change = VLC_FALSE;
            }

gbazin's avatar
 
gbazin committed
160
            if( psz_filter_chain ) free( psz_filter_chain );
gbazin's avatar
 
gbazin committed
161 162
        }

163 164
        if( ( p_vout->render.i_width != i_width ) ||
            ( p_vout->render.i_height != i_height ) ||
gbazin's avatar
 
gbazin committed
165
            ( p_vout->render.i_chroma != i_chroma ) ||
166 167
            ( p_vout->render.i_aspect != i_aspect
                    && !p_vout->b_override_aspect ) ||
gbazin's avatar
 
gbazin committed
168
            p_vout->b_filter_change )
169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196
        {
            /* We are not interested in this format, close this vout */
            vlc_object_detach( p_vout );
            vlc_object_release( p_vout );
            vout_Destroy( p_vout );
            p_vout = NULL;
        }
        else
        {
            /* This video output is cool! Hijack it. */
            vlc_object_detach( p_vout );
            vlc_object_attach( p_vout, p_this );
            vlc_object_release( p_vout );
        }
    }

    if( !p_vout )
    {
        msg_Dbg( p_this, "no usable vout present, spawning one" );

        p_vout = vout_Create( p_this, i_width, i_height, i_chroma, i_aspect );
    }

    return p_vout;
}

/*****************************************************************************
 * vout_Create: creates a new video output thread
197
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
198 199
 * This function creates a new video output thread, and returns a pointer
 * to its description. On error, it returns NULL.
200
 *****************************************************************************/
201 202 203
vout_thread_t * __vout_Create( vlc_object_t *p_parent,
                               unsigned int i_width, unsigned int i_height,
                               vlc_fourcc_t i_chroma, unsigned int i_aspect )
Michel Kaempf's avatar
Michel Kaempf committed
204
{
gbazin's avatar
 
gbazin committed
205 206 207 208
    vout_thread_t  * p_vout;                            /* thread descriptor */
    input_thread_t * p_input_thread;
    int              i_index;                               /* loop variable */
    char           * psz_plugin;
gbazin's avatar
 
gbazin committed
209
    vlc_value_t      val, text;
Michel Kaempf's avatar
Michel Kaempf committed
210

211
    /* Allocate descriptor */
212
    p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
213
    if( p_vout == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
214
    {
215
        msg_Err( p_parent, "out of memory" );
216
        return NULL;
Michel Kaempf's avatar
Michel Kaempf committed
217
    }
218

gbazin's avatar
 
gbazin committed
219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282
    /* Initialize pictures and subpictures - translation tables and functions
     * will be initialized later in InitThread */
    for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES; i_index++)
    {
        p_vout->p_picture[i_index].pf_lock = NULL;
        p_vout->p_picture[i_index].pf_unlock = NULL;
        p_vout->p_picture[i_index].i_status = FREE_PICTURE;
        p_vout->p_picture[i_index].i_type   = EMPTY_PICTURE;
    }

    for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++)
    {
        p_vout->p_subpicture[i_index].i_status = FREE_SUBPICTURE;
        p_vout->p_subpicture[i_index].i_type   = EMPTY_SUBPICTURE;
    }

    /* No images in the heap */
    p_vout->i_heap_size = 0;

    /* Initialize the rendering heap */
    I_RENDERPICTURES = 0;
    p_vout->render.i_width    = i_width;
    p_vout->render.i_height   = i_height;
    p_vout->render.i_chroma   = i_chroma;
    p_vout->render.i_aspect   = i_aspect;

    p_vout->render.i_rmask    = 0;
    p_vout->render.i_gmask    = 0;
    p_vout->render.i_bmask    = 0;

    p_vout->render.i_last_used_pic = -1;
    p_vout->render.b_allow_modify_pics = 1;

    /* Zero the output heap */
    I_OUTPUTPICTURES = 0;
    p_vout->output.i_width    = 0;
    p_vout->output.i_height   = 0;
    p_vout->output.i_chroma   = 0;
    p_vout->output.i_aspect   = 0;

    p_vout->output.i_rmask    = 0;
    p_vout->output.i_gmask    = 0;
    p_vout->output.i_bmask    = 0;

    /* Initialize misc stuff */
    p_vout->i_changes    = 0;
    p_vout->f_gamma      = 0;
    p_vout->b_grayscale  = 0;
    p_vout->b_info       = 0;
    p_vout->b_interface  = 0;
    p_vout->b_scale      = 1;
    p_vout->b_fullscreen = 0;
    p_vout->render_time  = 10;
    p_vout->c_fps_samples = 0;
    p_vout->b_filter_change = 0;

    /* Mouse coordinates */
    var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
    var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
    var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
    var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
    var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
    var_Create( p_vout, "key-pressed", VLC_VAR_STRING );

283 284 285 286
    var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
    val.b_bool = VLC_TRUE;
    var_Set( p_vout, "intf-change", val );

gbazin's avatar
 
gbazin committed
287 288 289 290 291 292 293 294 295 296 297 298 299 300
    /* Initialize locks */
    vlc_mutex_init( p_vout, &p_vout->picture_lock );
    vlc_mutex_init( p_vout, &p_vout->subpicture_lock );
    vlc_mutex_init( p_vout, &p_vout->change_lock );

    /* Attach the new object now so we can use var inheritance below */
    vlc_object_attach( p_vout, p_parent );

    /* Create a few object variables we'll need later on */
    var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
    var_Create( p_vout, "width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
    var_Create( p_vout, "height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
    var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );

301 302
    p_vout->b_override_aspect = VLC_FALSE;

gbazin's avatar
 
gbazin committed
303 304 305
    /* If the parent is not a VOUT object, that means we are at the start of
     * the video output pipe */
    if( p_parent->i_object_type != VLC_OBJECT_VOUT )
Sam Hocevar's avatar
 
Sam Hocevar committed
306
    {
gbazin's avatar
 
gbazin committed
307
        var_Get( p_vout, "aspect-ratio", &val );
308 309

        /* Check whether the user tried to override aspect ratio */
gbazin's avatar
 
gbazin committed
310
        if( val.psz_string )
311 312
        {
            unsigned int i_new_aspect = i_aspect;
gbazin's avatar
 
gbazin committed
313
            char *psz_parser = strchr( val.psz_string, ':' );
314 315 316 317

            if( psz_parser )
            {
                *psz_parser++ = '\0';
gbazin's avatar
 
gbazin committed
318 319
                i_new_aspect = atoi( val.psz_string ) * VOUT_ASPECT_FACTOR
                                                      / atoi( psz_parser );
320 321 322 323
            }
            else
            {
                i_new_aspect = i_width * VOUT_ASPECT_FACTOR
gbazin's avatar
 
gbazin committed
324
                                       * atof( val.psz_string )
325 326 327
                                       / i_height;
            }

gbazin's avatar
 
gbazin committed
328
            free( val.psz_string );
329 330 331 332 333 334 335 336

            if( i_new_aspect && i_new_aspect != i_aspect )
            {
                int i_pgcd = ReduceHeight( i_new_aspect );

                msg_Dbg( p_vout, "overriding source aspect ratio to %i:%i",
                         i_new_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );

gbazin's avatar
 
gbazin committed
337
                p_vout->render.i_aspect = i_new_aspect;
338 339

                p_vout->b_override_aspect = VLC_TRUE;
340 341 342 343
            }
        }

        /* Look for the default filter configuration */
gbazin's avatar
 
gbazin committed
344 345 346
        var_Create( p_vout, "filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
        var_Get( p_vout, "filter", &val );
        p_vout->psz_filter_chain = val.psz_string;
gbazin's avatar
 
gbazin committed
347 348 349 350 351 352 353 354 355 356 357 358 359
    }
    else
    {
        /* continue the parent's filter chain */
        char *psz_end;

        psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' );
        if( psz_end && *(psz_end+1) )
            p_vout->psz_filter_chain = strdup( psz_end+1 );
        else p_vout->psz_filter_chain = NULL;
    }

    /* Choose the video output module */
gbazin's avatar
 
gbazin committed
360
    if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain )
gbazin's avatar
 
gbazin committed
361
    {
gbazin's avatar
 
gbazin committed
362 363 364
        var_Create( p_vout, "vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
        var_Get( p_vout, "vout", &val );
        psz_plugin = val.psz_string;
gbazin's avatar
 
gbazin committed
365 366 367 368 369 370 371 372 373 374 375 376
    }
    else
    {
        /* the filter chain is a string list of filters separated by double
         * colons */
        char *psz_end;

        psz_end = strchr( p_vout->psz_filter_chain, ':' );
        if( psz_end )
            psz_plugin = strndup( p_vout->psz_filter_chain,
                                  psz_end - p_vout->psz_filter_chain );
        else psz_plugin = strdup( p_vout->psz_filter_chain );
Sam Hocevar's avatar
 
Sam Hocevar committed
377 378
    }

gbazin's avatar
 
gbazin committed
379 380 381 382
    /* Initialize the dimensions of the video window */
    InitWindowSize( p_vout, &p_vout->i_window_width,
                    &p_vout->i_window_height );

gbazin's avatar
 
gbazin committed
383
    /* Create the vout thread */
gbazin's avatar
 
gbazin committed
384
    p_vout->p_module = module_Need( p_vout,
gbazin's avatar
 
gbazin committed
385 386
                           ( p_vout->psz_filter_chain &&
                               *p_vout->psz_filter_chain ) ?
387 388
                           "video filter" : "video output",
                           psz_plugin );
Sam Hocevar's avatar
 
Sam Hocevar committed
389

gbazin's avatar
 
gbazin committed
390
    if( psz_plugin ) free( psz_plugin );
Sam Hocevar's avatar
 
Sam Hocevar committed
391 392
    if( p_vout->p_module == NULL )
    {
393 394
        msg_Err( p_vout, "no suitable vout module" );
        vlc_object_destroy( p_vout );
395
        return NULL;
Sam Hocevar's avatar
 
Sam Hocevar committed
396
    }
gbazin's avatar
 
gbazin committed
397

398 399 400 401 402 403 404
    p_vout->p_text_renderer_module = module_Need( p_vout, "text renderer", 
						  NULL );
    if( p_vout->p_text_renderer_module == NULL )
    {
	msg_Warn( p_vout, "no suitable text renderer module" );
	p_vout->pf_add_string = NULL;
    }
gbazin's avatar
 
gbazin committed
405

gbazin's avatar
 
gbazin committed
406 407 408 409
    /* Create a few object variables for interface interaction */
    var_Create( p_vout, "fullscreen", VLC_VAR_BOOL );
    text.psz_string = _("Fullscreen");
    var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL );
gbazin's avatar
 
gbazin committed
410 411 412 413 414 415
    var_Change( p_vout, "fullscreen", VLC_VAR_INHERITVALUE, &val, NULL );
    if( val.b_bool )
    {
        /* user requested fullscreen */
        p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
    }
gbazin's avatar
 
gbazin committed
416 417
    var_AddCallback( p_vout, "fullscreen", FullscreenCallback, NULL );

gbazin's avatar
 
gbazin committed
418 419 420 421 422 423 424 425 426 427 428 429 430 431 432
    var_Create( p_vout, "deinterlace", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
    text.psz_string = _("Deinterlace");
    var_Change( p_vout, "deinterlace", VLC_VAR_SETTEXT, &text, NULL );
    val.psz_string = ""; text.psz_string = _("Disable");
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
    val.psz_string = "discard"; text.psz_string = _("Discard");
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
    val.psz_string = "blend"; text.psz_string = _("Blend");
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
    val.psz_string = "mean"; text.psz_string = _("Mean");
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
    val.psz_string = "bob"; text.psz_string = _("Bob");
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
    val.psz_string = "linear"; text.psz_string = _("Linear");
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
gbazin's avatar
 
gbazin committed
433 434 435 436
    if( var_Get( p_vout, "deinterlace-mode", &val ) == VLC_SUCCESS )
    {
        var_Set( p_vout, "deinterlace", val );
    }
gbazin's avatar
 
gbazin committed
437 438
    var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );

gbazin's avatar
 
gbazin committed
439 440
    /* Calculate delay created by internal caching */
    p_input_thread = (input_thread_t *)vlc_object_find( p_vout,
gbazin's avatar
 
gbazin committed
441
                                           VLC_OBJECT_INPUT, FIND_ANYWHERE );
gbazin's avatar
 
gbazin committed
442 443
    if( p_input_thread )
    {
gbazin's avatar
 
gbazin committed
444
        p_vout->i_pts_delay = p_input_thread->i_pts_delay;
gbazin's avatar
 
gbazin committed
445 446 447 448
        vlc_object_release( p_input_thread );
    }
    else
    {
gbazin's avatar
 
gbazin committed
449
        p_vout->i_pts_delay = DEFAULT_PTS_DELAY;
gbazin's avatar
 
gbazin committed
450 451
    }

452
    if( vlc_thread_create( p_vout, "video output", RunThread,
gbazin's avatar
 
gbazin committed
453
                           VLC_THREAD_PRIORITY_OUTPUT, VLC_TRUE ) )
Michel Kaempf's avatar
Michel Kaempf committed
454
    {
455
        msg_Err( p_vout, "out of memory" );
456
        module_Unneed( p_vout, p_vout->p_module );
457 458
        vlc_object_destroy( p_vout );
        return NULL;
459
    }
Michel Kaempf's avatar
Michel Kaempf committed
460

461
    return p_vout;
Michel Kaempf's avatar
Michel Kaempf committed
462 463
}

464
/*****************************************************************************
465
 * vout_Destroy: destroys a previously created video output
466 467
 *****************************************************************************
 * Destroy a terminated thread.
Michel Kaempf's avatar
Michel Kaempf committed
468
 * The function will request a destruction of the specified thread. If pi_error
469
 * is NULL, it will return once the thread is destroyed. Else, it will be
Michel Kaempf's avatar
Michel Kaempf committed
470
 * update using one of the THREAD_* constants.
471
 *****************************************************************************/
472
void vout_Destroy( vout_thread_t *p_vout )
473 474 475
{ 
    vlc_object_t *p_playlist;
    
Michel Kaempf's avatar
Michel Kaempf committed
476
    /* Request thread destruction */
477
    p_vout->b_die = VLC_TRUE;
478
    vlc_thread_join( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
479

480 481
    var_Destroy( p_vout, "intf-change" );

482 483 484
    p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, 
                                  FIND_ANYWHERE );

485
    /* Free structure */
486
    vlc_object_destroy( p_vout );
487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504

    /* If it was the last vout, tell the interface to show up */
    if( p_playlist != NULL )
    {
        vout_thread_t *p_another_vout = vlc_object_find( p_playlist, 
                                            VLC_OBJECT_VOUT, FIND_ANYWHERE );
        if( p_another_vout == NULL )
        {
            vlc_value_t val;
            val.b_bool = VLC_TRUE;
            var_Set( p_playlist, "intf-show", val );
        }
        else
        {
            vlc_object_release( p_another_vout );
        }
        vlc_object_release( p_playlist );
    }
Michel Kaempf's avatar
Michel Kaempf committed
505 506
}

507
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
508
 * InitThread: initialize video output thread
509
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
510 511 512
 * This function is called from RunThread and performs the second step of the
 * initialization. It returns 0 on success. Note that the thread's flag are not
 * modified inside this function.
513
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
514
static int InitThread( vout_thread_t *p_vout )
Vincent Seguin's avatar
Vincent Seguin committed
515
{
Sam Hocevar's avatar
 
Sam Hocevar committed
516
    int i, i_pgcd;
Sam Hocevar's avatar
 
Sam Hocevar committed
517

Sam Hocevar's avatar
 
Sam Hocevar committed
518 519 520 521
    vlc_mutex_lock( &p_vout->change_lock );

#ifdef STATS
    p_vout->c_loops = 0;
Vincent Seguin's avatar
Vincent Seguin committed
522 523
#endif

Sam Hocevar's avatar
 
Sam Hocevar committed
524
    /* Initialize output method, it allocates direct buffers for us */
Sam Hocevar's avatar
 
Sam Hocevar committed
525
    if( p_vout->pf_init( p_vout ) )
Vincent Seguin's avatar
Vincent Seguin committed
526
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
527
        vlc_mutex_unlock( &p_vout->change_lock );
528
        return VLC_EGENERIC;
Sam Hocevar's avatar
 
Sam Hocevar committed
529 530
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
531
    if( !I_OUTPUTPICTURES )
Sam Hocevar's avatar
 
Sam Hocevar committed
532
    {
533 534
        msg_Err( p_vout, "plugin was unable to allocate at least "
                         "one direct buffer" );
Sam Hocevar's avatar
 
Sam Hocevar committed
535
        p_vout->pf_end( p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
536
        vlc_mutex_unlock( &p_vout->change_lock );
537
        return VLC_EGENERIC;
538
    }
Vincent Seguin's avatar
Vincent Seguin committed
539

gbazin's avatar
 
gbazin committed
540 541 542 543 544 545 546 547 548
    if( I_OUTPUTPICTURES > VOUT_MAX_PICTURES )
    {
        msg_Err( p_vout, "plugin allocated too many direct buffers, "
                         "our internal buffers must have overflown." );
        p_vout->pf_end( p_vout );
        vlc_mutex_unlock( &p_vout->change_lock );
        return VLC_EGENERIC;
    }

549
    msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
Sam Hocevar's avatar
 
Sam Hocevar committed
550

551
#if 0
552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571
    if( !p_vout->psz_filter_chain )
    {
        char *psz_aspect = config_GetPsz( p_vout, "pixel-ratio" );

        if( psz_aspect )
        {
            int i_new_aspect = p_vout->output.i_width * VOUT_ASPECT_FACTOR
                                                      * atof( psz_aspect )
                                                      / p_vout->output.i_height;
            free( psz_aspect );

            if( i_new_aspect && i_new_aspect != p_vout->output.i_aspect )
            {
                int i_pgcd = ReduceHeight( i_new_aspect );
                msg_Dbg( p_vout, "output ratio forced to %i:%i\n",
                         i_new_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
                p_vout->output.i_aspect = i_new_aspect;
            }
        }
    }
572
#endif
573

Sam Hocevar's avatar
 
Sam Hocevar committed
574
    i_pgcd = ReduceHeight( p_vout->render.i_aspect );
575 576 577 578 579
    msg_Dbg( p_vout,
             "picture in %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i",
             p_vout->render.i_width, p_vout->render.i_height,
             p_vout->render.i_chroma, (char*)&p_vout->render.i_chroma,
             p_vout->render.i_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
Sam Hocevar's avatar
 
Sam Hocevar committed
580 581

    i_pgcd = ReduceHeight( p_vout->output.i_aspect );
582 583 584 585 586
    msg_Dbg( p_vout,
             "picture out %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i",
             p_vout->output.i_width, p_vout->output.i_height,
             p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma,
             p_vout->output.i_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
Sam Hocevar's avatar
 
Sam Hocevar committed
587

Sam Hocevar's avatar
 
Sam Hocevar committed
588 589 590 591 592 593 594 595
    /* Calculate shifts from system-updated masks */
    MaskToShift( &p_vout->output.i_lrshift, &p_vout->output.i_rrshift,
                 p_vout->output.i_rmask );
    MaskToShift( &p_vout->output.i_lgshift, &p_vout->output.i_rgshift,
                 p_vout->output.i_gmask );
    MaskToShift( &p_vout->output.i_lbshift, &p_vout->output.i_rbshift,
                 p_vout->output.i_bmask );

Sam Hocevar's avatar
 
Sam Hocevar committed
596
    /* Check whether we managed to create direct buffers similar to
597
     * the render buffers, ie same size and chroma */
Sam Hocevar's avatar
 
Sam Hocevar committed
598 599
    if( ( p_vout->output.i_width == p_vout->render.i_width )
     && ( p_vout->output.i_height == p_vout->render.i_height )
600
     && ( vout_ChromaCmp( p_vout->output.i_chroma, p_vout->render.i_chroma ) ) )
Sam Hocevar's avatar
 
Sam Hocevar committed
601
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
602 603 604 605
        /* Cool ! We have direct buffers, we can ask the decoder to
         * directly decode into them ! Map the first render buffers to
         * the first direct buffers, but keep the first direct buffer
         * for memcpy operations */
Sam Hocevar's avatar
 
Sam Hocevar committed
606 607
        p_vout->b_direct = 1;

Sam Hocevar's avatar
 
Sam Hocevar committed
608 609
        for( i = 1; i < VOUT_MAX_PICTURES; i++ )
        {
gbazin's avatar
 
gbazin committed
610 611 612 613 614 615 616 617
            if( p_vout->p_picture[ i ].i_type != DIRECT_PICTURE &&
                I_RENDERPICTURES >= VOUT_MIN_DIRECT_PICTURES - 1 &&
                p_vout->p_picture[ i - 1 ].i_type == DIRECT_PICTURE )
            {
                /* We have enough direct buffers so there's no need to
                 * try to use system memory buffers. */
                break;
            }
Sam Hocevar's avatar
 
Sam Hocevar committed
618 619 620
            PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
            I_RENDERPICTURES++;
        }
gbazin's avatar
 
gbazin committed
621 622 623 624

        msg_Dbg( p_vout, "direct render, mapping "
                 "render pictures 0-%i to system pictures 1-%i",
                 VOUT_MAX_PICTURES - 2, VOUT_MAX_PICTURES - 1 );
Sam Hocevar's avatar
 
Sam Hocevar committed
625 626 627
    }
    else
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
628 629 630
        /* Rats... Something is wrong here, we could not find an output
         * plugin able to directly render what we decode. See if we can
         * find a chroma plugin to do the conversion */
Sam Hocevar's avatar
 
Sam Hocevar committed
631 632
        p_vout->b_direct = 0;

Sam Hocevar's avatar
 
Sam Hocevar committed
633
        /* Choose the best module */
634
        p_vout->chroma.p_module = module_Need( p_vout, "chroma", NULL );
Sam Hocevar's avatar
 
Sam Hocevar committed
635

Sam Hocevar's avatar
 
Sam Hocevar committed
636 637
        if( p_vout->chroma.p_module == NULL )
        {
638
            msg_Err( p_vout, "no chroma module for %4.4s to %4.4s",
639 640
                     (char*)&p_vout->render.i_chroma,
                     (char*)&p_vout->output.i_chroma );
Sam Hocevar's avatar
 
Sam Hocevar committed
641 642
            p_vout->pf_end( p_vout );
            vlc_mutex_unlock( &p_vout->change_lock );
643
            return VLC_EGENERIC;
Sam Hocevar's avatar
 
Sam Hocevar committed
644
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
645

gbazin's avatar
 
gbazin committed
646 647 648 649
        msg_Dbg( p_vout, "indirect render, mapping "
                 "render pictures 0-%i to system pictures %i-%i",
                 VOUT_MAX_PICTURES - 1, I_OUTPUTPICTURES,
                 I_OUTPUTPICTURES + VOUT_MAX_PICTURES - 1 );
Sam Hocevar's avatar
 
Sam Hocevar committed
650 651

        /* Append render buffers after the direct buffers */
Sam Hocevar's avatar
 
Sam Hocevar committed
652
        for( i = I_OUTPUTPICTURES; i < 2 * VOUT_MAX_PICTURES; i++ )
Sam Hocevar's avatar
 
Sam Hocevar committed
653 654 655
        {
            PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
            I_RENDERPICTURES++;
gbazin's avatar
 
gbazin committed
656 657 658 659

            /* Check if we have enough render pictures */
            if( I_RENDERPICTURES == VOUT_MAX_PICTURES )
                break;
Sam Hocevar's avatar
 
Sam Hocevar committed
660 661
        }
    }
Vincent Seguin's avatar
Vincent Seguin committed
662

Sam Hocevar's avatar
 
Sam Hocevar committed
663 664 665 666 667 668 669 670 671 672 673
    /* Link pictures back to their heap */
    for( i = 0 ; i < I_RENDERPICTURES ; i++ )
    {
        PP_RENDERPICTURE[ i ]->p_heap = &p_vout->render;
    }

    for( i = 0 ; i < I_OUTPUTPICTURES ; i++ )
    {
        PP_OUTPUTPICTURE[ i ]->p_heap = &p_vout->output;
    }

674
/* XXX XXX mark thread ready */
675
    return VLC_SUCCESS;
Vincent Seguin's avatar
Vincent Seguin committed
676 677
}

678
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
679
 * RunThread: video output thread
680
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
681 682 683
 * Video output thread. This function does only returns when the thread is
 * terminated. It handles the pictures arriving in the video heap and the
 * display device events.
684
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
685
static void RunThread( vout_thread_t *p_vout)
Vincent Seguin's avatar
Vincent Seguin committed
686
{
Sam Hocevar's avatar
 
Sam Hocevar committed
687
    int             i_index;                                /* index in heap */
688
    int             i_idle_loops = 0;  /* loops without displaying a picture */
Sam Hocevar's avatar
 
Sam Hocevar committed
689 690 691 692
    mtime_t         current_date;                            /* current date */
    mtime_t         display_date;                            /* display date */

    picture_t *     p_picture;                            /* picture pointer */
693
    picture_t *     p_last_picture = NULL;                   /* last picture */
Sam Hocevar's avatar
 
Sam Hocevar committed
694 695 696 697 698 699 700 701
    picture_t *     p_directbuffer;              /* direct buffer to display */

    subpicture_t *  p_subpic;                          /* subpicture pointer */

    /*
     * Initialize thread
     */
    p_vout->b_error = InitThread( p_vout );
gbazin's avatar
 
gbazin committed
702 703 704 705

    /* signal the creation of the vout */
    vlc_thread_ready( p_vout );

Sam Hocevar's avatar
 
Sam Hocevar committed
706 707 708
    if( p_vout->b_error )
    {
        /* Destroy thread structures allocated by Create and InitThread */
709
        DestroyThread( p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
710 711
        return;
    }
712

713
    /*
Sam Hocevar's avatar
 
Sam Hocevar committed
714 715
     * Main loop - it is not executed if an error occured during
     * initialization
716
     */
Sam Hocevar's avatar
 
Sam Hocevar committed
717
    while( (!p_vout->b_die) && (!p_vout->b_error) )
718
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
719
        /* Initialize loop variables */
720
        p_picture = NULL;
Sam Hocevar's avatar
 
Sam Hocevar committed
721 722
        display_date = 0;
        current_date = mdate();
Sam Hocevar's avatar
 
Sam Hocevar committed
723

724
#if 0
Sam Hocevar's avatar
 
Sam Hocevar committed
725 726
        p_vout->c_loops++;
        if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
727
        {
728 729
            msg_Dbg( p_vout, "picture heap: %d/%d",
                     I_RENDERPICTURES, p_vout->i_heap_size );
Sam Hocevar's avatar
 
Sam Hocevar committed
730
        }
731
#endif
Sam Hocevar's avatar
 
Sam Hocevar committed
732 733

        /*
734 735 736
         * Find the picture to display (the one with the earliest date).
         * This operation does not need lock, since only READY_PICTUREs
         * are handled. */
737
        for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
Sam Hocevar's avatar
 
Sam Hocevar committed
738
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
739 740 741
            if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
                && ( (p_picture == NULL) ||
                     (PP_RENDERPICTURE[i_index]->date < display_date) ) )
742
            {
Sam Hocevar's avatar
 
Sam Hocevar committed
743
                p_picture = PP_RENDERPICTURE[i_index];
Sam Hocevar's avatar
 
Sam Hocevar committed
744
                display_date = p_picture->date;
745 746
            }
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
747

748
        if( p_picture )
749
        {
750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765
            /* If we met the last picture, parse again to see whether there is
             * a more appropriate one. */
            if( p_picture == p_last_picture )
            {
                for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
                {
                    if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
                        && (PP_RENDERPICTURE[i_index] != p_last_picture)
                        && ((p_picture == p_last_picture) ||
                            (PP_RENDERPICTURE[i_index]->date < display_date)) )
                    {
                        p_picture = PP_RENDERPICTURE[i_index];
                        display_date = p_picture->date;
                    }
                }
            }
766

767 768 769 770 771 772 773 774 775 776 777 778 779 780
            /* If we found better than the last picture, destroy it */
            if( p_last_picture && p_picture != p_last_picture )
            {
                vlc_mutex_lock( &p_vout->picture_lock );
                if( p_last_picture->i_refcount )
                {
                    p_last_picture->i_status = DISPLAYED_PICTURE;
                }
                else
                {
                    p_last_picture->i_status = DESTROYED_PICTURE;
                    p_vout->i_heap_size--;
                }
                vlc_mutex_unlock( &p_vout->picture_lock );
781
                p_last_picture = NULL;
782 783
            }

Sam Hocevar's avatar
 
Sam Hocevar committed
784 785 786 787
            /* Compute FPS rate */
            p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ]
                = display_date;

788
            if( !p_picture->b_force &&
789
                p_picture != p_last_picture &&
790
                display_date < current_date + p_vout->render_time )
Sam Hocevar's avatar
 
Sam Hocevar committed
791 792 793 794 795 796 797 798 799 800 801 802 803 804
            {
                /* Picture is late: it will be destroyed and the thread
                 * will directly choose the next picture */
                vlc_mutex_lock( &p_vout->picture_lock );
                if( p_picture->i_refcount )
                {
                    /* Pretend we displayed the picture, but don't destroy
                     * it since the decoder might still need it. */
                    p_picture->i_status = DISPLAYED_PICTURE;
                }
                else
                {
                    /* Destroy the picture without displaying it */
                    p_picture->i_status = DESTROYED_PICTURE;
Sam Hocevar's avatar
 
Sam Hocevar committed
805
                    p_vout->i_heap_size--;
Sam Hocevar's avatar
 
Sam Hocevar committed
806
                }
gbazin's avatar
 
gbazin committed
807
                msg_Warn( p_vout, "late picture skipped ("I64Fd")",
808
                                  current_date - display_date );
809 810 811 812
                vlc_mutex_unlock( &p_vout->picture_lock );

                continue;
            }
813

gbazin's avatar
 
gbazin committed
814 815
            if( display_date >
                current_date + p_vout->i_pts_delay +  VOUT_BOGUS_DELAY )
816 817 818 819 820 821 822 823 824 825 826 827 828 829 830
            {
                /* Picture is waaay too early: it will be destroyed */
                vlc_mutex_lock( &p_vout->picture_lock );
                if( p_picture->i_refcount )
                {
                    /* Pretend we displayed the picture, but don't destroy
                     * it since the decoder might still need it. */
                    p_picture->i_status = DISPLAYED_PICTURE;
                }
                else
                {
                    /* Destroy the picture without displaying it */
                    p_picture->i_status = DESTROYED_PICTURE;
                    p_vout->i_heap_size--;
                }
831
                msg_Warn( p_vout, "vout warning: early picture skipped "
gbazin's avatar
 
gbazin committed
832 833
                          "("I64Fd")", display_date - current_date
                          - p_vout->i_pts_delay );
Sam Hocevar's avatar
 
Sam Hocevar committed
834 835 836 837
                vlc_mutex_unlock( &p_vout->picture_lock );

                continue;
            }
838

839
            if( display_date > current_date + VOUT_DISPLAY_DELAY )
Sam Hocevar's avatar
 
Sam Hocevar committed
840 841 842 843 844 845 846 847
            {
                /* A picture is ready to be rendered, but its rendering date
                 * is far from the current one so the thread will perform an
                 * empty loop as if no picture were found. The picture state
                 * is unchanged */
                p_picture    = NULL;
                display_date = 0;
            }
848 849
            else if( p_picture == p_last_picture )
            {
850 851
                /* We are asked to repeat the previous picture, but we first
                 * wait for a couple of idle loops */
852 853 854 855 856 857 858
                if( i_idle_loops < 4 )
                {
                    p_picture    = NULL;
                    display_date = 0;
                }
                else
                {
859 860 861
                    /* We set the display date to something high, otherwise
                     * we'll have lots of problems with late pictures */
                    display_date = current_date + p_vout->render_time;
862 863 864 865 866 867 868
                }
            }
        }

        if( p_picture == NULL )
        {
            i_idle_loops++;
869 870
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
871 872 873 874
        /*
         * Check for subpictures to display
         */
        p_subpic = vout_SortSubPictures( p_vout, display_date );
875

Sam Hocevar's avatar
 
Sam Hocevar committed
876 877 878 879 880
        /*
         * Perform rendering
         */
        p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );

Sam Hocevar's avatar
 
Sam Hocevar committed
881
        /*
882
         * Call the plugin-specific rendering method if there is one
Sam Hocevar's avatar
 
Sam Hocevar committed
883
         */
gbazin's avatar
 
gbazin committed
884
        if( p_picture != NULL && p_directbuffer != NULL && p_vout->pf_render )
Sam Hocevar's avatar
 
Sam Hocevar committed
885 886 887 888 889
        {
            /* Render the direct buffer returned by vout_RenderPicture */
            p_vout->pf_render( p_vout, p_directbuffer );
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
890 891 892
        /*
         * Sleep, wake up
         */
gbazin's avatar
 
gbazin committed
893
        if( display_date != 0 && p_directbuffer != NULL )
894
        {
895
            /* Store render time using a sliding mean */
Sam Hocevar's avatar
 
Sam Hocevar committed
896 897
            p_vout->render_time += mdate() - current_date;
            p_vout->render_time >>= 1;
898 899
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
900 901 902 903 904
        /* Give back change lock */
        vlc_mutex_unlock( &p_vout->change_lock );

        /* Sleep a while or until a given date */
        if( display_date != 0 )
Sam Hocevar's avatar
Sam Hocevar committed
905
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
906
            mwait( display_date - VOUT_MWAIT_TOLERANCE );
907 908 909
        }
        else
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
910
            msleep( VOUT_IDLE_SLEEP );
911
        }
912

Sam Hocevar's avatar
 
Sam Hocevar committed
913 914 915 916 917 918 919
        /* On awakening, take back lock and send immediately picture
         * to display. */
        vlc_mutex_lock( &p_vout->change_lock );

        /*
         * Display the previously rendered picture
         */
gbazin's avatar
 
gbazin committed
920
        if( p_picture != NULL && p_directbuffer != NULL )
Sam Hocevar's avatar
 
Sam Hocevar committed
921 922
        {
            /* Display the direct buffer returned by vout_RenderPicture */
923 924 925 926
            if( p_vout->pf_display )
            {
                p_vout->pf_display( p_vout, p_directbuffer );
            }
Vincent Seguin's avatar
Vincent Seguin committed
927

928 929 930 931 932 933 934
            /* Reinitialize idle loop count */
            i_idle_loops = 0;

            /* Tell the vout this was the last picture and that it does not
             * need to be forced anymore. */
            p_last_picture = p_picture;
            p_last_picture->b_force = 0;
Sam Hocevar's avatar
 
Sam Hocevar committed
935
        }
Vincent Seguin's avatar
Vincent Seguin committed
936

Sam Hocevar's avatar
 
Sam Hocevar committed
937 938 939
        /*
         * Check events and manage thread
         */
940
        if( p_vout->pf_manage && p_vout->pf_manage( p_vout ) )
Sam Hocevar's avatar
 
Sam Hocevar committed
941
        {
gbazin's avatar
 
gbazin committed
942 943 944
            /* A fatal error occured, and the thread must terminate
             * immediately, without displaying anything - setting b_error to 1
             * causes the immediate end of the main while() loop. */
Sam Hocevar's avatar
 
Sam Hocevar committed
945 946
            p_vout->b_error = 1;
        }
gbazin's avatar
 
gbazin committed
947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964

        if( p_vout->i_changes & VOUT_SIZE_CHANGE )
        {
            /* this must only happen when the vout plugin is incapable of
             * rescaling the picture itself. In this case we need to destroy
             * the current picture buffers and recreate new ones with the right
             * dimensions */
            int i;

            p_vout->i_changes &= ~VOUT_SIZE_CHANGE;

            p_vout->pf_end( p_vout );
            for( i = 0; i < I_OUTPUTPICTURES; i++ )
                 p_vout->p_picture[ i ].i_status = FREE_PICTURE;

            I_OUTPUTPICTURES = 0;
            if( p_vout->pf_init( p_vout ) )
            {
965
                msg_Err( p_vout, "cannot resize display" );
966
                /* FIXME: pf_end will be called again in EndThread() */
gbazin's avatar
 
gbazin committed
967 968 969 970
                p_vout->b_error = 1;
            }

            /* Need to reinitialise the chroma plugin */
gbazin's avatar
 
gbazin committed
971 972
            if( p_vout->chroma.p_module->pf_deactivate )
                p_vout->chroma.p_module->pf_deactivate( VLC_OBJECT(p_vout) );
973
            p_vout->chroma.p_module->pf_activate( VLC_OBJECT(p_vout) );
gbazin's avatar
 
gbazin committed
974
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
975
    }
Vincent Seguin's avatar
Vincent Seguin committed
976

Sam Hocevar's avatar
 
Sam Hocevar committed
977 978 979 980
    /*
     * Error loop - wait until the thread destruction is requested
     */
    if( p_vout->b_error )
981
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
982
        ErrorThread( p_vout );
983
    }
Michel Kaempf's avatar
Michel Kaempf committed
984

Sam Hocevar's avatar
 
Sam Hocevar committed
985 986 987 988
    /* End of thread */
    EndThread( p_vout );

    /* Destroy thread structures allocated by CreateThread */
989
    DestroyThread( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
990 991
}

992
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
993
 * ErrorThread: RunThread() error loop
994
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
995 996 997
 * This function is called when an error occured during thread main's loop. The
 * thread can still receive feed, but must be ready to terminate as soon as
 * possible.
998
 *****************************************************************************/
Sam Hocevar's avatar