video_output.c 51.9 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.
 *****************************************************************************
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
8
 * Copyright (C) 2000-2007 VLC authors and VideoLAN
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
 *          Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
14
 *
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
15 16 17
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU Lesser General Public License as published by
 * the Free Software Foundation; either version 2.1 of the License, or
18
 * (at your option) any later version.
19
 *
20 21
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
22 23
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU Lesser General Public License for more details.
24
 *
Jean-Baptiste Kempf's avatar
LGPL  
Jean-Baptiste Kempf committed
25 26 27
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
28
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
29

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

37
#include <vlc_common.h>
38

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

Clément Stenac's avatar
Clément Stenac committed
43
#include <vlc_vout.h>
44

Clément Stenac's avatar
Clément Stenac committed
45
#include <vlc_filter.h>
46
#include <vlc_vout_osd.h>
47
#include <vlc_image.h>
Clément Stenac's avatar
Clément Stenac committed
48

49
#include <libvlc.h>
Laurent Aimar's avatar
Laurent Aimar committed
50
#include "vout_internal.h"
51 52
#include "interlacing.h"
#include "postprocessing.h"
53
#include "display.h"
54

55
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
56
 * Local prototypes
57
 *****************************************************************************/
58 59
static void *Thread(void *);
static void VoutDestructor(vlc_object_t *);
60

61 62 63 64
/* Maximum delay between 2 displayed pictures.
 * XXX it is needed for now but should be removed in the long term.
 */
#define VOUT_REDISPLAY_DELAY (INT64_C(80000))
65

66 67 68 69
/**
 * Late pictures having a delay higher than this value are thrashed.
 */
#define VOUT_DISPLAY_LATE_THRESHOLD (INT64_C(20000))
70 71

/* Better be in advance when awakening than late... */
72
#define VOUT_MWAIT_TOLERANCE (INT64_C(4000))
73

74 75 76
/* */
static int VoutValidateFormat(video_format_t *dst,
                              const video_format_t *src)
77
{
78 79
    if (src->i_width <= 0  || src->i_width  > 8192 ||
        src->i_height <= 0 || src->i_height > 8192)
80 81 82
        return VLC_EGENERIC;
    if (src->i_sar_num <= 0 || src->i_sar_den <= 0)
        return VLC_EGENERIC;
83

84 85 86 87 88 89 90 91 92 93
    /* */
    video_format_Copy(dst, src);
    dst->i_chroma = vlc_fourcc_GetCodec(VIDEO_ES, src->i_chroma);
    vlc_ureduce( &dst->i_sar_num, &dst->i_sar_den,
                 src->i_sar_num,  src->i_sar_den, 50000 );
    if (dst->i_sar_num <= 0 || dst->i_sar_den <= 0) {
        dst->i_sar_num = 1;
        dst->i_sar_den = 1;
    }
    video_format_FixRgb(dst);
94
    return VLC_SUCCESS;
95
}
96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111
static void VideoFormatCopyCropAr(video_format_t *dst,
                                  const video_format_t *src)
{
    video_format_CopyCrop(dst, src);
    dst->i_sar_num = src->i_sar_num;
    dst->i_sar_den = src->i_sar_den;
}
static bool VideoFormatIsCropArEqual(video_format_t *dst,
                                     const video_format_t *src)
{
    return dst->i_sar_num * src->i_sar_den == dst->i_sar_den * src->i_sar_num &&
           dst->i_x_offset       == src->i_x_offset &&
           dst->i_y_offset       == src->i_y_offset &&
           dst->i_visible_width  == src->i_visible_width &&
           dst->i_visible_height == src->i_visible_height;
}
112

113 114
static vout_thread_t *VoutCreate(vlc_object_t *object,
                                 const vout_configuration_t *cfg)
Michel Kaempf's avatar
Michel Kaempf committed
115
{
116
    video_format_t original;
117
    if (VoutValidateFormat(&original, cfg->fmt))
118 119
        return NULL;

120
    /* Allocate descriptor */
Laurent Aimar's avatar
Laurent Aimar committed
121 122
    vout_thread_t *vout = vlc_custom_create(object,
                                            sizeof(*vout) + sizeof(*vout->p),
123
                                            "video output");
Laurent Aimar's avatar
Laurent Aimar committed
124
    if (!vout) {
125
        video_format_Clean(&original);
126 127 128
        return NULL;
    }

129
    /* */
Laurent Aimar's avatar
Laurent Aimar committed
130
    vout->p = (vout_thread_sys_t*)&vout[1];
131

Laurent Aimar's avatar
Laurent Aimar committed
132
    vout->p->original = original;
133
    vout->p->dpb_size = cfg->dpb_size;
134

Laurent Aimar's avatar
Laurent Aimar committed
135 136
    vout_control_Init(&vout->p->control);
    vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_INIT);
137

Laurent Aimar's avatar
Laurent Aimar committed
138
    vout_statistic_Init(&vout->p->statistic);
139

Laurent Aimar's avatar
Laurent Aimar committed
140
    vout_snapshot_Init(&vout->p->snapshot);
141

Gildas Bazin's avatar
 
Gildas Bazin committed
142
    /* Initialize locks */
Laurent Aimar's avatar
Laurent Aimar committed
143
    vlc_mutex_init(&vout->p->picture_lock);
144
    vlc_mutex_init(&vout->p->filter.lock);
145
    vlc_mutex_init(&vout->p->spu_lock);
Gildas Bazin's avatar
 
Gildas Bazin committed
146

147
    /* Initialize subpicture unit */
Laurent Aimar's avatar
Laurent Aimar committed
148
    vout->p->spu = spu_Create(vout);
149

150
    /* Take care of some "interface/control" related initialisations */
Laurent Aimar's avatar
Laurent Aimar committed
151
    vout_IntfInit(vout);
Gildas Bazin's avatar
 
Gildas Bazin committed
152

153 154 155 156
    vout->p->title.show     = var_GetBool(vout, "video-title-show");
    vout->p->title.timeout  = var_GetInteger(vout, "video-title-timeout");
    vout->p->title.position = var_GetInteger(vout, "video-title-position");

157
    /* Get splitter name if present */
158
    char *splitter_name = var_InheritString(vout, "video-splitter");
