video_output.c 58.6 KB
Newer Older
1
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
2
 * video_output.c : video output thread
3
 *
Michel Kaempf's avatar
Michel Kaempf committed
4 5
 * This module describes the programming interface for video output threads.
 * It includes functions allowing to open a new thread, send pictures to a
6 7
 * thread, and destroy a previously oppened video output thread.
 *****************************************************************************
8
 * Copyright (C) 2000-2007 the VideoLAN team
Gildas Bazin's avatar
Gildas Bazin committed
9
 * $Id$
10
 *
Sam Hocevar's avatar
 
Sam Hocevar committed
11
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
12
 *          Gildas Bazin <gbazin@videolan.org>
13 14 15 16 17
 *
 * 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
18
 *
19 20
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
21 22
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
23
 *
24 25
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
Antoine Cellerier's avatar
Antoine Cellerier committed
26
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
27
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
28

29
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
30
 * Preamble
31
 *****************************************************************************/
32 33 34 35
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

36 37
#include <vlc/vlc.h>

38
#include <stdlib.h>                                                /* free() */
39
#include <string.h>
Vincent Seguin's avatar
Vincent Seguin committed
40

Sam Hocevar's avatar
 
Sam Hocevar committed
41

42 43
#ifdef HAVE_SYS_TIMES_H
#   include <sys/times.h>
44
#endif
45

Clément Stenac's avatar
Clément Stenac committed
46 47
#include <vlc_vout.h>
#include <vlc_playlist.h>
48

Clément Stenac's avatar
Clément Stenac committed
49 50
#include <vlc_filter.h>
#include <vlc_osd.h>
51

52
#if defined( __APPLE__ )
Clément Stenac's avatar
Clément Stenac committed
53
/* Include darwin_specific.h here if needed */
54 55
#endif

Clément Stenac's avatar
Clément Stenac committed
56 57 58 59
/** FIXME This is quite ugly but needed while we don't have counters
 * helpers */
#include "input/input_internal.h"

60 61
#include "modules/modules.h"

62
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
63
 * Local prototypes
64
 *****************************************************************************/
65 66 67 68 69
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
70

71
static void     AspectRatio       ( int, int *, int * );
72 73
static int      BinaryLog         ( uint32_t );
static void     MaskToShift       ( int *, int *, uint32_t );
Michel Kaempf's avatar
Michel Kaempf committed
74

75 76
static void     vout_Destructor   ( vlc_object_t * p_this );

Gildas Bazin's avatar
 
Gildas Bazin committed
77
/* Object variables callbacks */
Gildas Bazin's avatar
 
Gildas Bazin committed
78 79
static int DeinterlaceCallback( vlc_object_t *, char const *,
                                vlc_value_t, vlc_value_t, void * );
80 81
static int FilterCallback( vlc_object_t *, char const *,
                           vlc_value_t, vlc_value_t, void * );
82 83
static int VideoFilter2Callback( vlc_object_t *, char const *,
                                 vlc_value_t, vlc_value_t, void * );
Gildas Bazin's avatar
 
Gildas Bazin committed
84

85 86 87
/* From vout_intf.c */
int vout_Snapshot( vout_thread_t *, picture_t * );

88 89 90 91
/* Video filter2 parsing */
static int ParseVideoFilter2Chain( vout_thread_t *, char * );
static void RemoveVideoFilters2( vout_thread_t *p_vout );

92 93 94
/* Display media title in OSD */
static void DisplayTitleOnOSD( vout_thread_t *p_vout );

95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117
/*****************************************************************************
 * Video Filter2 functions
 *****************************************************************************/
struct filter_owner_sys_t
{
    vout_thread_t *p_vout;
};

static picture_t *video_new_buffer_filter( filter_t *p_filter )
{
    picture_t *p_picture;
    vout_thread_t *p_vout = p_filter->p_owner->p_vout;

    p_picture = vout_CreatePicture( p_vout, 0, 0, 0 );

    return p_picture;
}

static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
{
    vout_DestroyPicture( p_filter->p_owner->p_vout, p_pic );
}

118
/*****************************************************************************
119 120 121 122 123
 * 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.
 *****************************************************************************/
124 125
vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
                               video_format_t *p_fmt )
