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

27
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
28
 * Preamble
29
 *****************************************************************************/
30 31 32 33
#include <errno.h>                                                 /* ENOMEM */
#include <stdlib.h>                                                /* free() */
#include <stdio.h>                                              /* sprintf() */
#include <string.h>                                            /* strerror() */
Vincent Seguin's avatar
Vincent Seguin committed
34

35
#include <vlc/vlc.h>
Sam Hocevar's avatar
 
Sam Hocevar committed
36

37 38
#ifdef HAVE_SYS_TIMES_H
#   include <sys/times.h>
39
#endif
40

Michel Kaempf's avatar
Michel Kaempf committed
41 42
#include "video.h"
#include "video_output.h"
43

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

Sam Hocevar's avatar
 
Sam Hocevar committed
53
static int      ReduceHeight      ( int );
Sam Hocevar's avatar
 
Sam Hocevar committed
54 55
static int      BinaryLog         ( u32 );
static void     MaskToShift       ( int *, int *, u32 );
Gildas Bazin's avatar
 
Gildas Bazin committed
56
static void     InitWindowSize    ( vout_thread_t *, int *, int * );
Michel Kaempf's avatar
Michel Kaempf committed
57

58
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
59
 * vout_CreateThread: creates a new video output thread
60
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
61 62
 * This function creates a new video output thread, and returns a pointer
 * to its description. On error, it returns NULL.
63
 *****************************************************************************/
64
vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent,
Sam Hocevar's avatar
 
Sam Hocevar committed
65
                                      int i_width, int i_height,
Sam Hocevar's avatar
 
Sam Hocevar committed
66
                                      u32 i_chroma, int i_aspect )
Michel Kaempf's avatar
Michel Kaempf committed
67
{
68
    vout_thread_t * p_vout;                             /* thread descriptor */
Sam Hocevar's avatar
 
Sam Hocevar committed
69
    int             i_index;                                /* loop variable */
Sam Hocevar's avatar
 
Sam Hocevar committed
70
    char          * psz_plugin;
Michel Kaempf's avatar
Michel Kaempf committed
71

72
    /* Allocate descriptor */
73
    p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
74
    if( p_vout == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
75
    {
76
        msg_Err( p_parent, "out of memory" );
Michel Kaempf's avatar
Michel Kaempf committed
77 78
        return( NULL );
    }
79

Gildas Bazin's avatar
 
Gildas Bazin committed
80 81 82
    /* If the parent is not a VOUT object, that means we are at the start of
     * the video output pipe */
    if( p_parent->i_object_type != VLC_OBJECT_VOUT )
Sam Hocevar's avatar
 
Sam Hocevar committed
83
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113
        /* look for the default filter configuration */
        p_vout->psz_filter_chain = config_GetPsz( p_parent, "filter" );
    }
    else
    {
        /* continue the parent's filter chain */
        char *psz_end;

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

    /* Choose the video output module */
    if( !p_vout->psz_filter_chain )
    {
        psz_plugin = config_GetPsz( p_parent, "vout" );
    }
    else
    {
        /* the filter chain is a string list of filters separated by double
         * colons */
        char *psz_end;

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

116
    /* Initialize pictures and subpictures - translation tables and functions
117
     * will be initialized later in InitThread */
Sam Hocevar's avatar
 
Sam Hocevar committed
118
    for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES; i_index++)
119
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
120
        p_vout->p_picture[i_index].i_status = FREE_PICTURE;
Sam Hocevar's avatar
 
Sam Hocevar committed
121
        p_vout->p_picture[i_index].i_type   = EMPTY_PICTURE;
122
    }
Sam Hocevar's avatar
 
Sam Hocevar committed
123

124 125
    for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++)
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
126
        p_vout->p_subpicture[i_index].i_status = FREE_SUBPICTURE;
Sam Hocevar's avatar
 
Sam Hocevar committed
127
        p_vout->p_subpicture[i_index].i_type   = EMPTY_SUBPICTURE;
128
    }
Sam Hocevar's avatar
 
Sam Hocevar committed
129

Sam Hocevar's avatar
 
Sam Hocevar committed
130
    /* No images in the heap */
Sam Hocevar's avatar
 
Sam Hocevar committed
131 132
    p_vout->i_heap_size = 0;

Sam Hocevar's avatar
 
Sam Hocevar committed
133
    /* Initialize the rendering heap */
Sam Hocevar's avatar
 
Sam Hocevar committed
134 135 136 137 138
    I_RENDERPICTURES = 0;
    p_vout->render.i_width    = i_width;
    p_vout->render.i_height   = i_height;
    p_vout->render.i_chroma   = i_chroma;
    p_vout->render.i_aspect   = i_aspect;
Sam Hocevar's avatar
 
Sam Hocevar committed
139

Sam Hocevar's avatar
 
Sam Hocevar committed
140 141 142 143 144 145 146 147 148 149 150 151 152 153 154
    p_vout->render.i_rmask    = 0;
    p_vout->render.i_gmask    = 0;
    p_vout->render.i_bmask    = 0;

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

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

Sam Hocevar's avatar
 