159
    if (splitter_name && *splitter_name) {
Laurent Aimar's avatar
Laurent Aimar committed
160
        vout->p->splitter_name = splitter_name;
161
    } else {
Laurent Aimar's avatar
Laurent Aimar committed
162
        free(splitter_name);
Sam Hocevar's avatar
 
Sam Hocevar committed
163 164
    }

Laurent Aimar's avatar
Laurent Aimar committed
165
    /* */
Laurent Aimar's avatar
Laurent Aimar committed
166
    vout_InitInterlacingSupport(vout, vout->p->displayed.is_interlaced);
Laurent Aimar's avatar
Laurent Aimar committed
167 168

    /* */
Laurent Aimar's avatar
Laurent Aimar committed
169
    vlc_object_set_destructor(vout, VoutDestructor);
Gildas Bazin's avatar
 
Gildas Bazin committed
170

171
    /* */
Laurent Aimar's avatar
Laurent Aimar committed
172 173
    if (vlc_clone(&vout->p->thread, Thread, vout,
                  VLC_THREAD_PRIORITY_OUTPUT)) {
Laurent Aimar's avatar
Laurent Aimar committed
174
        spu_Destroy(vout->p->spu);
Laurent Aimar's avatar
Laurent Aimar committed
175
        vlc_object_release(vout);
176 177 178
        return NULL;
    }

Laurent Aimar's avatar
Laurent Aimar committed
179
    vout_control_WaitEmpty(&vout->p->control);
180

Laurent Aimar's avatar
Laurent Aimar committed
181 182 183
    if (vout->p->dead) {
        msg_Err(vout, "video output creation failed");
        vout_CloseAndRelease(vout);
184
        return NULL;
185
    }
Michel Kaempf's avatar
Michel Kaempf committed
186

187 188
    vout->p->input = cfg->input;
    if (vout->p->input)
Laurent Aimar's avatar
Laurent Aimar committed
189
        spu_Attach(vout->p->spu, vout->p->input, true);
190

Laurent Aimar's avatar
Laurent Aimar committed
191
    return vout;
Michel Kaempf's avatar
Michel Kaempf committed
192 193
}

194 195 196 197
vout_thread_t *(vout_Request)(vlc_object_t *object,
                              const vout_configuration_t *cfg)
{
    vout_thread_t *vout = cfg->vout;
Laurent Aimar's avatar
Laurent Aimar committed
198
    if (cfg->change_fmt && !cfg->fmt) {
199 200 201 202 203 204 205
        if (vout)
            vout_CloseAndRelease(vout);
        return NULL;
    }

    /* If a vout is provided, try reusing it */
    if (vout) {
206 207
        if (vout->p->input != cfg->input) {
            if (vout->p->input)
Laurent Aimar's avatar
Laurent Aimar committed
208
                spu_Attach(vout->p->spu, vout->p->input, false);
209 210
            vout->p->input = cfg->input;
            if (vout->p->input)
Laurent Aimar's avatar
Laurent Aimar committed
211
                spu_Attach(vout->p->spu, vout->p->input, true);
212
        }
213

Laurent Aimar's avatar
Laurent Aimar committed
214 215 216 217 218 219 220 221
        if (cfg->change_fmt) {
            vout_control_cmd_t cmd;
            vout_control_cmd_Init(&cmd, VOUT_CONTROL_REINIT);
            cmd.u.cfg = cfg;

            vout_control_Push(&vout->p->control, &cmd);
            vout_control_WaitEmpty(&vout->p->control);
        }
222 223 224 225 226 227 228 229 230 231 232 233

        if (!vout->p->dead) {
            msg_Dbg(object, "reusing provided vout");
            return vout;
        }
        vout_CloseAndRelease(vout);

        msg_Warn(object, "cannot reuse provided vout");
    }
    return VoutCreate(object, cfg);
}

Laurent Aimar's avatar
Laurent Aimar committed
234
void vout_Close(vout_thread_t *vout)
235
{
Laurent Aimar's avatar
Laurent Aimar committed
236
    assert(vout);
237

238
    if (vout->p->input)
Laurent Aimar's avatar
Laurent Aimar committed
239
        spu_Attach(vout->p->spu, vout->p->input, false);
240

Laurent Aimar's avatar
Laurent Aimar committed
241
    vout_snapshot_End(&vout->p->snapshot);
242

Laurent Aimar's avatar
Laurent Aimar committed
243 244
    vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_CLEAN);
    vlc_join(vout->p->thread, NULL);
245

246
    vlc_mutex_lock(&vout->p->spu_lock);
Laurent Aimar's avatar
Laurent Aimar committed
247 248
    spu_Destroy(vout->p->spu);
    vout->p->spu = NULL;
249
    vlc_mutex_unlock(&vout->p->spu_lock);
250 251 252
}

/* */
Laurent Aimar's avatar
Laurent Aimar committed
253
static void VoutDestructor(vlc_object_t *object)
254
{
Laurent Aimar's avatar
Laurent Aimar committed
255
    vout_thread_t *vout = (vout_thread_t *)object;
256

257
    /* Make sure the vout was stopped first */
Laurent Aimar's avatar
Laurent Aimar committed
258
    //assert(!vout->p_module);
259

Laurent Aimar's avatar
Laurent Aimar committed
260
    free(vout->p->splitter_name);
261

262
    /* Destroy the locks */
263
    vlc_mutex_destroy(&vout->p->spu_lock);
Laurent Aimar's avatar
Laurent Aimar committed
264
    vlc_mutex_destroy(&vout->p->picture_lock);
265
    vlc_mutex_destroy(&vout->p->filter.lock);
Laurent Aimar's avatar
Laurent Aimar committed
266
    vout_control_Clean(&vout->p->control);
267

268
    /* */
Laurent Aimar's avatar
Laurent Aimar committed
269
    vout_statistic_Clean(&vout->p->statistic);
270

271
    /* */
Laurent Aimar's avatar
Laurent Aimar committed
272
    vout_snapshot_Clean(&vout->p->snapshot);
273

Laurent Aimar's avatar
Laurent Aimar committed
274
    video_format_Clean(&vout->p->original);
Michel Kaempf's avatar
Michel Kaempf committed
275 276
}