126
{
127
    if( !p_fmt )
128
    {
129
        /* Reattach video output to playlist before bailing out */
130 131
        if( p_vout )
        {
132 133
            spu_Attach( p_vout->p_spu, p_this, VLC_FALSE );
            vlc_object_detach( p_vout );
134
            vlc_object_attach( p_vout, p_this->p_libvlc );
135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
        }
        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 )
        {
150
            p_vout = vlc_object_find( p_this->p_libvlc,
151 152
                                      VLC_OBJECT_VOUT, FIND_CHILD );
            /* only first children of p_input for unused vout */
153
            if( p_vout && p_vout->p_parent != VLC_OBJECT(p_this->p_libvlc) )
Gildas Bazin's avatar
 
Gildas Bazin committed
154
            {
155 156
                vlc_object_release( p_vout );
                p_vout = NULL;
Gildas Bazin's avatar
 
Gildas Bazin committed
157
            }
158 159
            if( p_vout )
                vlc_object_detach( p_vout );    /* Remove it from the GC */
160 161 162 163 164 165
        }
    }

    /* If we now have a video output, check it has the right properties */
    if( p_vout )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
166
        char *psz_filter_chain;
167
        vlc_value_t val;
Gildas Bazin's avatar
 
Gildas Bazin committed
168

169
        /* We don't directly check for the "vout-filter" variable for obvious
Gildas Bazin's avatar
 
Gildas Bazin committed
170 171 172
         * performance reasons. */
        if( p_vout->b_filter_change )
        {
173
            var_Get( p_vout, "vout-filter", &val );
174
            psz_filter_chain = val.psz_string;
Gildas Bazin's avatar
 
Gildas Bazin committed
175

176
            if( psz_filter_chain && !*psz_filter_chain )
Gildas Bazin's avatar
 
Gildas Bazin committed
177 178 179 180
            {
                free( psz_filter_chain );
                psz_filter_chain = NULL;
            }
181
            if( p_vout->psz_filter_chain && !*p_vout->psz_filter_chain )
Gildas Bazin's avatar
 
Gildas Bazin committed
182 183 184 185 186
            {
                free( p_vout->psz_filter_chain );
                p_vout->psz_filter_chain = NULL;
            }

187
            if( !psz_filter_chain && !p_vout->psz_filter_chain )
Gildas Bazin's avatar
 
Gildas Bazin committed
188 189 190 191
            {
                p_vout->b_filter_change = VLC_FALSE;
            }

192
            free( psz_filter_chain );
Gildas Bazin's avatar
 
Gildas Bazin committed
193 194
        }

195 196
        if( ( p_vout->fmt_render.i_width != p_fmt->i_width ) ||
            ( p_vout->fmt_render.i_height != p_fmt->i_height ) ||
197
            ( p_vout->fmt_render.i_aspect != p_fmt->i_aspect ) ||
Gildas Bazin's avatar
 
Gildas Bazin committed
198
            p_vout->b_filter_change )
199 200 201 202 203 204 205 206 207
        {
            /* We are not interested in this format, close this vout */
            vlc_object_release( p_vout );
            vout_Destroy( p_vout );
            p_vout = NULL;
        }
        else
        {
            /* This video output is cool! Hijack it. */
208
            spu_Attach( p_vout->p_spu, p_this, VLC_TRUE );
209
            vlc_object_attach( p_vout, p_this );
210 211
            if( p_vout->b_title_show )
                DisplayTitleOnOSD( p_vout );
212 213 214 215 216 217 218 219
            vlc_object_release( p_vout );
        }
    }

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

220
        p_vout = vout_Create( p_this, p_fmt );
221 222 223 224 225 226 227
    }

    return p_vout;
}

/*****************************************************************************
 * vout_Create: creates a new video output thread
228
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
229 230
 * This function creates a new video output thread, and returns a pointer
 * to its description. On error, it returns NULL.
231
 *****************************************************************************/
