video_output.c 38.8 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
 *          Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
14 15 16 17 18
 *
 * 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.
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
22 23
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
24
 *
25 26
 * 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
27
 * 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>
Clément Stenac's avatar
Clément Stenac committed
47

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

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

60 61 62 63
/* 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))
64

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

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

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

82 83 84 85 86 87 88 89 90 91
    /* */
    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);
92
    return VLC_SUCCESS;
93 94
}

95 96
static vout_thread_t *VoutCreate(vlc_object_t *object,
                                 const vout_configuration_t *cfg)
Michel Kaempf's avatar
Michel Kaempf committed
97
{
98
    video_format_t original;
99
    if (VoutValidateFormat(&original, cfg->fmt))
100 101
        return NULL;

102
    /* Allocate descriptor */
Laurent Aimar's avatar
Laurent Aimar committed
103 104 105 106
    vout_thread_t *vout = vlc_custom_create(object,
                                            sizeof(*vout) + sizeof(*vout->p),
                                            VLC_OBJECT_VOUT, "video output");
    if (!vout) {
107
        video_format_Clean(&original);
108 109 110
        return NULL;
    }

111
    /* */
Laurent Aimar's avatar
Laurent Aimar committed
112
    vout->p = (vout_thread_sys_t*)&vout[1];
113

Laurent Aimar's avatar
Laurent Aimar committed
114
    vout->p->original = original;
115
    vout->p->dpb_size = cfg->dpb_size;
116

Laurent Aimar's avatar
Laurent Aimar committed
117 118
    vout_control_Init(&vout->p->control);
    vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_INIT);
119

Laurent Aimar's avatar
Laurent Aimar committed
120 121 122
    vout_statistic_Init(&vout->p->statistic);
    vout->p->i_par_num =
    vout->p->i_par_den = 1;
123

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

Gildas Bazin's avatar
 
Gildas Bazin committed
126
    /* Initialize locks */
Laurent Aimar's avatar
Laurent Aimar committed
127 128
    vlc_mutex_init(&vout->p->picture_lock);
    vlc_mutex_init(&vout->p->vfilter_lock);
Gildas Bazin's avatar
 
Gildas Bazin committed
129 130

    /* Attach the new object now so we can use var inheritance below */
Laurent Aimar's avatar
Laurent Aimar committed
131
    vlc_object_attach(vout, object);
Gildas Bazin's avatar
 
Gildas Bazin committed
132

133
    /* Initialize subpicture unit */
Laurent Aimar's avatar
Laurent Aimar committed
134
    vout->p->p_spu = spu_Create(vout);
135

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

139
    /* Get splitter name if present */
Laurent Aimar's avatar
Laurent Aimar committed
140
    char *splitter_name = var_GetNonEmptyString(vout, "vout-filter");
141
    if (splitter_name) {
Laurent Aimar's avatar
Laurent Aimar committed
142 143
        if (asprintf(&vout->p->splitter_name, "%s,none", splitter_name) < 0)
            vout->p->splitter_name = NULL;
144 145
        free(splitter_name);
    } else {
Laurent Aimar's avatar
Laurent Aimar committed
146
        vout->p->splitter_name = NULL;
Sam Hocevar's avatar
 
Sam Hocevar committed
147 148
    }

Laurent Aimar's avatar
Laurent Aimar committed
149
    /* */
Laurent Aimar's avatar
Laurent Aimar committed
150
    vout_InitInterlacingSupport(vout, vout->p->displayed.is_interlaced);
Laurent Aimar's avatar
Laurent Aimar committed
151 152

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

155
    /* */
Laurent Aimar's avatar
Laurent Aimar committed
156 157
    if (vlc_clone(&vout->p->thread, Thread, vout,
                  VLC_THREAD_PRIORITY_OUTPUT)) {
158
        spu_Destroy(vout->p->p_spu);
Laurent Aimar's avatar
Laurent Aimar committed
159
        vlc_object_release(vout);
160 161 162
        return NULL;
    }

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

Laurent Aimar's avatar
Laurent Aimar committed
165 166 167
    if (vout->p->dead) {
        msg_Err(vout, "video output creation failed");
        vout_CloseAndRelease(vout);
168
        return NULL;
169
    }
Michel Kaempf's avatar
Michel Kaempf committed
170

171 172 173 174
    vout->p->input = cfg->input;
    if (vout->p->input)
        spu_Attach(vout->p->p_spu, vout->p->input, true);

Laurent Aimar's avatar
Laurent Aimar committed
175
    return vout;
Michel Kaempf's avatar
Michel Kaempf committed
176 177
}