Laurent Aimar's avatar
Laurent Aimar committed
277
/* */
278
void vout_ChangePause(vout_thread_t *vout, bool is_paused, mtime_t date)
Laurent Aimar's avatar
Laurent Aimar committed
279
{
280 281 282 283 284
    vout_control_cmd_t cmd;
    vout_control_cmd_Init(&cmd, VOUT_CONTROL_PAUSE);
    cmd.u.pause.is_on = is_paused;
    cmd.u.pause.date  = date;
    vout_control_Push(&vout->p->control, &cmd);
Laurent Aimar's avatar
Laurent Aimar committed
285

286
    vout_control_WaitEmpty(&vout->p->control);
Laurent Aimar's avatar
Laurent Aimar committed
287
}
288

Laurent Aimar's avatar
Laurent Aimar committed
289
void vout_GetResetStatistic(vout_thread_t *vout, int *displayed, int *lost)
290
{
Laurent Aimar's avatar
Laurent Aimar committed
291
    vout_statistic_GetReset( &vout->p->statistic, displayed, lost );
292
}
293

294
void vout_Flush(vout_thread_t *vout, mtime_t date)
295
{
296 297
    vout_control_PushTime(&vout->p->control, VOUT_CONTROL_FLUSH, date);
    vout_control_WaitEmpty(&vout->p->control);
298
}
299

300
void vout_Reset(vout_thread_t *vout)
301
{
302 303
    vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_RESET);
    vout_control_WaitEmpty(&vout->p->control);
304
}
305

306 307 308 309 310 311 312 313 314 315 316 317 318
bool vout_IsEmpty(vout_thread_t *vout)
{
    vlc_mutex_lock(&vout->p->picture_lock);

    picture_t *picture = picture_fifo_Peek(vout->p->decoder_fifo);
    if (picture)
        picture_Release(picture);

    vlc_mutex_unlock(&vout->p->picture_lock);

    return !picture;
}

319
void vout_FixLeaks( vout_thread_t *vout )
320 321 322 323 324 325
{
    vlc_mutex_lock(&vout->p->picture_lock);

    picture_t *picture = picture_fifo_Peek(vout->p->decoder_fifo);
    if (!picture) {
        picture = picture_pool_Get(vout->p->decoder_pool);
326
    }
327 328 329 330 331 332

    if (picture) {
        picture_Release(picture);
        /* Not all pictures has been displayed yet or some are
         * free */
        vlc_mutex_unlock(&vout->p->picture_lock);
333 334 335
        return;
    }

336 337 338
    /* There is no reason that no pictures are available, force one
     * from the pool, becarefull with it though */
    msg_Err(vout, "pictures leaked, trying to workaround");
339

340 341
    /* */
    picture_pool_NonEmpty(vout->p->decoder_pool, false);
Laurent Aimar's avatar
Laurent Aimar committed
342

343
    vlc_mutex_unlock(&vout->p->picture_lock);
344
}
345
void vout_NextPicture(vout_thread_t *vout, mtime_t *duration)
346
{
347 348 349
    vout_control_cmd_t cmd;
    vout_control_cmd_Init(&cmd, VOUT_CONTROL_STEP);
    cmd.u.time_ptr = duration;
350

351 352
    vout_control_Push(&vout->p->control, &cmd);
    vout_control_WaitEmpty(&vout->p->control);
353
}
354

355
void vout_DisplayTitle(vout_thread_t *vout, const char *title)
356
{
357 358
    assert(title);
    vout_control_PushString(&vout->p->control, VOUT_CONTROL_OSD_TITLE, title);
359
}
360

361 362
void vout_PutSubpicture( vout_thread_t *vout, subpicture_t *subpic )
{
363 364 365 366 367
    vout_control_cmd_t cmd;
    vout_control_cmd_Init(&cmd, VOUT_CONTROL_SUBPICTURE);
    cmd.u.subpicture = subpic;

    vout_control_Push(&vout->p->control, &cmd);
368 369 370
}
int vout_RegisterSubpictureChannel( vout_thread_t *vout )
{
371 372 373
    int channel = SPU_DEFAULT_CHANNEL;

    vlc_mutex_lock(&vout->p->spu_lock);
Laurent Aimar's avatar
Laurent Aimar committed
374 375
    if (vout->p->spu)
        channel = spu_RegisterChannel(vout->p->spu);
376 377 378
    vlc_mutex_unlock(&vout->p->spu_lock);

    return channel;
379 380 381
}
void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel )
{
382 383
    vout_control_PushInteger(&vout->p->control, VOUT_CONTROL_FLUSH_SUBPICTURE,
                             channel);
384 385
}

386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401
/**
 * It retreives a picture from the vout or NULL if no pictures are
 * available yet.
 *
 * You MUST call vout_PutPicture or vout_ReleasePicture on it.
 *
 * You may use vout_HoldPicture(paired with vout_ReleasePicture) to keep a
 * read-only reference.
 */
picture_t *vout_GetPicture(vout_thread_t *vout)
{
    /* Get lock */
    vlc_mutex_lock(&vout->p->picture_lock);
    picture_t *picture = picture_pool_Get(vout->p->decoder_pool);
    if (picture) {
        picture_Reset(picture);
402
        VideoFormatCopyCropAr(&picture->format, &vout->p->original);
403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455
    }
    vlc_mutex_unlock(&vout->p->picture_lock);

    return picture;
}

/**
 * It gives to the vout a picture to be displayed.
 *
 * The given picture MUST comes from vout_GetPicture.
 *
 * Becareful, after vout_PutPicture is called, picture_t::p_next cannot be
 * read/used.
 */
void vout_PutPicture(vout_thread_t *vout, picture_t *picture)
{
    vlc_mutex_lock(&vout->p->picture_lock);

    picture->p_next = NULL;
    picture_fifo_Push(vout->p->decoder_fifo, picture);

    vlc_mutex_unlock(&vout->p->picture_lock);

    vout_control_Wake(&vout->p->control);
}

/**
 * It releases a picture retreived by vout_GetPicture.
 */
void vout_ReleasePicture(vout_thread_t *vout, picture_t *picture)
{
    vlc_mutex_lock(&vout->p->picture_lock);

    picture_Release(picture);

    vlc_mutex_unlock(&vout->p->picture_lock);

    vout_control_Wake(&vout->p->control);
}