Sam Hocevar committed
155
    /* Initialize misc stuff */
Sam Hocevar's avatar
 
Sam Hocevar committed
156 157 158 159 160 161
    p_vout->i_changes    = 0;
    p_vout->f_gamma      = 0;
    p_vout->b_grayscale  = 0;
    p_vout->b_info       = 0;
    p_vout->b_interface  = 0;
    p_vout->b_scale      = 1;
Gildas Bazin's avatar
 
Gildas Bazin committed
162
    p_vout->b_fullscreen = 0;
Sam Hocevar's avatar
 
Sam Hocevar committed
163
    p_vout->render_time  = 10;
Gildas Bazin's avatar
 
Gildas Bazin committed
164
    p_vout->c_fps_samples= 0;
165

166 167 168 169
    p_vout->i_mouse_x = 0;
    p_vout->i_mouse_y = 0;
    p_vout->i_mouse_button = 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
170
    /* user requested fullscreen? */
171 172
    if( config_GetInt( p_vout, "fullscreen" ) )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
173
        p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
174
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
175

Gildas Bazin's avatar
 
Gildas Bazin committed
176 177 178 179 180
    /* Initialize the dimensions of the video window */
    InitWindowSize( p_vout, &p_vout->i_window_width,
                    &p_vout->i_window_height );


Gildas Bazin's avatar
 