178 179 180 181
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
182
    if (cfg->change_fmt && !cfg->fmt) {
183 184 185 186 187 188 189
        if (vout)
            vout_CloseAndRelease(vout);
        return NULL;
    }

    /* If a vout is provided, try reusing it */
    if (vout) {
190 191 192 193 194 195 196
        if (vout->p->input != cfg->input) {
            if (vout->p->input)
                spu_Attach(vout->p->p_spu, vout->p->input, false);
            vout->p->input = cfg->input;
            if (vout->p->input)
                spu_Attach(vout->p->p_spu, vout->p->input, true);
        }
197

Laurent Aimar's avatar
Laurent Aimar committed
198 199 200 201 202 203 204 205
        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);
        }
206 207 208 209 210 211 212 213 214 215 216 217

        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);
}

218
/*****************************************************************************
219
 * vout_Close: Close a vout created by VoutCreate.
220
 *****************************************************************************
221 222
 * You HAVE to call it on vout created by VoutCreate before vlc_object_release.
 * You should NEVER call it on vout not obtained through VoutCreate
223
 * (like with vout_Request or vlc_object_find.)
224
 * You can use vout_CloseAndRelease() as a convenience method.
225
 *****************************************************************************/
Laurent Aimar's avatar
Laurent Aimar committed
226
void vout_Close(vout_thread_t *vout)
227
{
Laurent Aimar's avatar
Laurent Aimar committed
228
    assert(vout);
229

230 231
    if (vout->p->input)
        spu_Attach(vout->p->p_spu, vout->p->input, false);
232

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

Laurent Aimar's avatar
Laurent Aimar committed
235 236
    vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_CLEAN);
    vlc_join(vout->p->thread, NULL);
237 238

    spu_Destroy(vout->p->p_spu);
239 240 241
}

/* */
Laurent Aimar's avatar
Laurent Aimar committed
242
static void VoutDestructor(vlc_object_t *object)
243
{
Laurent Aimar's avatar
Laurent Aimar committed
244
    vout_thread_t *vout = (vout_thread_t *)object;
245

246
    /* Make sure the vout was stopped first */
Laurent Aimar's avatar
Laurent Aimar committed
247
    //assert(!vout->p_module);
248

Laurent Aimar's avatar
Laurent Aimar committed
249
    free(vout->p->splitter_name);
250

251
    /* Destroy the locks */
Laurent Aimar's avatar
Laurent Aimar committed
252 253 254
    vlc_mutex_destroy(&vout->p->picture_lock);
    vlc_mutex_destroy(&vout->p->vfilter_lock);
    vout_control_Clean(&vout->p->control);
255

256
    /* */
Laurent Aimar's avatar
Laurent Aimar committed
257
    vout_statistic_Clean(&vout->p->statistic);
258

259
    /* */
Laurent Aimar's avatar
Laurent Aimar committed
260
    vout_snapshot_Clean(&vout->p->snapshot);
261

Laurent Aimar's avatar
Laurent Aimar committed
262
    video_format_Clean(&vout->p->original);
Michel Kaempf's avatar
Michel Kaempf committed
263 264
}

Laurent Aimar's avatar
Laurent Aimar committed
265
/* */
266
void vout_ChangePause(vout_thread_t *vout, bool is_paused, mtime_t date)
Laurent Aimar's avatar
Laurent Aimar committed
267
{
268 269 270 271 272
    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
273

274
    vout_control_WaitEmpty(&vout->p->control);
Laurent Aimar's avatar
Laurent Aimar committed
275
}
276

Laurent Aimar's avatar
Laurent Aimar committed
277
void vout_GetResetStatistic(vout_thread_t *vout, int *displayed, int *lost)
278
{
Laurent Aimar's avatar
Laurent Aimar committed
279
    vout_statistic_GetReset( &vout->p->statistic, displayed, lost );
280
}
281

282
void vout_Flush(vout_thread_t *vout, mtime_t date)
283
{
284 285
    vout_control_PushTime(&vout->p->control, VOUT_CONTROL_FLUSH, date);
    vout_control_WaitEmpty(&vout->p->control);
286
}
287

288
void vout_Reset(vout_thread_t *vout)
289
{
290 291
    vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_RESET);
    vout_control_WaitEmpty(&vout->p->control);
292
}
293

294 295 296 297 298 299 300 301 302 303 304 305 306
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;
}

307
void vout_FixLeaks( vout_thread_t *vout )
308 309 310 311 312 313
{
    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);
314
    }
315 316 317 318 319 320

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

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

328 329
    /* */
    picture_pool_NonEmpty(vout->p->decoder_pool, false);
Laurent Aimar's avatar
Laurent Aimar committed
330

331
    vlc_mutex_unlock(&vout->p->picture_lock);