232
vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
Michel Kaempf's avatar
Michel Kaempf committed
233
{
Gildas Bazin's avatar
 
Gildas Bazin committed
234 235 236
    vout_thread_t  * p_vout;                            /* thread descriptor */
    input_thread_t * p_input_thread;
    int              i_index;                               /* loop variable */
237
    vlc_value_t      val, text;
Michel Kaempf's avatar
Michel Kaempf committed
238

239 240
    unsigned int i_width = p_fmt->i_width;
    unsigned int i_height = p_fmt->i_height;
241 242 243
    vlc_fourcc_t i_chroma = p_fmt->i_chroma;
    unsigned int i_aspect = p_fmt->i_aspect;

244 245 246 247
    config_chain_t *p_cfg;
    char *psz_parser;
    char *psz_name;

248
    /* Allocate descriptor */
249
    p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
250
    if( p_vout == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
251
    {
252
        msg_Err( p_parent, "out of memory" );
253
        return NULL;
Michel Kaempf's avatar
Michel Kaempf committed
254
    }
255

256
    /* Initialize pictures - translation tables and functions
Gildas Bazin's avatar
 
Gildas Bazin committed
257
     * will be initialized later in InitThread */
258
    for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++)
Gildas Bazin's avatar
 
Gildas Bazin committed
259 260 261 262 263
    {
        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;
264
        p_vout->p_picture[i_index].b_slow   = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
265 266 267 268 269 270 271
    }

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

    /* Initialize the rendering heap */
    I_RENDERPICTURES = 0;
272 273 274

    vlc_ureduce( &p_fmt->i_sar_num, &p_fmt->i_sar_den,
                 p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 );
275 276
    p_vout->fmt_render        = *p_fmt;   /* FIXME palette */
    p_vout->fmt_in            = *p_fmt;   /* FIXME palette */
277

Gildas Bazin's avatar
 
Gildas Bazin committed
278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308
    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;
Gildas Bazin's avatar
 
Gildas Bazin committed
309
    p_vout->i_alignment  = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
310 311 312
    p_vout->render_time  = 10;
    p_vout->c_fps_samples = 0;
    p_vout->b_filter_change = 0;
313
    p_vout->pf_control = 0;
314
    p_vout->p_parent_intf = 0;
315
    p_vout->i_par_num = p_vout->i_par_den = 1;
Gildas Bazin's avatar
 
Gildas Bazin committed
316 317 318 319

    /* Initialize locks */
    vlc_mutex_init( p_vout, &p_vout->picture_lock );
    vlc_mutex_init( p_vout, &p_vout->change_lock );
320
    vlc_mutex_init( p_vout, &p_vout->vfilter_lock );
Gildas Bazin's avatar
 
Gildas Bazin committed
321

322 323 324 325 326 327 328
    /* 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 );

329
    /* Initialize subpicture unit */
330
    p_vout->p_spu = spu_Create( p_vout );
331
    spu_Attach( p_vout->p_spu, p_parent, VLC_TRUE );
332

Gildas Bazin's avatar
 
Gildas Bazin committed
333 334 335
    /* Attach the new object now so we can use var inheritance below */
    vlc_object_attach( p_vout, p_parent );

336 337
    spu_Init( p_vout->p_spu );

338 339
    /* Take care of some "interface/control" related initialisations */
    vout_IntfInit( p_vout );
Gildas Bazin's avatar
 
Gildas Bazin committed
340

Gildas Bazin's avatar
 
Gildas Bazin committed
341 342 343
    /* 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
344
    {
345
        /* Look for the default filter configuration */
346 347
        var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
        var_Get( p_vout, "vout-filter", &val );
Gildas Bazin's avatar
 
Gildas Bazin committed
348
        p_vout->psz_filter_chain = val.psz_string;
349 350 351 352 353 354 355

        /* Apply video filter2 objects on the first vout */
        var_Create( p_vout, "video-filter",
                    VLC_VAR_STRING | VLC_VAR_DOINHERIT );
        var_Get( p_vout, "video-filter", &val );
        ParseVideoFilter2Chain( p_vout, val.psz_string );
        free( val.psz_string );
Gildas Bazin's avatar
 
Gildas Bazin committed
356 357 358 359
    }
    else
    {
        /* continue the parent's filter chain */
360
        char *psz_tmp;
Gildas Bazin's avatar
 
Gildas Bazin committed
361

362 363 364 365 366 367 368
        /* Ugly hack to jump to our configuration chain */
        p_vout->psz_filter_chain
            = ((vout_thread_t *)p_parent)->psz_filter_chain;
        p_vout->psz_filter_chain
            = config_ChainCreate( &psz_tmp, &p_cfg, p_vout->psz_filter_chain );
        config_ChainDestroy( p_cfg );
        free( psz_tmp );
369 370 371 372

        /* Create a video filter2 var ... but don't inherit values */
        var_Create( p_vout, "video-filter", VLC_VAR_STRING );
        ParseVideoFilter2Chain( p_vout, NULL );
Gildas Bazin's avatar
 
Gildas Bazin committed
373 374
    }