/**
 * It increment the reference counter of a picture retreived by
 * vout_GetPicture.
 */
void vout_HoldPicture(vout_thread_t *vout, picture_t *picture)
{
    vlc_mutex_lock(&vout->p->picture_lock);

    picture_Hold(picture);

    vlc_mutex_unlock(&vout->p->picture_lock);
}

456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489
/* */
int vout_GetSnapshot(vout_thread_t *vout,
                     block_t **image_dst, picture_t **picture_dst,
                     video_format_t *fmt,
                     const char *type, mtime_t timeout)
{
    picture_t *picture = vout_snapshot_Get(&vout->p->snapshot, timeout);
    if (!picture) {
        msg_Err(vout, "Failed to grab a snapshot");
        return VLC_EGENERIC;
    }

    if (image_dst) {
        vlc_fourcc_t codec = VLC_CODEC_PNG;
        if (type && image_Type2Fourcc(type))
            codec = image_Type2Fourcc(type);

        const int override_width  = var_GetInteger(vout, "snapshot-width");
        const int override_height = var_GetInteger(vout, "snapshot-height");

        if (picture_Export(VLC_OBJECT(vout), image_dst, fmt,
                           picture, codec, override_width, override_height)) {
            msg_Err(vout, "Failed to convert image for snapshot");
            picture_Release(picture);
            return VLC_EGENERIC;
        }
    }
    if (picture_dst)
        *picture_dst = picture;
    else
        picture_Release(picture);
    return VLC_SUCCESS;
}

490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510
/* vout_Control* are usable by anyone at anytime */
void vout_ControlChangeFullscreen(vout_thread_t *vout, bool fullscreen)
{
    vout_control_PushBool(&vout->p->control, VOUT_CONTROL_FULLSCREEN,
                          fullscreen);
}
void vout_ControlChangeOnTop(vout_thread_t *vout, bool is_on_top)
{
    vout_control_PushBool(&vout->p->control, VOUT_CONTROL_ON_TOP,
                          is_on_top);
}
void vout_ControlChangeDisplayFilled(vout_thread_t *vout, bool is_filled)
{
    vout_control_PushBool(&vout->p->control, VOUT_CONTROL_DISPLAY_FILLED,
                          is_filled);
}
void vout_ControlChangeZoom(vout_thread_t *vout, int num, int den)
{
    vout_control_PushPair(&vout->p->control, VOUT_CONTROL_ZOOM,
                          num, den);
}
511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527
void vout_ControlChangeSampleAspectRatio(vout_thread_t *vout,
                                         unsigned num, unsigned den)
{
    vout_control_PushPair(&vout->p->control, VOUT_CONTROL_ASPECT_RATIO,
                          num, den);
}
void vout_ControlChangeCropRatio(vout_thread_t *vout,
                                 unsigned num, unsigned den)
{
    vout_control_PushPair(&vout->p->control, VOUT_CONTROL_CROP_RATIO,
                          num, den);
}
void vout_ControlChangeCropWindow(vout_thread_t *vout,
                                  int x, int y, int width, int height)
{
    vout_control_cmd_t cmd;
    vout_control_cmd_Init(&cmd, VOUT_CONTROL_CROP_WINDOW);
528 529 530 531
    cmd.u.window.x      = __MAX(x, 0);
    cmd.u.window.y      = __MAX(y, 0);
    cmd.u.window.width  = __MAX(width, 0);
    cmd.u.window.height = __MAX(height, 0);
532 533 534 535 536 537 538 539

    vout_control_Push(&vout->p->control, &cmd);
}
void vout_ControlChangeCropBorder(vout_thread_t *vout,
                                  int left, int top, int right, int bottom)
{
    vout_control_cmd_t cmd;
    vout_control_cmd_Init(&cmd, VOUT_CONTROL_CROP_BORDER);
540 541 542 543
    cmd.u.border.left   = __MAX(left, 0);
    cmd.u.border.top    = __MAX(top, 0);
    cmd.u.border.right  = __MAX(right, 0);
    cmd.u.border.bottom = __MAX(bottom, 0);
544 545 546

    vout_control_Push(&vout->p->control, &cmd);
}
547 548 549 550 551
void vout_ControlChangeFilters(vout_thread_t *vout, const char *filters)
{
    vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_FILTERS,
                            filters);
}
552
void vout_ControlChangeSubSources(vout_thread_t *vout, const char *filters)
553
{
554
    vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_SUB_SOURCES,
555 556
                            filters);
}
557 558 559 560 561
void vout_ControlChangeSubFilters(vout_thread_t *vout, const char *filters)
{
    vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_SUB_FILTERS,
                            filters);
}
Laurent Aimar's avatar
Laurent Aimar committed
562 563 564 565 566
void vout_ControlChangeSubMargin(vout_thread_t *vout, int margin)
{
    vout_control_PushInteger(&vout->p->control, VOUT_CONTROL_CHANGE_SUB_MARGIN,
                             margin);
}
567

568 569 570 571 572 573 574 575 576 577 578
/* */
static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, const char *title)
{
    /* Load configuration */
    cfg->is_fullscreen = var_CreateGetBool(vout, "fullscreen");
    cfg->display.title = title;
    const int display_width = var_CreateGetInteger(vout, "width");
    const int display_height = var_CreateGetInteger(vout, "height");
    cfg->display.width   = display_width > 0  ? display_width  : 0;
    cfg->display.height  = display_height > 0 ? display_height : 0;
    cfg->is_display_filled  = var_CreateGetBool(vout, "autoscale");
579 580 581 582 583 584 585 586
    unsigned msar_num, msar_den;
    if (var_InheritURational(vout, &msar_num, &msar_den, "monitor-par") ||
        msar_num <= 0 || msar_den <= 0) {
        msar_num = 1;
        msar_den = 1;
    }
    cfg->display.sar.num = msar_num;
    cfg->display.sar.den = msar_den;
587 588 589 590 591 592 593 594 595 596 597 598 599
    unsigned zoom_den = 1000;
    unsigned zoom_num = zoom_den * var_CreateGetFloat(vout, "scale");
    vlc_ureduce(&zoom_num, &zoom_den, zoom_num, zoom_den, 0);
    cfg->zoom.num = zoom_num;
    cfg->zoom.den = zoom_den;
    cfg->align.vertical = VOUT_DISPLAY_ALIGN_CENTER;
    cfg->align.horizontal = VOUT_DISPLAY_ALIGN_CENTER;
    const int align_mask = var_CreateGetInteger(vout, "align");
    if (align_mask & 0x1)
        cfg->align.horizontal = VOUT_DISPLAY_ALIGN_LEFT;
    else if (align_mask & 0x2)
        cfg->align.horizontal = VOUT_DISPLAY_ALIGN_RIGHT;
    if (align_mask & 0x4)
600
        cfg->align.vertical = VOUT_DISPLAY_ALIGN_TOP;
601
    else if (align_mask & 0x8)
602
        cfg->align.vertical = VOUT_DISPLAY_ALIGN_BOTTOM;
603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634
}

vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
                                      const vout_window_cfg_t *cfg)
{
    VLC_UNUSED(vd);
    vout_window_cfg_t cfg_override = *cfg;

    if (!var_InheritBool( vout, "embedded-video"))
        cfg_override.is_standalone = true;

    if (vout->p->window.is_unused && vout->p->window.object) {
        assert(!vout->p->splitter_name);
        if (!cfg_override.is_standalone == !vout->p->window.cfg.is_standalone &&
            cfg_override.type           == vout->p->window.cfg.type) {
            /* Reuse the stored window */
            msg_Dbg(vout, "Reusing previous vout window");
            vout_window_t *window = vout->p->window.object;
            if (cfg_override.width  != vout->p->window.cfg.width ||
                cfg_override.height != vout->p->window.cfg.height)
                vout_window_SetSize(window,
                                    cfg_override.width, cfg_override.height);
            vout->p->window.is_unused = false;
            vout->p->window.cfg       = cfg_override;
            return window;
        }

        vout_window_Delete(vout->p->window.object);
        vout->p->window.is_unused = true;
        vout->p->window.object    = NULL;
    }

635
    vout_window_t *window = vout_window_New(VLC_OBJECT(vout), "$window",
636 637 638 639 640 641 642 643 644 645 646 647 648 649 650
                                            &cfg_override);
    if (!window)
        return NULL;
    if (!vout->p->splitter_name) {
        vout->p->window.is_unused = false;
        vout->p->window.cfg       = cfg_override;
        vout->p->window.object    = window;
    }
    return window;
}

void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
                              vout_window_t *window)
{
    VLC_UNUSED(vd);
651
    if (!vout->p->window.is_unused && vout->p->window.object == window) {
652
        vout->p->window.is_unused = true;
653 654 655 656 657
    } else if (vout->p->window.is_unused && vout->p->window.object && !window) {
        vout_window_Delete(vout->p->window.object);
        vout->p->window.is_unused = true;
        vout->p->window.object    = NULL;
    } else if (window) {
658
        vout_window_Delete(window);
659
    }
660 661
}

662
/* */
663
static picture_t *VoutVideoFilterInteractiveNewPicture(filter_t *filter)
664 665
{
    vout_thread_t *vout = (vout_thread_t*)filter->p_owner;
666

667
    picture_t *picture = picture_pool_Get(vout->p->private_pool);
668 669
    if (picture) {
        picture_Reset(picture);
670
        VideoFormatCopyCropAr(&picture->format, &filter->fmt_out.video);
671
    }
672
    return picture;
673
}
674 675 676 677 678 679 680
static picture_t *VoutVideoFilterStaticNewPicture(filter_t *filter)
{
    vout_thread_t *vout = (vout_thread_t*)filter->p_owner;

    vlc_assert_locked(&vout->p->filter.lock);
    if (filter_chain_GetLength(vout->p->filter.chain_interactive) == 0)
        return VoutVideoFilterInteractiveNewPicture(filter);
681

682 683
    return picture_NewFromFormat(&filter->fmt_out.video);
}
684 685 686 687 688
static void VoutVideoFilterDelPicture(filter_t *filter, picture_t *picture)
{
    VLC_UNUSED(filter);
    picture_Release(picture);
}
689
static int VoutVideoFilterStaticAllocationSetup(filter_t *filter, void *data)
690
{
691 692 693 694 695 696 697 698
    filter->pf_video_buffer_new = VoutVideoFilterStaticNewPicture;
    filter->pf_video_buffer_del = VoutVideoFilterDelPicture;
    filter->p_owner             = data; /* vout */
    return VLC_SUCCESS;
}
static int VoutVideoFilterInteractiveAllocationSetup(filter_t *filter, void *data)
{
    filter->pf_video_buffer_new = VoutVideoFilterInteractiveNewPicture;
699 700 701 702
    filter->pf_video_buffer_del = VoutVideoFilterDelPicture;
    filter->p_owner             = data; /* vout */
    return VLC_SUCCESS;
}
703
static void ThreadFilterFlush(vout_thread_t *vout, bool is_locked)
Laurent Aimar's avatar
Laurent Aimar committed
704 705 706 707 708 709 710 711 712
{
    if (vout->p->displayed.current)
        picture_Release( vout->p->displayed.current );
    vout->p->displayed.current = NULL;

    if (vout->p->displayed.next)
        picture_Release( vout->p->displayed.next );
    vout->p->displayed.next = NULL;

713 714
    if (!is_locked)
        vlc_mutex_lock(&vout->p->filter.lock);
Laurent Aimar's avatar
Laurent Aimar committed
715 716
    filter_chain_VideoFlush(vout->p->filter.chain_static);
    filter_chain_VideoFlush(vout->p->filter.chain_interactive);
717 718
    if (!is_locked)
        vlc_mutex_unlock(&vout->p->filter.lock);
Laurent Aimar's avatar
Laurent Aimar committed
719 720 721 722 723 724 725
}

typedef struct {
    char           *name;
    config_chain_t *cfg;
} vout_filter_t;

726 727 728 729
static void ThreadChangeFilters(vout_thread_t *vout,
                                const video_format_t *source,
                                const char *filters,
                                bool is_locked)