332
}
333
void vout_NextPicture(vout_thread_t *vout, mtime_t *duration)
334
{
335 336 337
    vout_control_cmd_t cmd;
    vout_control_cmd_Init(&cmd, VOUT_CONTROL_STEP);
    cmd.u.time_ptr = duration;
338

339 340
    vout_control_Push(&vout->p->control, &cmd);
    vout_control_WaitEmpty(&vout->p->control);
341
}
342

343
void vout_DisplayTitle(vout_thread_t *vout, const char *title)
344
{
345 346
    assert(title);
    vout_control_PushString(&vout->p->control, VOUT_CONTROL_OSD_TITLE, title);
347
}
348

349 350
void vout_PutSubpicture( vout_thread_t *vout, subpicture_t *subpic )
{
351 352 353 354 355
    vout_control_cmd_t cmd;
    vout_control_cmd_Init(&cmd, VOUT_CONTROL_SUBPICTURE);
    cmd.u.subpicture = subpic;

    vout_control_Push(&vout->p->control, &cmd);
356 357 358
}
int vout_RegisterSubpictureChannel( vout_thread_t *vout )
{
359
    return spu_RegisterChannel(vout->p->p_spu);
360 361 362
}
void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel )
{
363 364
    vout_control_PushInteger(&vout->p->control, VOUT_CONTROL_FLUSH_SUBPICTURE,
                             channel);
365 366
}

367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387
/* 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);
}
388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423
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);
    cmd.u.window.x      = x;
    cmd.u.window.y      = y;
    cmd.u.window.width  = width;
    cmd.u.window.height = height;

    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);
    cmd.u.border.left   = left;
    cmd.u.border.top    = top;
    cmd.u.border.right  = right;
    cmd.u.border.bottom = bottom;

    vout_control_Push(&vout->p->control, &cmd);
}
424 425 426 427 428
void vout_ControlChangeFilters(vout_thread_t *vout, const char *filters)
{
    vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_FILTERS,
                            filters);
}
429 430 431 432 433
void vout_ControlChangeSubFilters(vout_thread_t *vout, const char *filters)
{
    vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_SUB_FILTERS,
                            filters);
}
434

435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 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 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511
/* */
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");
    cfg->display.sar.num = 1; /* TODO monitor AR */
    cfg->display.sar.den = 1;
    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)
        cfg->align.horizontal = VOUT_DISPLAY_ALIGN_TOP;
    else if (align_mask & 0x8)
        cfg->align.horizontal = VOUT_DISPLAY_ALIGN_BOTTOM;
}

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;
    }

    vout_window_t *window = vout_window_New(VLC_OBJECT(vout), NULL,
                                            &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);
512
    if (!vout->p->window.is_unused && vout->p->window.object == window) {
513
        vout->p->window.is_unused = true;
514 515 516 517 518
    } 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) {
519
        vout_window_Delete(window);
520
    }
521 522
}

523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540
/* */
static picture_t *VoutVideoFilterNewPicture(filter_t *filter)
{
    vout_thread_t *vout = (vout_thread_t*)filter->p_owner;
    return picture_pool_Get(vout->p->private_pool);
}
static void VoutVideoFilterDelPicture(filter_t *filter, picture_t *picture)
{
    VLC_UNUSED(filter);
    picture_Release(picture);
}
static int VoutVideoFilterAllocationSetup(filter_t *filter, void *data)
{
    filter->pf_video_buffer_new = VoutVideoFilterNewPicture;
    filter->pf_video_buffer_del = VoutVideoFilterDelPicture;
    filter->p_owner             = data; /* vout */
    return VLC_SUCCESS;
}
541

542
/* */
543 544
static int ThreadDisplayPicture(vout_thread_t *vout,
                                bool now, mtime_t *deadline)