375 376 377 378
    var_AddCallback( p_vout, "video-filter", VideoFilter2Callback, NULL );
    p_vout->b_vfilter_change = VLC_TRUE;
    p_vout->i_vfilters = 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
379
    /* Choose the video output module */
Gildas Bazin's avatar
 
Gildas Bazin committed
380
    if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain )
Gildas Bazin's avatar
 
Gildas Bazin committed
381
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
382 383
        var_Create( p_vout, "vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
        var_Get( p_vout, "vout", &val );
Antoine Cellerier's avatar
Antoine Cellerier committed
384
        psz_parser = val.psz_string;
Gildas Bazin's avatar
 
Gildas Bazin committed
385 386 387
    }
    else
    {
Antoine Cellerier's avatar
Antoine Cellerier committed
388
        psz_parser = strdup( p_vout->psz_filter_chain );
Sam Hocevar's avatar
 
Sam Hocevar committed
389 390
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
391
    /* Create the vout thread */
Antoine Cellerier's avatar
Antoine Cellerier committed
392 393
    config_ChainCreate( &psz_name, &p_cfg, psz_parser );
    free( psz_parser );
394
    p_vout->p_cfg = p_cfg;
Gildas Bazin's avatar
 
Gildas Bazin committed
395
    p_vout->p_module = module_Need( p_vout,
Gildas Bazin's avatar
 
Gildas Bazin committed
396
        ( p_vout->psz_filter_chain && *p_vout->psz_filter_chain ) ?
397
        "video filter" : "video output", psz_name, p_vout->psz_filter_chain && *p_vout->psz_filter_chain );
398
    free( psz_name );
Sam Hocevar's avatar
 
Sam Hocevar committed
399 400 401

    if( p_vout->p_module == NULL )
    {
402
        msg_Err( p_vout, "no suitable vout module" );
403
        vlc_object_detach( p_vout );
404
        vlc_object_release( p_vout );
405
        return NULL;
Sam Hocevar's avatar
 
Sam Hocevar committed
406
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
407

Gildas Bazin's avatar
 
Gildas Bazin committed
408
    /* Create a few object variables for interface interaction */
Gildas Bazin's avatar
 
Gildas Bazin committed
409 410 411
    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 );
412
    val.psz_string = (char *)""; text.psz_string = _("Disable");
Gildas Bazin's avatar
 
Gildas Bazin committed
413
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
414
    val.psz_string = (char *)"discard"; text.psz_string = _("Discard");
Gildas Bazin's avatar
 
Gildas Bazin committed
415
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
416
    val.psz_string = (char *)"blend"; text.psz_string = _("Blend");
Gildas Bazin's avatar
 
Gildas Bazin committed
417
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
418
    val.psz_string = (char *)"mean"; text.psz_string = _("Mean");
Gildas Bazin's avatar
 
Gildas Bazin committed
419
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
420
    val.psz_string = (char *)"bob"; text.psz_string = _("Bob");
Gildas Bazin's avatar
 
Gildas Bazin committed
421
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
422
    val.psz_string = (char *)"linear"; text.psz_string = _("Linear");
Gildas Bazin's avatar
 
Gildas Bazin committed
423
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
424
    val.psz_string = (char *)"x"; text.psz_string = (char *)"X";
425 426
    var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );

Gildas Bazin's avatar
 
Gildas Bazin committed
427 428 429
    if( var_Get( p_vout, "deinterlace-mode", &val ) == VLC_SUCCESS )
    {
        var_Set( p_vout, "deinterlace", val );
430
        free( val.psz_string );
Gildas Bazin's avatar
 
Gildas Bazin committed
431
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
432 433
    var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );

434
    var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
435
    text.psz_string = _("Filters");
436 437
    var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL );
    var_AddCallback( p_vout, "vout-filter", FilterCallback, NULL );
438

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

452
    if( vlc_thread_create( p_vout, "video output", RunThread,
Gildas Bazin's avatar
 
Gildas Bazin 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
        vlc_object_release( p_vout );
458 459 460 461 462 463 464 465
        return NULL;
    }

    if( p_vout->b_error )
    {
        msg_Err( p_vout, "video output creation failed" );

        /* Make sure the thread is destroyed */
466
        vlc_object_release( p_vout );
467
        return NULL;
468
    }
Michel Kaempf's avatar
Michel Kaempf committed
469

470 471
    vlc_object_set_destructor( p_vout, vout_Destructor );

472
    return p_vout;
Michel Kaempf's avatar
Michel Kaempf committed
473 474
}