Laurent Aimar's avatar
Laurent Aimar committed
730
{
731
    ThreadFilterFlush(vout, is_locked);
Laurent Aimar's avatar
Laurent Aimar committed
732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762

    vlc_array_t array_static;
    vlc_array_t array_interactive;

    vlc_array_init(&array_static);
    vlc_array_init(&array_interactive);
    char *current = filters ? strdup(filters) : NULL;
    while (current) {
        config_chain_t *cfg;
        char *name;
        char *next = config_ChainCreate(&name, &cfg, current);

        if (name && *name) {
            vout_filter_t *e = xmalloc(sizeof(*e));
            e->name = name;
            e->cfg  = cfg;
            if (!strcmp(e->name, "deinterlace") ||
                !strcmp(e->name, "postproc")) {
                vlc_array_append(&array_static, e);
            } else {
                vlc_array_append(&array_interactive, e);
            }
        } else {
            if (cfg)
                config_ChainDestroy(cfg);
            free(name);
        }
        free(current);
        current = next;
    }

763 764 765
    if (!is_locked)
        vlc_mutex_lock(&vout->p->filter.lock);

Laurent Aimar's avatar
Laurent Aimar committed
766
    es_format_t fmt_target;
767
    es_format_InitFromVideo(&fmt_target, source ? source : &vout->p->filter.format);
Laurent Aimar's avatar
Laurent Aimar committed
768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790

    es_format_t fmt_current = fmt_target;

    for (int a = 0; a < 2; a++) {
        vlc_array_t    *array = a == 0 ? &array_static :
                                         &array_interactive;
        filter_chain_t *chain = a == 0 ? vout->p->filter.chain_static :
                                         vout->p->filter.chain_interactive;

        filter_chain_Reset(chain, &fmt_current, &fmt_current);
        for (int i = 0; i < vlc_array_count(array); i++) {
            vout_filter_t *e = vlc_array_item_at_index(array, i);
            msg_Dbg(vout, "Adding '%s' as %s", e->name, a == 0 ? "static" : "interactive");
            if (!filter_chain_AppendFilter(chain, e->name, e->cfg, NULL, NULL)) {
                msg_Err(vout, "Failed to add filter '%s'", e->name);
                config_ChainDestroy(e->cfg);
            }
            free(e->name);
            free(e);
        }
        fmt_current = *filter_chain_GetFmtOut(chain);
        vlc_array_clear(array);
    }
791
    VideoFormatCopyCropAr(&fmt_target.video, &fmt_current.video);
Laurent Aimar's avatar
Laurent Aimar committed
792 793 794 795 796 797 798 799 800 801
    if (!es_format_IsSimilar(&fmt_current, &fmt_target)) {
        msg_Dbg(vout, "Adding a filter to compensate for format changes");
        if (!filter_chain_AppendFilter(vout->p->filter.chain_interactive, NULL, NULL,
                                       &fmt_current, &fmt_target)) {
            msg_Err(vout, "Failed to compensate for the format changes, removing all filters");
            filter_chain_Reset(vout->p->filter.chain_static,      &fmt_target, &fmt_target);
            filter_chain_Reset(vout->p->filter.chain_interactive, &fmt_target, &fmt_target);
        }
    }

802 803 804 805 806 807 808 809 810 811 812
    if (vout->p->filter.configuration != filters) {
        free(vout->p->filter.configuration);
        vout->p->filter.configuration = filters ? strdup(filters) : NULL;
    }
    if (source) {
        video_format_Clean(&vout->p->filter.format);
        video_format_Copy(&vout->p->filter.format, source);
    }

    if (!is_locked)
        vlc_mutex_unlock(&vout->p->filter.lock);
Laurent Aimar's avatar
Laurent Aimar committed
813 814
}

815

816
/* */
817
static int ThreadDisplayPreparePicture(vout_thread_t *vout, bool reuse, bool is_late_dropped)
Vincent Seguin's avatar
Vincent Seguin committed
818
{
819
    int lost_count = 0;
820

821
    vlc_mutex_lock(&vout->p->filter.lock);
822

823 824
    picture_t *picture = filter_chain_VideoFilter(vout->p->filter.chain_static, NULL);
    assert(!reuse || !picture);
825

826 827 828 829
    while (!picture) {
        picture_t *decoded;
        if (reuse && vout->p->displayed.decoded) {
            decoded = picture_Hold(vout->p->displayed.decoded);
830
        } else {
831
            decoded = picture_fifo_Pop(vout->p->decoder_fifo);
832
            if (is_late_dropped && decoded && !decoded->b_force) {
833 834
                const mtime_t predicted = mdate() + 0; /* TODO improve */
                const mtime_t late = predicted - decoded->date;
835
                if (late > VOUT_DISPLAY_LATE_THRESHOLD) {
836
                    msg_Warn(vout, "picture is too late to be displayed (missing %d ms)", (int)(late/1000));
837
                    picture_Release(decoded);
838 839 840 841
                    lost_count++;
                    continue;
                } else if (late > 0) {
                    msg_Dbg(vout, "picture might be displayed late (missing %d ms)", (int)(late/1000));
842 843
                }
            }
844 845 846
            if (decoded &&
                !VideoFormatIsCropArEqual(&decoded->format, &vout->p->filter.format))
                ThreadChangeFilters(vout, &decoded->format, vout->p->filter.configuration, true);
847
        }
848 849 850
        if (!decoded)
            break;
        reuse = false;
851

852 853 854 855 856
        if (vout->p->displayed.decoded)
            picture_Release(vout->p->displayed.decoded);

        vout->p->displayed.decoded       = picture_Hold(decoded);
        vout->p->displayed.timestamp     = decoded->date;
857 858
        vout->p->displayed.is_interlaced = !decoded->b_progressive;
        vout->p->displayed.qtype         = decoded->i_qtype;
859 860

        picture = filter_chain_VideoFilter(vout->p->filter.chain_static, decoded);
861 862
    }

863 864 865 866 867
    vlc_mutex_unlock(&vout->p->filter.lock);

    vout_statistic_Update(&vout->p->statistic, 0, lost_count);
    if (!picture)
        return VLC_EGENERIC;
868

869 870 871 872 873 874
    assert(!vout->p->displayed.next);
    if (!vout->p->displayed.current)
        vout->p->displayed.current = picture;
    else
        vout->p->displayed.next    = picture;
    return VLC_SUCCESS;
875 876
}