Vincent Seguin's avatar
Vincent Seguin committed
545
{
546
    vout_display_t *vd = vout->p->display.vd;
547 548 549 550 551
    int displayed_count = 0;
    int lost_count = 0;

    for (;;) {
        const mtime_t date = mdate();
552
        const bool is_paused = vout->p->pause.is_on;
553
        bool redisplay = is_paused && !now && vout->p->displayed.decoded;
554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572
        bool is_forced;

        /* 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.
         */
        if (!redisplay) {
            picture_t *peek = picture_fifo_Peek(vout->p->decoder_fifo);
            if (peek) {
                is_forced = peek->b_force || is_paused || now;
                *deadline = (is_forced ? date : peek->date) - vout_chrono_GetHigh(&vout->p->render);
                picture_Release(peek);
            } else {
                redisplay = true;
573 574
            }
        }
575 576
        if (redisplay) {
             /* FIXME a better way for this delay is needed */
577
            const mtime_t date_update = vout->p->displayed.date + VOUT_REDISPLAY_DELAY;
578 579 580
            if (date_update > date || !vout->p->displayed.decoded) {
                *deadline = vout->p->displayed.decoded ? date_update : VLC_TS_INVALID;
                break;
581
            }
582 583 584
            /* */
            is_forced = true;
            *deadline = date - vout_chrono_GetHigh(&vout->p->render);
585
        }
586 587
        if (*deadline > VOUT_MWAIT_TOLERANCE)
            *deadline -= VOUT_MWAIT_TOLERANCE;
588

589
        /* If we are too early and can wait, do it */
590 591
        if (date < *deadline && !now)
            break;
592

593 594 595 596 597 598 599 600 601 602 603 604
        picture_t *decoded;
        if (redisplay) {
            decoded = vout->p->displayed.decoded;
            vout->p->displayed.decoded = NULL;
        } else {
            decoded = picture_fifo_Pop(vout->p->decoder_fifo);
            assert(decoded);
            if (!is_forced && !vout->p->is_late_dropped) {
                const mtime_t predicted = date + vout_chrono_GetLow(&vout->p->render);
                const mtime_t late = predicted - decoded->date;
                if (late > 0) {
                    msg_Dbg(vout, "picture might be displayed late (missing %d ms)", (int)(late/1000));
605
                    if (late > VOUT_DISPLAY_LATE_THRESHOLD) {
606 607 608 609 610
                        msg_Warn(vout, "rejected picture because of render time");
                        /* TODO */
                        picture_Release(decoded);
                        lost_count++;
                        break;
611 612 613
                    }
                }
            }
614 615 616

            vout->p->displayed.is_interlaced = !decoded->b_progressive;
            vout->p->displayed.qtype         = decoded->i_qtype;
617
        }
618
        vout->p->displayed.timestamp = decoded->date;
619 620

        /* */
621 622 623 624
        if (vout->p->displayed.decoded)
            picture_Release(vout->p->displayed.decoded);
        picture_Hold(decoded);
        vout->p->displayed.decoded = decoded;
625

626 627
        /* */
        vout_chrono_Start(&vout->p->render);
628

629 630 631
        picture_t *filtered = NULL;
        if (decoded) {
            vlc_mutex_lock(&vout->p->vfilter_lock);
Laurent Aimar's avatar
Laurent Aimar committed
632
            filtered = filter_chain_VideoFilter(vout->p->vfilter_chain, decoded);
633 634 635 636
            //assert(filtered == decoded); // TODO implement
            vlc_mutex_unlock(&vout->p->vfilter_lock);
            if (!filtered)
                continue;
637
        }
638

Sam Hocevar's avatar
 
Sam Hocevar committed
639 640 641
        /*
         * Check for subpictures to display
         */
642 643
        const bool do_snapshot = vout_snapshot_IsRequested(&vout->p->snapshot);
        mtime_t spu_render_time = is_forced ? mdate() : filtered->date;
644 645
        if (vout->p->pause.is_on)
            spu_render_time = vout->p->pause.date;
646
        else
647
            spu_render_time = filtered->date > 1 ? filtered->date : mdate();
648

649 650 651
        subpicture_t *subpic = spu_SortSubpictures(vout->p->p_spu,
                                                   spu_render_time,
                                                   do_snapshot);
Sam Hocevar's avatar
 
Sam Hocevar committed
652 653
        /*
         * Perform rendering
654 655 656 657
         *
         * We have to:
         * - be sure to end up with a direct buffer.
         * - blend subtitles, and in a fast access buffer
Sam Hocevar's avatar
 
Sam Hocevar committed
658
         */
659 660 661 662 663
        picture_t *direct = NULL;
        if (filtered &&
            (vout->p->decoder_pool != vout->p->display_pool || subpic)) {
            picture_t *render;
            if (vout->p->is_decoder_pool_slow)
664
                render = picture_NewFromFormat(&vd->source);
665 666 667 668
            else if (vout->p->decoder_pool != vout->p->display_pool)
                render = picture_pool_Get(vout->p->display_pool);
            else
                render = picture_pool_Get(vout->p->private_pool);
Sam Hocevar's avatar
 
Sam Hocevar committed
669

670 671
            if (render) {
                picture_Copy(render, filtered);
672

673
                spu_RenderSubpictures(vout->p->p_spu,
674 675
                                      render, &vd->source,
                                      subpic, &vd->source, spu_render_time);
676 677 678 679 680 681 682 683 684 685 686 687 688 689
            }
            if (vout->p->is_decoder_pool_slow) {
                direct = picture_pool_Get(vout->p->display_pool);
                if (direct)
                    picture_Copy(direct, render);
                picture_Release(render);

            } else {
                direct = render;
            }
            picture_Release(filtered);
            filtered = NULL;
        } else {
            direct = filtered;
Sam Hocevar's avatar
 
Sam Hocevar committed
690 691
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
692
        /*
693
         * Take a snapshot if requested
Sam Hocevar's avatar
 
Sam Hocevar committed
694
         */
695
        if (direct && do_snapshot)
696
            vout_snapshot_Set(&vout->p->snapshot, &vd->source, direct);
697

698 699 700
        /* Render the direct buffer returned by vout_RenderPicture */
        if (direct) {
            vout_RenderWrapper(vout, direct);
Sam Hocevar's avatar
 
Sam Hocevar committed
701

702 703
            vout_chrono_Stop(&vout->p->render);
#if 0
Gildas Bazin's avatar
 
Gildas Bazin committed
704
            {
705 706 707 708
            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));
Gildas Bazin's avatar
 
Gildas Bazin committed
709
            }
710
#endif
711
        }
712

713 714 715
        /* Wait the real date (for rendering jitter) */
        if (!is_forced)
            mwait(decoded->date);
Sam Hocevar's avatar
 
Sam Hocevar committed
716

717
        /* Display the direct buffer returned by vout_RenderPicture */
718
        vout->p->displayed.date = mdate();
719 720
        if (direct)
            vout_DisplayWrapper(vout, direct);
Vincent Seguin's avatar
Vincent Seguin committed
721

722 723 724
        displayed_count++;
        break;
    }