475
/*****************************************************************************
476
 * vout_Destroy: destroys a previously created video output
477 478
 *****************************************************************************
 * Destroy a terminated thread.
Michel Kaempf's avatar
Michel Kaempf committed
479
 * The function will request a destruction of the specified thread. If pi_error
480
 * is NULL, it will return once the thread is destroyed. Else, it will be
Michel Kaempf's avatar
Michel Kaempf committed
481
 * update using one of the THREAD_* constants.
482
 *****************************************************************************/
483
void vout_Destroy( vout_thread_t *p_vout )
Clément Stenac's avatar
Clément Stenac committed
484
{
485 486
    /* XXX: should go in the destructor */
    var_Destroy( p_vout, "intf-change" );
Clément Stenac's avatar
Clément Stenac committed
487

488 489
    vlc_object_release( p_vout );
}
Michel Kaempf's avatar
Michel Kaempf committed
490

491 492
static void vout_Destructor( vlc_object_t * p_this )
{
493
    vout_thread_t *p_vout = (vout_thread_t *)p_this;
494

495
    free( p_vout->psz_filter_chain );
Gildas Bazin's avatar
 
Gildas Bazin committed
496

497 498
    config_ChainDestroy( p_vout->p_cfg );

499
#ifndef __APPLE__
500 501 502
    vout_thread_t *p_another_vout;
    playlist_t *p_playlist = pl_Yield( p_vout );

503 504 505 506
    /* This is a dirty hack for mostly Linux, where there is no way to get the GUI
       back if you closed it while playing video. This is solved in Mac OS X,
       where we have this novelty called menubar, that will always allow you access
       to the applications main functionality. They should try that on linux sometime */
507
    p_another_vout = vlc_object_find( p_this->p_libvlc,
508 509
                                      VLC_OBJECT_VOUT, FIND_ANYWHERE );
    if( p_another_vout == NULL )
510
    {
511 512 513 514 515 516 517
        vlc_value_t val;
        val.b_bool = VLC_TRUE;
        var_Set( p_playlist, "intf-show", val );
    }
    else
    {
        vlc_object_release( p_another_vout );
518
    }
519
    vlc_object_release( p_playlist );
520
#endif
Michel Kaempf's avatar
Michel Kaempf committed
521 522
}

523
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
524
 * InitThread: initialize video output thread
525
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
526 527 528
 * 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.