877
static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
878
{
879
    vout_thread_sys_t *sys = vout->p;
880 881
    vout_display_t *vd = vout->p->display.vd;

882
    picture_t *torender = picture_Hold(vout->p->displayed.current);
883

884
    vout_chrono_Start(&vout->p->render);
885

886 887 888 889 890 891 892 893 894 895 896
    vlc_mutex_lock(&vout->p->filter.lock);
    picture_t *filtered = filter_chain_VideoFilter(vout->p->filter.chain_interactive, torender);
    vlc_mutex_unlock(&vout->p->filter.lock);

    if (!filtered)
        return VLC_EGENERIC;

    if (filtered->date != vout->p->displayed.current->date)
        msg_Warn(vout, "Unsupported timestamp modifications done by chain_interactive");

    /*
897
     * Get the subpicture to be displayed
898 899
     */
    const bool do_snapshot = vout_snapshot_IsRequested(&vout->p->snapshot);
900
    mtime_t render_subtitle_date;
901
    if (vout->p->pause.is_on)
902
        render_subtitle_date = vout->p->pause.date;
903
    else
904 905 906
        render_subtitle_date = filtered->date > 1 ? filtered->date : mdate();
    mtime_t render_osd_date = mdate(); /* FIXME wrong */

907 908 909 910 911 912
    /*
     * Get the subpicture to be displayed
     */
    const bool do_dr_spu = !do_snapshot &&
                           vd->info.subpicture_chromas &&
                           *vd->info.subpicture_chromas != 0;
913 914 915 916 917 918 919
    const bool do_early_spu = !do_dr_spu &&
                              (vd->info.is_slow ||
                               sys->display.use_dr ||
                               do_snapshot ||
                               !vout_IsDisplayFiltered(vd) ||
                               vd->fmt.i_width * vd->fmt.i_height <= vd->source.i_width * vd->source.i_height);

920 921 922
    const vlc_fourcc_t *subpicture_chromas;
    video_format_t fmt_spu;
    if (do_dr_spu) {
923 924 925 926 927 928 929 930 931 932 933 934
        vout_display_place_t place;
        vout_display_PlacePicture(&place, &vd->source, vd->cfg, false);

        fmt_spu = vd->source;
        if (fmt_spu.i_width * fmt_spu.i_height < place.width * place.height) {
            fmt_spu.i_sar_num = vd->cfg->display.sar.num;
            fmt_spu.i_sar_den = vd->cfg->display.sar.den;
            fmt_spu.i_width          =
            fmt_spu.i_visible_width  = place.width;
            fmt_spu.i_height         =
            fmt_spu.i_visible_height = place.height;
        }
935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962
        subpicture_chromas = vd->info.subpicture_chromas;
    } else {
        if (do_early_spu) {
            fmt_spu = vd->source;
        } else {
            fmt_spu = vd->fmt;
            fmt_spu.i_sar_num = vd->cfg->display.sar.num;
            fmt_spu.i_sar_den = vd->cfg->display.sar.den;
        }
        subpicture_chromas = NULL;

        if (vout->p->spu_blend &&
            vout->p->spu_blend->fmt_out.video.i_chroma != fmt_spu.i_chroma) {
            filter_DeleteBlend(vout->p->spu_blend);
            vout->p->spu_blend = NULL;
            vout->p->spu_blend_chroma = 0;
        }
        if (!vout->p->spu_blend && vout->p->spu_blend_chroma != fmt_spu.i_chroma) {
            vout->p->spu_blend_chroma = fmt_spu.i_chroma;
            vout->p->spu_blend = filter_NewBlend(VLC_OBJECT(vout), &fmt_spu);
            if (!vout->p->spu_blend)
                msg_Err(vout, "Failed to create blending filter, OSD/Subtitles will not work");
        }
    }

    subpicture_t *subpic = spu_Render(vout->p->spu,
                                      subpicture_chromas, &fmt_spu,
                                      &vd->source,
963 964
                                      render_subtitle_date, render_osd_date,
                                      do_snapshot);
965 966 967 968 969 970 971
    /*
     * Perform rendering
     *
     * We have to:
     * - be sure to end up with a direct buffer.
     * - blend subtitles, and in a fast access buffer
     */
972 973 974
    bool is_direct = vout->p->decoder_pool == vout->p->display_pool;
    picture_t *todisplay = filtered;
    if (do_early_spu && subpic) {
975
        todisplay = picture_pool_Get(vout->p->private_pool);
976 977 978
        if (todisplay) {
            VideoFormatCopyCropAr(&todisplay->format, &filtered->format);
            picture_Copy(todisplay, filtered);
979 980
            if (vout->p->spu_blend)
                picture_BlendSubpicture(todisplay, vout->p->spu_blend, subpic);
Sam Hocevar's avatar
 
Sam Hocevar committed
981
        }
982
        picture_Release(filtered);
983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999
        subpicture_Delete(subpic);
        subpic = NULL;

        if (!todisplay)
            return VLC_EGENERIC;
    }

    picture_t *direct;
    if (!is_direct && todisplay) {
        direct = picture_pool_Get(vout->p->display_pool);
        if (direct) {
            VideoFormatCopyCropAr(&direct->format, &todisplay->format);
            picture_Copy(direct, todisplay);
        }
        picture_Release(todisplay);
    } else {
        direct = todisplay;
1000
    }
Sam Hocevar's avatar
 
Sam Hocevar committed
1001

1002 1003 1004
    if (!direct) {
        if (subpic)
            subpicture_Delete(subpic);
1005
        return VLC_EGENERIC;
1006
    }
1007

1008 1009 1010 1011 1012
    /*
     * Take a snapshot if requested
     */
    if (do_snapshot)
        vout_snapshot_Set(&vout->p->snapshot, &vd->source, direct);
Sam Hocevar's avatar
 
Sam Hocevar committed
1013

1014 1015 1016 1017
    /* Render the direct buffer */
    assert(vout_IsDisplayFiltered(vd) == !sys->display.use_dr);
    vout_UpdateDisplaySourceProperties(vd, &direct->format);
    if (sys->display.use_dr) {
1018
        vout_display_Prepare(vd, direct, subpic);
1019 1020
    } else {
        sys->display.filtered = vout_FilterDisplay(vd, direct);
1021 1022 1023 1024 1025 1026 1027
        if (sys->display.filtered) {
            if (!do_dr_spu && !do_early_spu && vout->p->spu_blend && subpic)
                picture_BlendSubpicture(sys->display.filtered, vout->p->spu_blend, subpic);
            vout_display_Prepare(vd, sys->display.filtered, do_dr_spu ? subpic : NULL);
        }
        if (!do_dr_spu && subpic)
            subpicture_Delete(subpic);
1028 1029
        if (!sys->display.filtered)
            return VLC_EGENERIC;
1030
    }
1031 1032

    vout_chrono_Stop(&vout->p->render);
1033
#if 0
1034 1035 1036 1037 1038
        {
        static int i = 0;
        if (((i++)%10) == 0)
            msg_Info(vout, "render: avg %d ms var %d ms",
                     (int)(vout->p->render.avg/1000), (int)(vout->p->render.var/1000));
1039
        }
1040 1041 1042 1043 1044 1045 1046 1047 1048 1049
#endif

    /* Wait the real date (for rendering jitter) */
#if 0
    mtime_t delay = direct->date - mdate();
    if (delay < 1000)
        msg_Warn(vout, "picture is late (%lld ms)", delay / 1000);
#endif
    if (!is_forced)
        mwait(direct->date);
1050

1051 1052
    /* Display the direct buffer returned by vout_RenderPicture */
    vout->p->displayed.date = mdate();
1053 1054 1055
    vout_display_Display(vd,
                         sys->display.filtered ? sys->display.filtered
                                                : direct,
1056
                         subpic);
1057
    sys->display.filtered = NULL;
1058 1059 1060 1061 1062

    vout_statistic_Update(&vout->p->statistic, 1, 0);

    return VLC_SUCCESS;
}
Vincent Seguin's avatar
Vincent Seguin committed
1063