Vincent Seguin's avatar
Vincent Seguin committed
725

726 727 728 729 730
    vout_statistic_Update(&vout->p->statistic, displayed_count, lost_count);
    if (displayed_count <= 0)
        return VLC_EGENERIC;
    return VLC_SUCCESS;
}
731

732 733 734 735
static void ThreadManage(vout_thread_t *vout,
                         mtime_t *deadline,
                         vout_interlacing_support_t *interlacing,
                         vout_postprocessing_support_t *postprocessing)
736 737 738 739
{
    vlc_mutex_lock(&vout->p->picture_lock);

    *deadline = VLC_TS_INVALID;
740
    ThreadDisplayPicture(vout, false, deadline);
741 742 743 744 745 746 747 748 749 750 751 752

    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);

753
    vout_ManageWrapper(vout);
754 755
}

756 757 758 759 760
static void ThreadDisplaySubpicture(vout_thread_t *vout,
                                    subpicture_t *subpicture)
{
    spu_DisplaySubpicture(vout->p->p_spu, subpicture);
}
761 762 763 764 765 766

static void ThreadFlushSubpicture(vout_thread_t *vout, int channel)
{
    spu_ClearChannel(vout->p->p_spu, channel);
}

767
static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string)
768
{
769
    if (!vout->p->title.show)
770 771
        return;

772 773 774
    vout_OSDText(vout, SPU_DEFAULT_CHANNEL,
                 vout->p->title.position, INT64_C(1000) * vout->p->title.timeout,
                 string);
775 776
}

777
static void ThreadChangeFilters(vout_thread_t *vout, const char *filters)
778
{
779
    es_format_t fmt;
780 781
    es_format_Init(&fmt, VIDEO_ES, vout->p->original.i_chroma);
    fmt.video = vout->p->original;
782

783 784
    vlc_mutex_lock(&vout->p->vfilter_lock);

Laurent Aimar's avatar
Laurent Aimar committed
785 786
    filter_chain_Reset(vout->p->vfilter_chain, &fmt, &fmt);
    if (filter_chain_AppendFromString(vout->p->vfilter_chain,
787 788
                                      filters) < 0)
        msg_Err(vout, "Video filter chain creation failed");
789

790 791
    vlc_mutex_unlock(&vout->p->vfilter_lock);
}
792

793 794 795 796 797
static void ThreadChangeSubFilters(vout_thread_t *vout, const char *filters)
{
    spu_ChangeFilters(vout->p->p_spu, filters);
}

798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816
static void ThreadChangePause(vout_thread_t *vout, bool is_paused, mtime_t date)
{
    assert(!vout->p->pause.is_on || !is_paused);

    if (vout->p->pause.is_on) {
        const mtime_t duration = date - vout->p->pause.date;

        if (vout->p->step.timestamp > VLC_TS_INVALID)
            vout->p->step.timestamp += duration;
        if (vout->p->step.last > VLC_TS_INVALID)
            vout->p->step.last += duration;
        picture_fifo_OffsetDate(vout->p->decoder_fifo, duration);
        if (vout->p->displayed.decoded)
            vout->p->displayed.decoded->date += duration;

        spu_OffsetSubtitleDate(vout->p->p_spu, duration);
    } else {
        vout->p->step.timestamp = VLC_TS_INVALID;
        vout->p->step.last      = VLC_TS_INVALID;
817
    }
818 819
    vout->p->pause.is_on = is_paused;
    vout->p->pause.date  = date;
820 821
}