Gildas Bazin committed
181 182 183 184 185
    p_vout->p_module = module_Need( p_vout,
                           ( p_vout->psz_filter_chain ) ?
                           MODULE_CAPABILITY_VOUT_FILTER :
                           MODULE_CAPABILITY_VOUT,
                           psz_plugin, (void *)p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
186

Gildas Bazin's avatar
 
Gildas Bazin committed
187
    if( psz_plugin ) free( psz_plugin );
Sam Hocevar's avatar
 
Sam Hocevar committed
188 189
    if( p_vout->p_module == NULL )
    {
190 191
        msg_Err( p_vout, "no suitable vout module" );
        vlc_object_destroy( p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
192 193 194 195 196 197 198 199 200 201 202 203 204
        return( NULL );
    }

#define f p_vout->p_module->p_functions->vout.functions.vout
    p_vout->pf_create     = f.pf_create;
    p_vout->pf_init       = f.pf_init;
    p_vout->pf_end        = f.pf_end;
    p_vout->pf_destroy    = f.pf_destroy;
    p_vout->pf_manage     = f.pf_manage;
    p_vout->pf_render     = f.pf_render;
    p_vout->pf_display    = f.pf_display;
#undef f

Michel Kaempf's avatar
Michel Kaempf committed
205
    /* Create thread and set locks */
206 207 208
    vlc_mutex_init( p_vout, &p_vout->picture_lock );
    vlc_mutex_init( p_vout, &p_vout->subpicture_lock );
    vlc_mutex_init( p_vout, &p_vout->change_lock );
209

210 211 212
    vlc_object_attach( p_vout, p_parent );

    if( vlc_thread_create( p_vout, "video output", RunThread, 0 ) )
Michel Kaempf's avatar
Michel Kaempf committed
213
    {
214
        msg_Err( p_vout, "%s", strerror(ENOMEM) );
Sam Hocevar's avatar
 
Sam Hocevar committed
215
        p_vout->pf_destroy( p_vout );
Gildas Bazin's avatar
 
Gildas Bazin committed
216
        module_Unneed( p_vout->p_module );
217 218
        vlc_object_destroy( p_vout );
        return NULL;
219
    }
Michel Kaempf's avatar
Michel Kaempf committed
220

221
    return p_vout;
Michel Kaempf's avatar
Michel Kaempf committed
222 223
}

224
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
225
 * vout_DestroyThread: destroys a previously created thread
226 227
 *****************************************************************************
 * Destroy a terminated thread.
Michel Kaempf's avatar
Michel Kaempf committed
228
 * The function will request a destruction of the specified thread. If pi_error
229
 * is NULL, it will return once the thread is destroyed. Else, it will be
Michel Kaempf's avatar
Michel Kaempf committed
230
 * update using one of the THREAD_* constants.
231
 *****************************************************************************/
232
void vout_DestroyThread( vout_thread_t *p_vout )
233
{
234
    /* Unlink object */
235
    vlc_object_detach_all( p_vout );
236

Michel Kaempf's avatar
Michel Kaempf committed
237 238
    /* Request thread destruction */
    p_vout->b_die = 1;
239
    vlc_thread_join( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
240

241
    /* Free structure */
242
    vlc_object_destroy( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
243 244
}

245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306
/*****************************************************************************
 * vout_ChromaCmp: compare two chroma values
 *****************************************************************************
 * This function returns 1 if the two fourcc values given as argument are
 * the same format (eg. UYVY / UYNV) or almost the same format (eg. I420/YV12)
 *****************************************************************************/
int vout_ChromaCmp( u32 i_chroma, u32 i_amorhc )
{
    /* If they are the same, they are the same ! */
    if( i_chroma == i_amorhc )
    {
        return 1;
    }

    /* Check for equivalence classes */
    switch( i_chroma )
    {
        case FOURCC_I420:
        case FOURCC_IYUV:
        case FOURCC_YV12:
            switch( i_amorhc )
            {
                case FOURCC_I420:
                case FOURCC_IYUV:
                case FOURCC_YV12:
                    return 1;

                default:
                    return 0;
            }

        case FOURCC_UYVY:
        case FOURCC_UYNV:
        case FOURCC_Y422:
            switch( i_amorhc )
            {
                case FOURCC_UYVY:
                case FOURCC_UYNV:
                case FOURCC_Y422:
                    return 1;

                default:
                    return 0;
            }

        case FOURCC_YUY2:
        case FOURCC_YUNV:
            switch( i_amorhc )
            {
                case FOURCC_YUY2:
                case FOURCC_YUNV:
                    return 1;

                default:
                    return 0;
            }

        default:
            return 0;
    }
}

307
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
308
 * InitThread: initialize video output thread
309
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
310 311 312
 * This function is called from RunThread and performs the second step of the
 * initialization. It returns 0 on success. Note that the thread's flag are not
 * modified inside this function.
313
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
314
static int InitThread( vout_thread_t *p_vout )
Vincent Seguin's avatar
Vincent Seguin committed
315
{
Sam Hocevar's avatar
 
Sam Hocevar committed
316
    int i, i_pgcd;
Sam Hocevar's avatar
 
Sam Hocevar committed
317

Sam Hocevar's avatar
 
Sam Hocevar committed
318 319 320 321
    vlc_mutex_lock( &p_vout->change_lock );

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

Sam Hocevar's avatar
 
Sam Hocevar committed
324
    /* Initialize output method, it allocates direct buffers for us */
Sam Hocevar's avatar
 
Sam Hocevar committed
325
    if( p_vout->pf_init( p_vout ) )
Vincent Seguin's avatar
Vincent Seguin committed
326
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
327 328 329 330
        vlc_mutex_unlock( &p_vout->change_lock );
        return( 1 );
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
331
    if( !I_OUTPUTPICTURES )
Sam Hocevar's avatar
 
Sam Hocevar committed
332
    {
333 334
        msg_Err( p_vout, "plugin was unable to allocate at least "
                         "one direct buffer" );
Sam Hocevar's avatar
 
Sam Hocevar committed
335
        p_vout->pf_end( p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
336 337
        vlc_mutex_unlock( &p_vout->change_lock );
        return( 1 );
338
    }
Vincent Seguin's avatar
Vincent Seguin committed
339

340
    msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
Sam Hocevar's avatar
 
Sam Hocevar committed
341 342

    i_pgcd = ReduceHeight( p_vout->render.i_aspect );
343 344 345 346 347
    msg_Dbg( p_vout,
             "picture in %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i",
             p_vout->render.i_width, p_vout->render.i_height,
             p_vout->render.i_chroma, (char*)&p_vout->render.i_chroma,
             p_vout->render.i_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
Sam Hocevar's avatar
 
Sam Hocevar committed
348 349

    i_pgcd = ReduceHeight( p_vout->output.i_aspect );
350 351 352 353 354
    msg_Dbg( p_vout,
             "picture out %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i",
             p_vout->output.i_width, p_vout->output.i_height,
             p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma,
             p_vout->output.i_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
Sam Hocevar's avatar
 
Sam Hocevar committed
355

Sam Hocevar's avatar
 
Sam Hocevar committed
356 357 358 359 360 361 362 363
    /* Calculate shifts from system-updated masks */
    MaskToShift( &p_vout->output.i_lrshift, &p_vout->output.i_rrshift,
                 p_vout->output.i_rmask );
    MaskToShift( &p_vout->output.i_lgshift, &p_vout->output.i_rgshift,
                 p_vout->output.i_gmask );
    MaskToShift( &p_vout->output.i_lbshift, &p_vout->output.i_rbshift,
                 p_vout->output.i_bmask );

Sam Hocevar's avatar
 
Sam Hocevar committed
364 365 366 367
    /* Check whether we managed to create direct buffers similar to
     * the render buffers, ie same size, chroma and aspect ratio */
    if( ( p_vout->output.i_width == p_vout->render.i_width )
     && ( p_vout->output.i_height == p_vout->render.i_height )
Sam Hocevar's avatar
 
Sam Hocevar committed
368
     && ( vout_ChromaCmp( p_vout->output.i_chroma, p_vout->render.i_chroma ) )
Sam Hocevar's avatar
 
Sam Hocevar committed
369 370
     && ( p_vout->output.i_aspect == p_vout->render.i_aspect ) )
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
371 372 373 374
        /* Cool ! We have direct buffers, we can ask the decoder to
         * directly decode into them ! Map the first render buffers to
         * the first direct buffers, but keep the first direct buffer
         * for memcpy operations */
Sam Hocevar's avatar
 
Sam Hocevar committed
375 376
        p_vout->b_direct = 1;

377 378 379
        msg_Dbg( p_vout, "direct render, mapping "
                 "render pictures 0-%i to system pictures 1-%i",
                 VOUT_MAX_PICTURES - 2, VOUT_MAX_PICTURES - 1 );
Sam Hocevar's avatar
 
Sam Hocevar committed
380 381 382 383 384 385

        for( i = 1; i < VOUT_MAX_PICTURES; i++ )
        {
            PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
            I_RENDERPICTURES++;
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
386 387 388
    }
    else
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
389 390 391
        /* Rats... Something is wrong here, we could not find an output
         * plugin able to directly render what we decode. See if we can
         * find a chroma plugin to do the conversion */
Sam Hocevar's avatar
 
Sam Hocevar committed
392 393
        p_vout->b_direct = 0;

Sam Hocevar's avatar
 
Sam Hocevar committed
394
        /* Choose the best module */
395 396 397
        p_vout->chroma.p_module =
            module_Need( p_vout, MODULE_CAPABILITY_CHROMA,
                         NULL, (void *)p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
398

Sam Hocevar's avatar
 
Sam Hocevar committed
399 400
        if( p_vout->chroma.p_module == NULL )
        {
401 402
            msg_Err( p_vout, "no chroma module for %4.4s to %4.4s",
                     &p_vout->render.i_chroma, &p_vout->output.i_chroma );
Sam Hocevar's avatar
 
Sam Hocevar committed
403 404 405 406
            p_vout->pf_end( p_vout );
            vlc_mutex_unlock( &p_vout->change_lock );
            return( 1 );
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
407

Sam Hocevar's avatar
 
Sam Hocevar committed
408
#define f p_vout->chroma.p_module->p_functions->chroma.functions.chroma
Gildas Bazin's avatar
 
Gildas Bazin committed
409
        p_vout->chroma.pf_init       = f.pf_init;
Sam Hocevar's avatar
 
Sam Hocevar committed
410 411 412
        p_vout->chroma.pf_end        = f.pf_end;
#undef f

Sam Hocevar's avatar
 
Sam Hocevar committed
413
        if( I_OUTPUTPICTURES < 2 * VOUT_MAX_PICTURES )
Sam Hocevar's avatar
 
Sam Hocevar committed
414
        {
415 416 417 418
            msg_Dbg( p_vout, "indirect render, mapping "
                     "render pictures %i-%i to system pictures %i-%i",
                     I_OUTPUTPICTURES - 1, 2 * VOUT_MAX_PICTURES - 2,
                     I_OUTPUTPICTURES, 2 * VOUT_MAX_PICTURES - 1 );
Sam Hocevar's avatar
 
Sam Hocevar committed
419 420 421
        }
        else
        {
422 423 424 425
            /* FIXME: if this happens, we don't have any render pictures left */
            msg_Dbg( p_vout, "indirect render, no system pictures needed,"
                     " we have %i directbuffers", I_OUTPUTPICTURES );
            msg_Err( p_vout, "this is a bug!" );
Sam Hocevar's avatar
 
Sam Hocevar committed
426
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
427 428

        /* Append render buffers after the direct buffers */
Sam Hocevar's avatar
 
Sam Hocevar committed
429
        for( i = I_OUTPUTPICTURES; i < 2 * VOUT_MAX_PICTURES; i++ )
Sam Hocevar's avatar
 
Sam Hocevar committed
430 431 432 433 434
        {
            PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
            I_RENDERPICTURES++;
        }
    }
Vincent Seguin's avatar
Vincent Seguin committed
435

Sam Hocevar's avatar
 
Sam Hocevar committed
436 437 438 439 440 441 442 443 444 445 446
    /* Link pictures back to their heap */
    for( i = 0 ; i < I_RENDERPICTURES ; i++ )
    {
        PP_RENDERPICTURE[ i ]->p_heap = &p_vout->render;
    }

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

447
/* XXX XXX mark thread ready */
Sam Hocevar's avatar
 
Sam Hocevar committed
448
    return( 0 );
Vincent Seguin's avatar
Vincent Seguin committed
449 450
}

451
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
452
 * RunThread: video output thread
453
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
454 455 456
 * 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.
457
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
458
static void RunThread( vout_thread_t *p_vout)
Vincent Seguin's avatar
Vincent Seguin committed
459
{
Sam Hocevar's avatar
 
Sam Hocevar committed
460
    int             i_index;                                /* index in heap */
461
    int             i_idle_loops = 0;  /* loops without displaying a picture */
Sam Hocevar's avatar
 
Sam Hocevar committed
462 463 464 465
    mtime_t         current_date;                            /* current date */
    mtime_t         display_date;                            /* display date */

    picture_t *     p_picture;                            /* picture pointer */
466
    picture_t *     p_last_picture = NULL;                   /* last picture */
Sam Hocevar's avatar
 
Sam Hocevar committed
467 468 469 470 471 472 473 474 475 476 477 478
    picture_t *     p_directbuffer;              /* direct buffer to display */

    subpicture_t *  p_subpic;                          /* subpicture pointer */

    /*
     * Initialize thread
     */
    p_vout->b_error = InitThread( p_vout );
    if( p_vout->b_error )
    {
        /* Destroy thread structures allocated by Create and InitThread */
        p_vout->pf_destroy( p_vout );
479

480
        DestroyThread( p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
481 482
        return;
    }
483

484
    /*
Sam Hocevar's avatar
 
Sam Hocevar committed
485 486
     * Main loop - it is not executed if an error occured during
     * initialization
487
     */
Sam Hocevar's avatar
 
Sam Hocevar committed
488
    while( (!p_vout->b_die) && (!p_vout->b_error) )
489
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
490
        /* Initialize loop variables */
Sam Hocevar's avatar
 
Sam Hocevar committed
491 492
        display_date = 0;
        current_date = mdate();
Sam Hocevar's avatar
 
Sam Hocevar committed
493 494 495 496

#ifdef STATS
        p_vout->c_loops++;
        if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
497
        {
498 499
            msg_Dbg( p_vout, "picture heap: %d/%d",
                     I_RENDERPICTURES, p_vout->i_heap_size );
Sam Hocevar's avatar
 
Sam Hocevar committed
500
        }
501
#endif
Sam Hocevar's avatar
 
Sam Hocevar committed
502 503 504 505 506

        /*
         * Find the picture to display - this operation does not need lock,
         * since only READY_PICTUREs are handled
         */
Sam Hocevar's avatar
 
Sam Hocevar committed
507 508
        p_picture = NULL;

509
        for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
Sam Hocevar's avatar
 
Sam Hocevar committed
510
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
511 512 513
            if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
                && ( (p_picture == NULL) ||
                     (PP_RENDERPICTURE[i_index]->date < display_date) ) )
514
            {
Sam Hocevar's avatar
 
Sam Hocevar committed
515
                p_picture = PP_RENDERPICTURE[i_index];
Sam Hocevar's avatar
 
Sam Hocevar committed
516
                display_date = p_picture->date;
517 518
            }
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
519 520

        if( p_picture != NULL )
521
        {
522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552
            /* If we met the last picture, parse again to see whether there is
             * a more appropriate one. */
            if( p_picture == p_last_picture )
            {
                for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
                {
                    if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
                        && (PP_RENDERPICTURE[i_index] != p_last_picture)
                        && ((p_picture == p_last_picture) ||
                            (PP_RENDERPICTURE[i_index]->date < display_date)) )
                    {
                        p_picture = PP_RENDERPICTURE[i_index];
                        display_date = p_picture->date;
                    }
                }
            }
    
            /* If we found better than the last picture, destroy it */
            if( p_last_picture && p_picture != p_last_picture )
            {
                vlc_mutex_lock( &p_vout->picture_lock );
                if( p_last_picture->i_refcount )
                {
                    p_last_picture->i_status = DISPLAYED_PICTURE;
                }
                else
                {
                    p_last_picture->i_status = DESTROYED_PICTURE;
                    p_vout->i_heap_size--;
                }
                vlc_mutex_unlock( &p_vout->picture_lock );
553
                p_last_picture = NULL;
554 555
            }

Sam Hocevar's avatar
 
Sam Hocevar committed
556 557 558 559
            /* Compute FPS rate */
            p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ]
                = display_date;

560
            if( !p_picture->b_force &&
561
                p_picture != p_last_picture &&
562
                display_date < current_date + p_vout->render_time )
Sam Hocevar's avatar
 
Sam Hocevar committed
563 564 565 566 567 568 569 570 571 572 573 574 575 576
            {
                /* Picture is late: it will be destroyed and the thread
                 * will directly choose the next picture */
                vlc_mutex_lock( &p_vout->picture_lock );
                if( p_picture->i_refcount )
                {
                    /* Pretend we displayed the picture, but don't destroy
                     * it since the decoder might still need it. */
                    p_picture->i_status = DISPLAYED_PICTURE;
                }
                else
                {
                    /* Destroy the picture without displaying it */
                    p_picture->i_status = DESTROYED_PICTURE;
Sam Hocevar's avatar
 
Sam Hocevar committed
577
                    p_vout->i_heap_size--;
Sam Hocevar's avatar
 
Sam Hocevar committed
578
                }
579 580
                msg_Warn( p_vout, "late picture skipped (%lld)",
                                  current_date - display_date );
581 582 583 584
                vlc_mutex_unlock( &p_vout->picture_lock );

                continue;
            }
Christophe Massiot's avatar
Christophe Massiot committed
585 586
#if 0
            /* Removed because it causes problems for some people --Meuuh */
587
            if( display_date > current_date + VOUT_BOGUS_DELAY )
588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604
            {
                /* Picture is waaay too early: it will be destroyed */
                vlc_mutex_lock( &p_vout->picture_lock );
                if( p_picture->i_refcount )
                {
                    /* Pretend we displayed the picture, but don't destroy
                     * it since the decoder might still need it. */
                    p_picture->i_status = DISPLAYED_PICTURE;
                }
                else
                {
                    /* Destroy the picture without displaying it */
                    p_picture->i_status = DESTROYED_PICTURE;
                    p_vout->i_heap_size--;
                }
                intf_WarnMsg( 1, "vout warning: early picture skipped (%lld)",
                              display_date - current_date );
Sam Hocevar's avatar
 
Sam Hocevar committed
605 606 607 608
                vlc_mutex_unlock( &p_vout->picture_lock );

                continue;
            }
Christophe Massiot's avatar
Christophe Massiot committed
609
#endif
610
            if( display_date > current_date + VOUT_DISPLAY_DELAY )
Sam Hocevar's avatar
 
Sam Hocevar committed
611 612 613 614 615 616 617 618
            {
                /* A picture is ready to be rendered, but its rendering date
                 * is far from the current one so the thread will perform an
                 * empty loop as if no picture were found. The picture state
                 * is unchanged */
                p_picture    = NULL;
                display_date = 0;
            }
619 620
            else if( p_picture == p_last_picture )
            {
621 622
                /* We are asked to repeat the previous picture, but we first
                 * wait for a couple of idle loops */
623 624 625 626 627 628 629 630 631 632 633 634 635 636 637
                if( i_idle_loops < 4 )
                {
                    p_picture    = NULL;
                    display_date = 0;
                }
                else
                {
                    //intf_WarnMsg( 6, "vout info: duplicating picture" );
                }
            }
        }

        if( p_picture == NULL )
        {
            i_idle_loops++;
638 639
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
640 641 642 643
        /*
         * Check for subpictures to display
         */
        p_subpic = vout_SortSubPictures( p_vout, display_date );
644

Sam Hocevar's avatar
 
Sam Hocevar committed
645 646 647 648 649
        /*
         * Perform rendering
         */
        p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );

Sam Hocevar's avatar
 
Sam Hocevar committed
650 651 652 653 654 655 656 657 658
        /*
         * Call the plugin-specific rendering method
         */
        if( p_picture != NULL )
        {
            /* Render the direct buffer returned by vout_RenderPicture */
            p_vout->pf_render( p_vout, p_directbuffer );
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
659 660 661 662
        /*
         * Sleep, wake up
         */
        if( display_date != 0 )
663
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
664 665 666
            /* Store render time using Bresenham algorithm */
            p_vout->render_time += mdate() - current_date;
            p_vout->render_time >>= 1;
667 668
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
669 670 671 672 673
        /* Give back change lock */
        vlc_mutex_unlock( &p_vout->change_lock );

        /* Sleep a while or until a given date */
        if( display_date != 0 )
Sam Hocevar's avatar
Sam Hocevar committed
674
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
675
            mwait( display_date - VOUT_MWAIT_TOLERANCE );
676 677 678
        }
        else
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
679
            msleep( VOUT_IDLE_SLEEP );
680
        }
681

Sam Hocevar's avatar
 
Sam Hocevar committed
682 683 684 685 686 687 688 689 690 691 692
        /* On awakening, take back lock and send immediately picture
         * to display. */
        vlc_mutex_lock( &p_vout->change_lock );

        /*
         * Display the previously rendered picture
         */
        if( p_picture != NULL )
        {
            /* Display the direct buffer returned by vout_RenderPicture */
            p_vout->pf_display( p_vout, p_directbuffer );
Vincent Seguin's avatar
Vincent Seguin committed
693

694 695 696 697 698 699 700
            /* Reinitialize idle loop count */
            i_idle_loops = 0;

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

Sam Hocevar's avatar
 
Sam Hocevar committed
703 704 705 706 707
        /*
         * Check events and manage thread
         */
        if( p_vout->pf_manage( p_vout ) )
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
708 709 710
            /* A fatal error occured, and the thread must terminate
             * immediately, without displaying anything - setting b_error to 1
             * causes the immediate end of the main while() loop. */
Sam Hocevar's avatar
 
Sam Hocevar committed
711 712
            p_vout->b_error = 1;
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730

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

            p_vout->i_changes &= ~VOUT_SIZE_CHANGE;

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

            I_OUTPUTPICTURES = 0;
            if( p_vout->pf_init( p_vout ) )
            {
731
                msg_Err( p_vout, "cannot resize display" );
Gildas Bazin's avatar
 
Gildas Bazin committed
732 733 734 735 736 737 738 739 740
                /* FixMe: p_vout->pf_end will be called again in EndThread() */
                p_vout->b_error = 1;
            }

            /* Need to reinitialise the chroma plugin */
            p_vout->chroma.pf_end( p_vout );
            p_vout->chroma.pf_init( p_vout );
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
741
    }
Vincent Seguin's avatar
Vincent Seguin committed
742

Sam Hocevar's avatar
 
Sam Hocevar committed
743 744 745 746
    /*
     * Error loop - wait until the thread destruction is requested
     */
    if( p_vout->b_error )
747
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
748
        ErrorThread( p_vout );
749
    }
Michel Kaempf's avatar
Michel Kaempf committed
750

Sam Hocevar's avatar
 
Sam Hocevar committed
751 752 753 754 755 756 757
    /* End of thread */
    EndThread( p_vout );

    /* Destroy method-dependant resources */
    p_vout->pf_destroy( p_vout );

    /* Destroy thread structures allocated by CreateThread */
758
    DestroyThread( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
759 760
}

761
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
762
 * ErrorThread: RunThread() error loop
763
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
764 765 766
 * This function is called when an error occured during thread main's loop. The
 * thread can still receive feed, but must be ready to terminate as soon as
 * possible.
767
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
768
static void ErrorThread( vout_thread_t *p_vout )
769
{
Sam Hocevar's avatar
 
Sam Hocevar committed
770 771
    /* Wait until a `die' order */
    while( !p_vout->b_die )
772
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
773 774
        /* Sleep a while */
        msleep( VOUT_IDLE_SLEEP );
775
    }
776 777
}

778
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
779
 * EndThread: thread destruction
780
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
781 782
 * This function is called when the thread ends after a sucessful
 * initialization. It frees all ressources allocated by InitThread.
783
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
784
static void EndThread( vout_thread_t *p_vout )
Michel Kaempf's avatar
Michel Kaempf committed
785
{
Sam Hocevar's avatar
 
Sam Hocevar committed
786
    int     i_index;                                        /* index in heap */
Michel Kaempf's avatar
Michel Kaempf committed
787

Sam Hocevar's avatar
 
Sam Hocevar committed
788
#ifdef STATS
Vincent Seguin's avatar
Vincent Seguin committed
789
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
790 791
        struct tms cpu_usage;
        times( &cpu_usage );
Michel Kaempf's avatar
Michel Kaempf committed
792

793 794
        msg_Dbg( p_vout, "cpu usage (user: %d, system: %d)",
                 cpu_usage.tms_utime, cpu_usage.tms_stime );
Michel Kaempf's avatar
Michel Kaempf committed
795
    }
Sam Hocevar's avatar
 
Sam Hocevar committed
796
#endif
Michel Kaempf's avatar
Michel Kaempf committed
797

Sam Hocevar's avatar
 
Sam Hocevar committed
798 799 800 801 802 803
    if( !p_vout->b_direct )
    {
        p_vout->chroma.pf_end( p_vout );
        module_Unneed( p_vout->chroma.p_module );
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
804
    /* Destroy all remaining pictures */
Sam Hocevar's avatar
 
Sam Hocevar committed
805
    for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES; i_index++ )
Vincent Seguin's avatar
Vincent Seguin committed
806
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
807
        if ( p_vout->p_picture[i_index].i_type == MEMORY_PICTURE )
Michel Kaempf's avatar
Michel Kaempf committed
808
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
809
            free( p_vout->p_picture[i_index].p_data_orig );
Michel Kaempf's avatar
Michel Kaempf committed
810
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
811
    }
Michel Kaempf's avatar
Michel Kaempf committed
812

Sam Hocevar's avatar
 
Sam Hocevar committed
813 814 815 816
    /* Destroy all remaining subpictures */
    for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
    {
        if( p_vout->p_subpicture[i_index].i_status != FREE_SUBPICTURE )
Vincent Seguin's avatar
Vincent Seguin committed
817
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
818
            free( p_vout->p_subpicture[i_index].p_sys );
Vincent Seguin's avatar
Vincent Seguin committed
819
        }
Michel Kaempf's avatar
Michel Kaempf committed
820
    }
821

Sam Hocevar's avatar
 
Sam Hocevar committed
822 823 824 825 826
    /* Destroy translation tables */
    p_vout->pf_end( p_vout );

    /* Release the change lock */
    vlc_mutex_unlock( &p_vout->change_lock );
Michel Kaempf's avatar
Michel Kaempf committed
827 828
}

829
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
830
 * DestroyThread: thread destruction
831
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
832 833
 * This function is called when the thread ends. It frees all ressources
 * allocated by CreateThread. Status is available at this stage.
834
 *****************************************************************************/
835
static void DestroyThread( vout_thread_t *p_vout )
Michel Kaempf's avatar
Michel Kaempf committed
836
{
Sam Hocevar's avatar
 
Sam Hocevar committed
837 838 839 840
    /* Destroy the locks */
    vlc_mutex_destroy( &p_vout->picture_lock );
    vlc_mutex_destroy( &p_vout->subpicture_lock );
    vlc_mutex_destroy( &p_vout->change_lock );
841

Sam Hocevar's avatar
 
Sam Hocevar committed
842 843
    /* Release the module */
    module_Unneed( p_vout->p_module );
844 845
}

Sam Hocevar's avatar
 
Sam Hocevar committed
846 847
/* following functions are local */

Sam Hocevar's avatar
 
Sam Hocevar committed
848 849 850 851 852
static int ReduceHeight( int i_ratio )
{
    int i_dummy = VOUT_ASPECT_FACTOR;
    int i_pgcd  = 1;
 
Sam Hocevar's avatar
 
Sam Hocevar committed
853 854 855 856 857
    if( !i_ratio )
    {
        return i_pgcd;
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
858 859 860 861 862 863 864 865
    /* VOUT_ASPECT_FACTOR is (2^7 * 3^3 * 5^3), we just check for 2, 3 and 5 */
    while( !(i_ratio & 1) && !(i_dummy & 1) )
    {
        i_ratio >>= 1;
        i_dummy >>= 1;
        i_pgcd  <<= 1;
    }

866
    while( !(i_ratio % 3) && !(i_dummy % 3) )
Sam Hocevar's avatar
 
Sam Hocevar committed
867 868 869 870 871 872
    {
        i_ratio /= 3;
        i_dummy /= 3;
        i_pgcd  *= 3;
    }

873
    while( !(i_ratio % 5) && !(i_dummy % 5) )
Sam Hocevar's avatar
 
Sam Hocevar committed
874 875 876 877 878 879 880 881 882
    {
        i_ratio /= 5;
        i_dummy /= 5;
        i_pgcd  *= 5;
    }

    return i_pgcd;
}

Sam Hocevar's avatar
 
Sam Hocevar committed
883 884 885 886 887 888 889 890 891 892
/*****************************************************************************
 * BinaryLog: computes the base 2 log of a binary value
 *****************************************************************************
 * This functions is used by MaskToShift, to get a bit index from a binary
 * value.
 *****************************************************************************/
static int BinaryLog(u32 i)
{
    int i_log = 0;

893
    if( i == 0 ) return -31337;
Sam Hocevar's avatar
 
Sam Hocevar committed
894

895 896 897 898 899
    if( i & 0xffff0000 ) i_log += 16;
    if( i & 0xff00ff00 ) i_log += 8;
    if( i & 0xf0f0f0f0 ) i_log += 4;
    if( i & 0xcccccccc ) i_log += 2;
    if( i & 0xaaaaaaaa ) i_log += 1;
Sam Hocevar's avatar
 
Sam Hocevar committed
900 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

    return( i_log );
}

/*****************************************************************************
 * MaskToShift: transform a color mask into right and left shifts
 *****************************************************************************
 * This function is used for obtaining color shifts from masks.
 *****************************************************************************/
static void MaskToShift( int *pi_left, int *pi_right, u32 i_mask )
{
    u32 i_low, i_high;                 /* lower hand higher bits of the mask */

    if( !i_mask )
    {
        *pi_left = *pi_right = 0;
        return;
    }

    /* Get bits */
    i_low =  i_mask & (- i_mask);                   /* lower bit of the mask */
    i_high = i_mask + i_low;                       /* higher bit of the mask */

    /* Transform bits into an index */
    i_low =  BinaryLog (i_low);
    i_high = BinaryLog (i_high);

    /* Update pointers and return */
    *pi_left =   i_low;
    *pi_right = (8 - i_high + i_low);
}

Gildas Bazin's avatar
 
Gildas Bazin committed
932 933 934
/*****************************************************************************
 * InitWindowSize: find the initial dimensions the video window should have.
 *****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
935
 * This function will check the "width", "height" and "zoom" config options and
Gildas Bazin's avatar
 
Gildas Bazin committed
936 937 938 939 940 941
 * will calculate the size that the video window should have.
 *****************************************************************************/
static void InitWindowSize( vout_thread_t *p_vout, int *pi_width,
                            int *pi_height )
{
    int i_width, i_height;
Gildas Bazin's avatar
 
Gildas Bazin committed
942
    double f_zoom;
Gildas Bazin's avatar
 
Gildas Bazin committed
943

944 945 946
    i_width = config_GetInt( p_vout, "width" );
    i_height = config_GetInt( p_vout, "height" );
    f_zoom = config_GetFloat( p_vout, "zoom" );
Gildas Bazin's avatar
 
Gildas Bazin committed
947 948 949

    if( (i_width >= 0) && (i_height >= 0))
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
950 951
        *pi_width = i_width * f_zoom;
        *pi_height = i_height * f_zoom;
Gildas Bazin's avatar
 
Gildas Bazin committed
952 953 954 955
        return;
    }
    else if( i_width >= 0 )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
956 957 958
        *pi_width = i_width * f_zoom;
        *pi_height = i_width * f_zoom * VOUT_ASPECT_FACTOR /
                        p_vout->render.i_aspect;
Gildas Bazin's avatar
 
Gildas Bazin committed
959 960 961 962
        return;
    }
    else if( i_height >= 0 )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
963 964 965
        *pi_height = i_height * f_zoom;
        *pi_width = i_height * f_zoom * p_vout->render.i_aspect /
                       VOUT_ASPECT_FACTOR;
Gildas Bazin's avatar
 
Gildas Bazin committed
966 967 968 969 970 971
        return;
    }

    if( p_vout->render.i_height * p_vout->render.i_aspect
        >= p_vout->render.i_width * VOUT_ASPECT_FACTOR )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
972
        *pi_width = p_vout->render.i_height * f_zoom
Gildas Bazin's avatar
 
Gildas Bazin committed
973
          * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR;
Gildas Bazin's avatar
 
Gildas Bazin committed
974
        *pi_height = p_vout->render.i_height * f_zoom;
Gildas Bazin's avatar
 
Gildas Bazin committed
975 976 977
    }
    else
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
978 979
        *pi_width = p_vout->render.i_width * f_zoom;
        *pi_height = p_vout->render.i_width * f_zoom
Gildas Bazin's avatar
 
Gildas Bazin committed
980 981 982
          * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect;
    }
}