1064 1065 1066
static int ThreadDisplayPicture(vout_thread_t *vout,
                                bool now, mtime_t *deadline)
{
1067
    bool is_late_dropped = vout->p->is_late_dropped && !vout->p->pause.is_on && !now;
1068
    bool first = !vout->p->displayed.current;
1069
    if (first && ThreadDisplayPreparePicture(vout, true, is_late_dropped)) /* FIXME not sure it is ok */
1070 1071 1072
        return VLC_EGENERIC;
    if (!vout->p->pause.is_on || now) {
        while (!vout->p->displayed.next) {
1073
            if (ThreadDisplayPreparePicture(vout, false, is_late_dropped)) {
1074
                break;
1075
            }
1076
        }
1077
    }
Vincent Seguin's avatar
Vincent Seguin committed
1078

1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113
    const mtime_t date = mdate();
    const mtime_t render_delay = vout_chrono_GetHigh(&vout->p->render) + VOUT_MWAIT_TOLERANCE;

    mtime_t date_next = VLC_TS_INVALID;
    if (!vout->p->pause.is_on && vout->p->displayed.next)
        date_next = vout->p->displayed.next->date - render_delay;

    /* FIXME/XXX we must redisplay the last decoded picture (because
     * of potential vout updated, or filters update or SPU update)
     * For now a high update period is needed but it coulmd be removed
     * if and only if:
     * - vout module emits events from theselves.
     * - *and* SPU is modified to emit an event or a deadline when needed.
     *
     * So it will be done latter.
     */
    mtime_t date_refresh = VLC_TS_INVALID;
    if (vout->p->displayed.date > VLC_TS_INVALID)
        date_refresh = vout->p->displayed.date + VOUT_REDISPLAY_DELAY - render_delay;

    bool drop = now;
    if (date_next != VLC_TS_INVALID)
        drop |= date_next + 0 <= date;

    bool refresh = false;
    if (date_refresh > VLC_TS_INVALID)
        refresh = date_refresh <= date;

    if (!first && !refresh && !drop) {
        if (date_next != VLC_TS_INVALID && date_refresh != VLC_TS_INVALID)
            *deadline = __MIN(date_next, date_refresh);
        else if (date_next != VLC_TS_INVALID)
            *deadline = date_next;
        else if (date_refresh != VLC_TS_INVALID)
            *deadline = date_refresh;
1114
        return VLC_EGENERIC;
1115 1116 1117 1118 1119 1120 1121
    }

    if (drop) {
        picture_Release(vout->p->displayed.current);
        vout->p->displayed.current = vout->p->displayed.next;
        vout->p->displayed.next    = NULL;
    }
1122 1123
    if (!vout->p->displayed.current)
        return VLC_EGENERIC;
1124 1125 1126

    bool is_forced = now || (!drop && refresh) || vout->p->displayed.current->b_force;
    return ThreadDisplayRenderPicture(vout, is_forced);
1127
}
1128

1129 1130 1131 1132
static void ThreadManage(vout_thread_t *vout,
                         mtime_t *deadline,
                         vout_interlacing_support_t *interlacing,
                         vout_postprocessing_support_t *postprocessing)
1133 1134 1135 1136
{
    vlc_mutex_lock(&vout->p->picture_lock);

    *deadline = VLC_TS_INVALID;
1137 1138 1139 1140
    for (;;) {
        if (ThreadDisplayPicture(vout, false, deadline))
            break;
    }
1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152

    const int  picture_qtype      = vout->p->displayed.qtype;
    const bool picture_interlaced = vout->p->displayed.is_interlaced;

    vlc_mutex_unlock(&vout->p->picture_lock);

    /* Post processing */
    vout_SetPostProcessingState(vout, postprocessing, picture_qtype);

    /* Deinterlacing */
    vout_SetInterlacingState(vout, interlacing, picture_interlaced);

1153
    vout_ManageWrapper(vout);
1154 1155
}

1156 1157 1158
static void ThreadDisplaySubpicture(vout_thread_t *vout,
                                    subpicture_t *subpicture)
{
1159
    spu_PutSubpicture(vout->p->spu, subpicture);
1160
}
1161 1162 1163

static void ThreadFlushSubpicture(vout_thread_t *vout, int channel)
{
Laurent Aimar's avatar
Laurent Aimar committed
1164
    spu_ClearChannel(vout->p->spu, channel);
1165 1166
}

1167
static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string)
1168
{