822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870
static void ThreadFlush(vout_thread_t *vout, bool below, mtime_t date)
{
    vout->p->step.timestamp = VLC_TS_INVALID;
    vout->p->step.last      = VLC_TS_INVALID;

    picture_t *last = vout->p->displayed.decoded;
    if (last) {
        if (( below && last->date <= date) ||
            (!below && last->date >= date)) {
            picture_Release(last);

            vout->p->displayed.decoded   = NULL;
            vout->p->displayed.date      = VLC_TS_INVALID;
            vout->p->displayed.timestamp = VLC_TS_INVALID;
        }
    }
    picture_fifo_Flush(vout->p->decoder_fifo, date, below);
}

static void ThreadReset(vout_thread_t *vout)
{
    ThreadFlush(vout, true, INT64_MAX);
    if (vout->p->decoder_pool)
        picture_pool_NonEmpty(vout->p->decoder_pool, true);
    vout->p->pause.is_on = false;
    vout->p->pause.date  = mdate();
}

static void ThreadStep(vout_thread_t *vout, mtime_t *duration)
{
    *duration = 0;

    if (vout->p->step.last <= VLC_TS_INVALID)
        vout->p->step.last = vout->p->displayed.timestamp;

    mtime_t dummy;
    if (ThreadDisplayPicture(vout, true, &dummy))
        return;

    vout->p->step.timestamp = vout->p->displayed.timestamp;

    if (vout->p->step.last > VLC_TS_INVALID &&
        vout->p->step.timestamp > vout->p->step.last) {
        *duration = vout->p->step.timestamp - vout->p->step.last;
        vout->p->step.last = vout->p->step.timestamp;
        /* TODO advance subpicture by the duration ... */
    }
}

871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900
static void ThreadChangeFullscreen(vout_thread_t *vout, bool fullscreen)
{
    /* FIXME not sure setting "fullscreen" is good ... */
    var_SetBool(vout, "fullscreen", fullscreen);
    vout_SetDisplayFullscreen(vout->p->display.vd, fullscreen);
}

static void ThreadChangeOnTop(vout_thread_t *vout, bool is_on_top)
{
    vout_SetWindowState(vout->p->display.vd,
                        is_on_top ? VOUT_WINDOW_STATE_ABOVE :
                                    VOUT_WINDOW_STATE_NORMAL);
}

static void ThreadChangeDisplayFilled(vout_thread_t *vout, bool is_filled)
{
    vout_SetDisplayFilled(vout->p->display.vd, is_filled);
}

static void ThreadChangeZoom(vout_thread_t *vout, int num, int den)
{
    if (num * 10 < den) {
        num = den;
        den *= 10;
    } else if (num > den * 10) {
        num = den * 10;
    }

    vout_SetDisplayZoom(vout->p->display.vd, num, den);
}
901

902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945
static void ThreadChangeAspectRatio(vout_thread_t *vout,
                                    unsigned num, unsigned den)
{
    const video_format_t *source = &vout->p->original;

    if (num > 0 && den > 0) {
        num *= source->i_visible_height;
        den *= source->i_visible_width;
        vlc_ureduce(&num, &den, num, den, 0);
    }
    vout_SetDisplayAspect(vout->p->display.vd, num, den);
}


static void ThreadExecuteCropWindow(vout_thread_t *vout,
                                    unsigned crop_num, unsigned crop_den,
                                    unsigned x, unsigned y,
                                    unsigned width, unsigned height)
{
    const video_format_t *source = &vout->p->original;

    vout_SetDisplayCrop(vout->p->display.vd,
                        crop_num, crop_den,
                        source->i_x_offset + x,
                        source->i_y_offset + y,
                        width, height);
}
static void ThreadExecuteCropBorder(vout_thread_t *vout,
                                    unsigned left, unsigned top,
                                    unsigned right, unsigned bottom)
{
    const video_format_t *source = &vout->p->original;
    ThreadExecuteCropWindow(vout, 0, 0,
                            left,
                            top,
                            /* At worst, it becomes < 0 (but unsigned) and will be rejected */
                            source->i_visible_width  - (left + right),
                            source->i_visible_height - (top  + bottom));
}

static void ThreadExecuteCropRatio(vout_thread_t *vout,
                                   unsigned num, unsigned den)
{
    const video_format_t *source = &vout->p->original;
946 947 948 949
    ThreadExecuteCropWindow(vout, num, den,
                            0, 0,
                            source->i_visible_width,
                            source->i_visible_height);
950 951
}