529
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
530
static int InitThread( vout_thread_t *p_vout )
Vincent Seguin's avatar
Vincent Seguin committed
531
{
532
    int i, i_aspect_x, i_aspect_y;
Sam Hocevar's avatar
 
Sam Hocevar committed
533

Sam Hocevar's avatar
 
Sam Hocevar committed
534 535 536 537
    vlc_mutex_lock( &p_vout->change_lock );

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

Sam Hocevar's avatar
 
Sam Hocevar committed
540
    /* Initialize output method, it allocates direct buffers for us */
Sam Hocevar's avatar
 
Sam Hocevar committed
541
    if( p_vout->pf_init( p_vout ) )
Vincent Seguin's avatar
Vincent Seguin committed
542
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
543
        vlc_mutex_unlock( &p_vout->change_lock );
544
        return VLC_EGENERIC;
Sam Hocevar's avatar
 
Sam Hocevar committed
545 546
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
547
    if( !I_OUTPUTPICTURES )
Sam Hocevar's avatar
 
Sam Hocevar committed
548
    {
549 550
        msg_Err( p_vout, "plugin was unable to allocate at least "
                         "one direct buffer" );
Sam Hocevar's avatar
 
Sam Hocevar committed
551
        p_vout->pf_end( p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
552
        vlc_mutex_unlock( &p_vout->change_lock );
553
        return VLC_EGENERIC;
554
    }
Vincent Seguin's avatar
Vincent Seguin committed
555

Gildas Bazin's avatar
 
Gildas Bazin committed
556 557 558 559 560 561 562 563 564
    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;
    }

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

567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609
    AspectRatio( p_vout->fmt_render.i_aspect, &i_aspect_x, &i_aspect_y );

    msg_Dbg( p_vout, "picture in %ix%i (%i,%i,%ix%i), "
             "chroma %4.4s, ar %i:%i, sar %i:%i",
             p_vout->fmt_render.i_width, p_vout->fmt_render.i_height,
             p_vout->fmt_render.i_x_offset, p_vout->fmt_render.i_y_offset,
             p_vout->fmt_render.i_visible_width,
             p_vout->fmt_render.i_visible_height,
             (char*)&p_vout->fmt_render.i_chroma,
             i_aspect_x, i_aspect_y,
             p_vout->fmt_render.i_sar_num, p_vout->fmt_render.i_sar_den );

    AspectRatio( p_vout->fmt_in.i_aspect, &i_aspect_x, &i_aspect_y );

    msg_Dbg( p_vout, "picture user %ix%i (%i,%i,%ix%i), "
             "chroma %4.4s, ar %i:%i, sar %i:%i",
             p_vout->fmt_in.i_width, p_vout->fmt_in.i_height,
             p_vout->fmt_in.i_x_offset, p_vout->fmt_in.i_y_offset,
             p_vout->fmt_in.i_visible_width,
             p_vout->fmt_in.i_visible_height,
             (char*)&p_vout->fmt_in.i_chroma,
             i_aspect_x, i_aspect_y,
             p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den );

    if( !p_vout->fmt_out.i_width || !p_vout->fmt_out.i_height )
    {
        p_vout->fmt_out.i_width = p_vout->fmt_out.i_visible_width =
            p_vout->output.i_width;
        p_vout->fmt_out.i_height = p_vout->fmt_out.i_visible_height =
            p_vout->output.i_height;
        p_vout->fmt_out.i_x_offset =  p_vout->fmt_out.i_y_offset = 0;

        p_vout->fmt_out.i_aspect = p_vout->output.i_aspect;
        p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
    }
    if( !p_vout->fmt_out.i_sar_num || !p_vout->fmt_out.i_sar_num )
    {
        p_vout->fmt_out.i_sar_num = p_vout->fmt_out.i_aspect *
            p_vout->fmt_out.i_height;
        p_vout->fmt_out.i_sar_den = VOUT_ASPECT_FACTOR *
            p_vout->fmt_out.i_width;
    }

Rémi Denis-Courmont's avatar
Rémi Denis-Courmont committed
610 611
    vlc_ureduce( &p_vout->fmt_out.i_sar_num, &p_vout->fmt_out.i_sar_den,
                 p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den, 0 );
612 613

    AspectRatio( p_vout->fmt_out.i_aspect, &i_aspect_x, &i_aspect_y );
Sam Hocevar's avatar
 
Sam Hocevar committed
614

615 616
    msg_Dbg( p_vout, "picture out %ix%i (%i,%i,%ix%i), "
             "chroma %4.4s, ar %i:%i, sar %i:%i",
617
             p_vout->fmt_out.i_width, p_vout->fmt_out.i_height,
618 619 620 621 622
             p_vout->fmt_out.i_x_offset, p_vout->fmt_out.i_y_offset,
             p_vout->fmt_out.i_visible_width,
             p_vout->fmt_out.i_visible_height,
             (char*)&p_vout->fmt_out.i_chroma,
             i_aspect_x, i_aspect_y,
623
             p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den );
Sam Hocevar's avatar
 
Sam Hocevar committed
624

Sam Hocevar's avatar
 
Sam Hocevar committed
625 626 627 628 629 630 631 632
    /* 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
633
    /* Check whether we managed to create direct buffers similar to
634
     * the render buffers, ie same size and chroma */
Sam Hocevar's avatar
 
Sam Hocevar committed
635 636
    if( ( p_vout->output.i_width == p_vout->render.i_width )
     && ( p_vout->output.i_height == p_vout->render.i_height )
637
     && ( vout_ChromaCmp( p_vout->output.i_chroma, p_vout->render.i_chroma ) ) )
Sam Hocevar's avatar
 
Sam Hocevar committed
638
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
639 640 641 642
        /* 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
643 644
        p_vout->b_direct = 1;

Sam Hocevar's avatar
 
Sam Hocevar committed
645 646
        for( i = 1; i < VOUT_MAX_PICTURES; i++ )
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
647 648 649 650 651 652 653 654
            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
655 656 657
            PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
            I_RENDERPICTURES++;
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
658 659 660 661

        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
662 663 664
    }
    else
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
665 666 667
        /* 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
668 669
        p_vout->b_direct = 0;

Sam Hocevar's avatar
 
Sam Hocevar committed
670
        /* Choose the best module */
Gildas Bazin's avatar
 
Gildas Bazin committed
671
        p_vout->chroma.p_module = module_Need( p_vout, "chroma", NULL, 0 );
Sam Hocevar's avatar
 
Sam Hocevar committed
672

Sam Hocevar's avatar
 
Sam Hocevar committed
673 674
        if( p_vout->chroma.p_module == NULL )
        {
675
            msg_Err( p_vout, "no chroma module for %4.4s to %4.4s",
676 677
                     (char*)&p_vout->render.i_chroma,
                     (char*)&p_vout->output.i_chroma );
Sam Hocevar's avatar
 
Sam Hocevar committed
678 679
            p_vout->pf_end( p_vout );
            vlc_mutex_unlock( &p_vout->change_lock );
680
            return VLC_EGENERIC;
Sam Hocevar's avatar
 
Sam Hocevar committed
681
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
682

Gildas Bazin's avatar
 
Gildas Bazin committed
683 684 685 686
        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
687 688

        /* Append render buffers after the direct buffers */
Sam Hocevar's avatar
 
Sam Hocevar committed
689
        for( i = I_OUTPUTPICTURES; i < 2 * VOUT_MAX_PICTURES; i++ )
Sam Hocevar's avatar
 
Sam Hocevar committed
690 691 692
        {
            PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
            I_RENDERPICTURES++;
Gildas Bazin's avatar
 
Gildas Bazin committed
693 694 695 696

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

Sam Hocevar's avatar
 
Sam Hocevar committed
700 701 702 703 704 705 706 707 708 709 710
    /* 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;
    }

711
/* XXX XXX mark thread ready */
712
    return VLC_SUCCESS;
Vincent Seguin's avatar
Vincent Seguin committed
713 714
}

715
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
716
 * RunThread: video output thread
717
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
718 719 720
 * 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.
721
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
722
static void RunThread( vout_thread_t *p_vout)
Vincent Seguin's avatar
Vincent Seguin committed
723
{
Sam Hocevar's avatar
 
Sam Hocevar committed
724
    int             i_index;                                /* index in heap */
725
    int             i_idle_loops = 0;  /* loops without displaying a picture */
Sam Hocevar's avatar
 
Sam Hocevar committed
726 727 728 729
    mtime_t         current_date;                            /* current date */
    mtime_t         display_date;                            /* display date */

    picture_t *     p_picture;                            /* picture pointer */
730
    picture_t *     p_last_picture = NULL;                   /* last picture */
Sam Hocevar's avatar
 
Sam Hocevar committed
731 732
    picture_t *     p_directbuffer;              /* direct buffer to display */

733
    subpicture_t *  p_subpic = NULL;                   /* subpicture pointer */
Sam Hocevar's avatar
 
Sam Hocevar committed
734

735
    input_thread_t *p_input = NULL ;           /* Parent input, if it exists */
736

737 738 739
    vlc_value_t     val;
    vlc_bool_t      b_drop_late;

740 741
    int             i_displayed = 0, i_lost = 0, i_loops = 0;

Sam Hocevar's avatar
 
Sam Hocevar committed
742 743 744 745
    /*
     * Initialize thread
     */
    p_vout->b_error = InitThread( p_vout );
Gildas Bazin's avatar
 
Gildas Bazin committed
746

747 748 749 750
    var_Create( p_vout, "drop-late-frames", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
    var_Get( p_vout, "drop-late-frames", &val );
    b_drop_late = val.b_bool;

Gildas Bazin's avatar
 
Gildas Bazin committed
751 752 753
    /* signal the creation of the vout */
    vlc_thread_ready( p_vout );

Sam Hocevar's avatar
 
Sam Hocevar committed
754 755 756
    if( p_vout->b_error )
    {
        /* Destroy thread structures allocated by Create and InitThread */
757
        DestroyThread( p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
758 759
        return;
    }
760

761 762
    if( p_vout->b_title_show )
        DisplayTitleOnOSD( p_vout );
763

764
    /*
Sam Hocevar's avatar
Sam Hocevar committed
765
     * Main loop - it is not executed if an error occurred during
Sam Hocevar's avatar
 
Sam Hocevar committed
766
     * initialization
767
     */
Sam Hocevar's avatar
 
Sam Hocevar committed
768
    while( (!p_vout->b_die) && (!p_vout->b_error) )
769
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
770
        /* Initialize loop variables */
771
        p_picture = NULL;
Sam Hocevar's avatar
 
Sam Hocevar committed
772 773
        display_date = 0;
        current_date = mdate();
Sam Hocevar's avatar
 
Sam Hocevar committed
774

775 776 777 778 779
        if( p_input && p_input->b_die )
        {
            vlc_object_release( p_input );
            p_input = NULL;
        }
780

781
        i_loops++;
782 783 784 785 786
            if( !p_input )
            {
                p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT,
                                           FIND_PARENT );
            }
787 788
            if( p_input )
            {
Clément Stenac's avatar
Clément Stenac committed
789 790
                vlc_mutex_lock( &p_input->p->counters.counters_lock );
                stats_UpdateInteger( p_vout, p_input->p->counters.p_lost_pictures,
791 792
                                     i_lost , NULL);
                stats_UpdateInteger( p_vout,
Clément Stenac's avatar
Clément Stenac committed
793
                                     p_input->p->counters.p_displayed_pictures,
794 795
                                     i_displayed , NULL);
                i_displayed = i_lost = 0;
Clément Stenac's avatar
Clément Stenac committed
796
                vlc_mutex_unlock( &p_input->p->counters.counters_lock );
797
            }
798
#if 0
Sam Hocevar's avatar
 
Sam Hocevar committed
799 800
        p_vout->c_loops++;
        if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
801
        {
802 803
            msg_Dbg( p_vout, "picture heap: %d/%d",
                     I_RENDERPICTURES, p_vout->i_heap_size );
Sam Hocevar's avatar
 
Sam Hocevar committed
804
        }
805
#endif
Sam Hocevar's avatar
 
Sam Hocevar committed
806 807

        /*
808 809 810
         * Find the picture to display (the one with the earliest date).
         * This operation does not need lock, since only READY_PICTUREs
         * are handled. */
811
        for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
Sam Hocevar's avatar
 
Sam Hocevar committed
812
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
813 814 815
            if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
                && ( (p_picture == NULL) ||
                     (PP_RENDERPICTURE[i_index]->date < display_date) ) )
816
            {
Sam Hocevar's avatar
 
Sam Hocevar committed
817
                p_picture = PP_RENDERPICTURE[i_index];
Sam Hocevar's avatar
 
Sam Hocevar committed
818
                display_date = p_picture->date;
819 820
            }
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
821

822
        if( p_picture )
823
        {
824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839
            /* 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;
                    }
                }
            }
840

841 842 843 844 845 846 847 848 849 850 851 852 853 854
            /* 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 );
855
                p_last_picture = NULL;
856 857
            }

Sam Hocevar's avatar
 
Sam Hocevar committed
858 859 860 861
            /* Compute FPS rate */
            p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ]
                = display_date;

862
            if( !p_picture->b_force &&
863
                p_picture != p_last_picture &&
864
                display_date < current_date + p_vout->render_time &&
865
                b_drop_late )
Sam Hocevar's avatar
 
Sam Hocevar committed
866 867 868 869 870 871 872 873 874 875 876 877 878 879
            {
                /* 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
880
                    p_vout->i_heap_size--;
Sam Hocevar's avatar
 
Sam Hocevar committed
881
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
882
                msg_Warn( p_vout, "late picture skipped ("I64Fd")",
883
                                  current_date - display_date );
884
                i_lost++;
885 886 887 888
                vlc_mutex_unlock( &p_vout->picture_lock );

                continue;
            }
889

Gildas Bazin's avatar
 
Gildas Bazin committed
890
            if( display_date >
891
                current_date + p_vout->i_pts_delay + VOUT_BOGUS_DELAY )
892 893 894 895 896 897 898 899 900 901 902 903 904 905 906
            {
                /* 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--;
                }
907
                i_lost++;
908
                msg_Warn( p_vout, "vout warning: early picture skipped "
Gildas Bazin's avatar
 
Gildas Bazin committed
909 910
                          "("I64Fd")", display_date - current_date
                          - p_vout->i_pts_delay );
Sam Hocevar's avatar
 
Sam Hocevar committed
911 912 913 914
                vlc_mutex_unlock( &p_vout->picture_lock );

                continue;
            }
915

916
            if( display_date > current_date + VOUT_DISPLAY_DELAY )
Sam Hocevar's avatar
 
Sam Hocevar committed
917 918 919 920 921 922 923 924
            {
                /* 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;
            }
925 926
            else if( p_picture == p_last_picture )
            {
927