952
static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state)
953
{
954 955 956 957 958 959 960 961 962 963
    vlc_mouse_Init(&vout->p->mouse);
    vout->p->decoder_fifo = picture_fifo_New();
    vout->p->decoder_pool = NULL;
    vout->p->display_pool = NULL;
    vout->p->private_pool = NULL;

    vout->p->vfilter_chain =
        filter_chain_New( vout, "video filter2", false,
                          VoutVideoFilterAllocationSetup, NULL, vout);

964 965 966 967 968 969 970 971 972 973 974 975
    vout_display_state_t state_default;
    if (!state) {
        VoutGetDisplayCfg(vout, &state_default.cfg, vout->p->display.title);
        state_default.wm_state = var_CreateGetBool(vout, "video-on-top") ? VOUT_WINDOW_STATE_ABOVE :
                                                                           VOUT_WINDOW_STATE_NORMAL;
        state_default.sar.num = 0;
        state_default.sar.den = 0;

        state = &state_default;
    }

    if (vout_OpenWrapper(vout, vout->p->splitter_name, state))
976 977 978 979 980
        return VLC_EGENERIC;
    if (vout_InitWrapper(vout))
        return VLC_EGENERIC;
    assert(vout->p->decoder_pool);

981 982 983 984 985 986 987 988 989 990
    vout->p->displayed.decoded       = NULL;
    vout->p->displayed.date          = VLC_TS_INVALID;
    vout->p->displayed.decoded       = NULL;
    vout->p->displayed.timestamp     = VLC_TS_INVALID;
    vout->p->displayed.qtype         = QTYPE_NONE;
    vout->p->displayed.is_interlaced = false;

    vout->p->step.last               = VLC_TS_INVALID;
    vout->p->step.timestamp          = VLC_TS_INVALID;

Laurent Aimar's avatar
Laurent Aimar committed
991
    video_format_Print(VLC_OBJECT(vout), "original format", &vout->p->original);
992 993 994
    return VLC_SUCCESS;
}

995
static void ThreadStop(vout_thread_t *vout, vout_display_state_t *state)
996
{
997 998 999
    /* Destroy the video filters2 */
    filter_chain_Delete(vout->p->vfilter_chain);

1000
    /* Destroy translation tables */
1001 1002 1003 1004 1005
    if (vout->p->display.vd) {
        if (vout->p->decoder_pool) {
            ThreadFlush(vout, true, INT64_MAX);
            vout_EndWrapper(vout);
        }
1006
        vout_CloseWrapper(vout, state);
1007
    }
1008

1009 1010 1011
    if (vout->p->decoder_fifo)
        picture_fifo_Delete(vout->p->decoder_fifo);
    assert(!vout->p->decoder_pool);
1012 1013 1014 1015
}

static void ThreadInit(vout_thread_t *vout)
{
1016 1017 1018 1019 1020 1021
    vout->p->window.is_unused = true;
    vout->p->window.object    = NULL;
    vout->p->dead             = false;
    vout->p->is_late_dropped  = var_InheritBool(vout, "drop-late-frames");
    vout->p->pause.is_on      = false;
    vout->p->pause.date       = VLC_TS_INVALID;
1022 1023 1024

    vout_chrono_Init(&vout->p->render, 5, 10000); /* Arbitrary initial time */
}
1025

1026 1027
static void ThreadClean(vout_thread_t *vout)
{
1028 1029 1030 1031
    if (vout->p->window.object) {
        assert(vout->p->window.is_unused);
        vout_window_Delete(vout->p->window.object);
    }
1032
    vout_chrono_Clean(&vout->p->render);
1033 1034
    vout->p->dead = true;
    vout_control_Dead(&vout->p->control);
1035
}
1036

1037
static int ThreadReinit(vout_thread_t *vout,
1038
                        const vout_configuration_t *cfg)
1039 1040
{
    video_format_t original;
1041
    if (VoutValidateFormat(&original, cfg->fmt)) {
1042
        ThreadStop(vout, NULL);
1043
        ThreadClean(vout);
1044
        return VLC_EGENERIC;
1045
    }
1046 1047 1048 1049 1050
    if (video_format_IsSimilar(&original, &vout->p->original)) {
        if (cfg->dpb_size <= vout->p->dpb_size)
            return VLC_SUCCESS;
        msg_Warn(vout, "DPB need to be increased");
    }
1051

1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064
    vout_display_state_t state;
    memset(&state, 0, sizeof(state));

    ThreadStop(vout, &state);

    if (!state.cfg.is_fullscreen) {
        state.cfg.display.width  = 0;
        state.cfg.display.height = 0;
    }
    state.sar.num = 0;
    state.sar.den = 0;
    /* FIXME current vout "variables" are not in sync here anymore
     * and I am not sure what to do */
1065 1066

    vout->p->original = original;
1067
    vout->p->dpb_size = cfg->dpb_size;
1068
    if (ThreadStart(vout, &state)) {
1069 1070 1071 1072
        ThreadClean(vout);
        return VLC_EGENERIC;
    }
    return VLC_SUCCESS;
1073
}
1074

1075
/*****************************************************************************
1076
 * Thread: video output thread
1077 1078 1079 1080 1081
 *****************************************************************************
 * 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.
 *****************************************************************************/
1082
static void *Thread(void *object)
1083 1084
{
    vout_thread_t *vout = object;
1085

1086 1087 1088 1089 1090 1091 1092
    vout_interlacing_support_t interlacing = {
        .is_interlaced = false,
        .date = mdate(),
    };
    vout_postprocessing_support_t postprocessing = {
        .qtype = QTYPE_NONE,
    };
1093

1094
    mtime_t deadline = VLC_TS_INVALID;
1095
    for (;;) {
1096 1097 1098 1099 1100 1101
        vout_control_cmd_t cmd;

        /* FIXME remove thoses ugly timeouts
         */
        while (!vout_control_Pop(&vout->p->control, &cmd, deadline, 100000)) {
            switch(cmd.type) {
1102
            case VOUT_CONTROL_INIT:
1103
                ThreadInit(vout);
1104 1105
                if (ThreadStart(vout, NULL)) {
                    ThreadStop(vout, NULL);
1106 1107 1108 1109 1110
                    ThreadClean(vout);
                    return NULL;
                }
                break;
            case VOUT_CONTROL_CLEAN:
1111
                ThreadStop(vout, NULL);
1112 1113
                ThreadClean(vout);
                return NULL;
1114
            case VOUT_CONTROL_REINIT:
1115
                if (ThreadReinit(vout, cmd.u.cfg))
1116 1117
                    return NULL;
                break;
1118 1119 1120 1121
            case VOUT_CONTROL_SUBPICTURE:
                ThreadDisplaySubpicture(vout, cmd.u.subpicture);
                cmd.u.subpicture = NULL;
                break;
1122 1123 1124
            case VOUT_CONTROL_FLUSH_SUBPICTURE:
                ThreadFlushSubpicture(vout, cmd.u.integer);
                break;
1125 1126 1127 1128 1129 1130
            case VOUT_CONTROL_OSD_TITLE:
                ThreadDisplayOsdTitle(vout, cmd.u.string);
                break;
            case VOUT_CONTROL_CHANGE_FILTERS:
                ThreadChangeFilters(vout, cmd.u.string);
                break;
1131 1132 1133
            case VOUT_CONTROL_CHANGE_SUB_FILTERS:
                ThreadChangeSubFilters(vout, cmd.u.string);
                break;
1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145
            case VOUT_CONTROL_PAUSE:
                ThreadChangePause(vout, cmd.u.pause.is_on, cmd.u.pause.date);
                break;
            case VOUT_CONTROL_FLUSH:
                ThreadFlush(vout, false, cmd.u.time);
                break;
            case VOUT_CONTROL_RESET:
                ThreadReset(vout);
                break;
            case VOUT_CONTROL_STEP:
                ThreadStep(vout, cmd.u.time_ptr);
                break;
1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157
            case VOUT_CONTROL_FULLSCREEN:
                ThreadChangeFullscreen(vout, cmd.u.boolean);
                break;
            case VOUT_CONTROL_ON_TOP:
                ThreadChangeOnTop(vout, cmd.u.boolean);
                break;
            case VOUT_CONTROL_DISPLAY_FILLED:
                ThreadChangeDisplayFilled(vout, cmd.u.boolean);
                break;
            case VOUT_CONTROL_ZOOM:
                ThreadChangeZoom(vout, cmd.u.pair.a, cmd.u.pair.b);
                break;
1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173
            case VOUT_CONTROL_ASPECT_RATIO:
                ThreadChangeAspectRatio(vout, cmd.u.pair.a, cmd.u.pair.b);
                break;
           case VOUT_CONTROL_CROP_RATIO:
                ThreadExecuteCropRatio(vout, cmd.u.pair.a, cmd.u.pair.b);
                break;
            case VOUT_CONTROL_CROP_WINDOW:
                ThreadExecuteCropWindow(vout, 0, 0,
                                        cmd.u.window.x, cmd.u.window.y,
                                        cmd.u.window.width, cmd.u.window.height);
                break;
            case VOUT_CONTROL_CROP_BORDER:
                ThreadExecuteCropBorder(vout,
                                        cmd.u.border.left,  cmd.u.border.top,
                                        cmd.u.border.right, cmd.u.border.bottom);
                break;
1174 1175 1176 1177 1178 1179
            default:
                break;
            }
            vout_control_cmd_Clean(&cmd);
        }

1180
        ThreadManage(vout, &deadline, &interlacing, &postprocessing);
Sam Hocevar's avatar
 
Sam Hocevar committed
1181
    }
Michel Kaempf's avatar
Michel Kaempf committed
1182 1183
}