video_output.c 31.9 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.198 2002/11/19 20:45:08 gbazin Exp $
9
 *
Sam Hocevar's avatar
 
Sam Hocevar committed
10
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
11 12 13 14 15
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
Sam Hocevar's avatar
Sam Hocevar committed
16
 *
17 18
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 20
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
21
 *
22 23 24
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
25
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
26

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

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

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

Michel Kaempf's avatar
Michel Kaempf committed
38 39
#include "video.h"
#include "video_output.h"
40

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

45
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
46
 * Local prototypes
47
 *****************************************************************************/
48 49 50 51 52
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
53

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

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

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

Gildas Bazin's avatar
 
Gildas Bazin committed
81 82 83
    /* 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
84
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
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 114
        /* 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
115 116
    }

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

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

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

Sam Hocevar's avatar
 
Sam Hocevar committed
134
    /* Initialize the rendering heap */
Sam Hocevar's avatar
 
Sam Hocevar committed
135 136 137 138 139
    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
140

Sam Hocevar's avatar
 
Sam Hocevar committed
141 142 143 144
    p_vout->render.i_rmask    = 0;
    p_vout->render.i_gmask    = 0;
    p_vout->render.i_bmask    = 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
145 146 147
    p_vout->render.i_last_used_pic = 0;
    p_vout->render.b_allow_modify_pics = 1;

Sam Hocevar's avatar
 
Sam Hocevar committed
148 149 150 151 152 153 154 155 156 157 158
    /* 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
159
    /* Initialize misc stuff */
Sam Hocevar's avatar
 
Sam Hocevar committed
160 161 162 163 164 165
    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
166
    p_vout->b_fullscreen = 0;
Sam Hocevar's avatar
 
Sam Hocevar committed
167
    p_vout->render_time  = 10;
Gildas Bazin's avatar
 
Gildas Bazin committed
168
    p_vout->c_fps_samples= 0;
169

170 171 172 173 174
    /* Mouse coordinates */
    var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
    var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
    var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
    var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
175

Gildas Bazin's avatar
 
Gildas Bazin committed
176
    /* user requested fullscreen? */
177 178
    if( config_GetInt( p_vout, "fullscreen" ) )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
179
        p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
180
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
181

Gildas Bazin's avatar
 
Gildas Bazin committed
182 183 184 185 186
    /* 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
187 188
    p_vout->p_module = module_Need( p_vout,
                           ( p_vout->psz_filter_chain ) ?
189 190
                           "video filter" : "video output",
                           psz_plugin );
Sam Hocevar's avatar
 
Sam Hocevar committed
191

Gildas Bazin's avatar
 
Gildas Bazin committed
192
    if( psz_plugin ) free( psz_plugin );
Sam Hocevar's avatar
 
Sam Hocevar committed
193 194
    if( p_vout->p_module == NULL )
    {
195 196
        msg_Err( p_vout, "no suitable vout module" );
        vlc_object_destroy( p_vout );
197
        return NULL;
Sam Hocevar's avatar
 
Sam Hocevar committed
198 199
    }

Michel Kaempf's avatar
Michel Kaempf committed
200
    /* Create thread and set locks */
201 202 203
    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 );
204

205 206
    vlc_object_attach( p_vout, p_parent );

207 208
    if( vlc_thread_create( p_vout, "video output", RunThread,
                           VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) )
Michel Kaempf's avatar
Michel Kaempf committed
209
    {
210
        msg_Err( p_vout, "out of memory" );
211
        module_Unneed( p_vout, p_vout->p_module );
212 213
        vlc_object_destroy( p_vout );
        return NULL;
214
    }
Michel Kaempf's avatar
Michel Kaempf committed
215

216
    return p_vout;
Michel Kaempf's avatar
Michel Kaempf committed
217 218
}

219
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
220
 * vout_DestroyThread: destroys a previously created thread
221 222
 *****************************************************************************
 * Destroy a terminated thread.
Michel Kaempf's avatar
Michel Kaempf committed
223
 * The function will request a destruction of the specified thread. If pi_error
224
 * is NULL, it will return once the thread is destroyed. Else, it will be
Michel Kaempf's avatar
Michel Kaempf committed
225
 * update using one of the THREAD_* constants.
226
 *****************************************************************************/
227
void vout_DestroyThread( vout_thread_t *p_vout )
228
{
Michel Kaempf's avatar
Michel Kaempf committed
229 230
    /* Request thread destruction */
    p_vout->b_die = 1;
231
    vlc_thread_join( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
232

233
    /* Free structure */
234
    vlc_object_destroy( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
235 236
}

237
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
238
 * InitThread: initialize video output thread
239
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
240 241 242
 * 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.
243
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
244
static int InitThread( vout_thread_t *p_vout )
Vincent Seguin's avatar
Vincent Seguin committed
245
{
Sam Hocevar's avatar
 
Sam Hocevar committed
246
    int i, i_pgcd;
Sam Hocevar's avatar
 
Sam Hocevar committed
247

Sam Hocevar's avatar
 
Sam Hocevar committed
248 249 250 251
    vlc_mutex_lock( &p_vout->change_lock );

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

Sam Hocevar's avatar
 
Sam Hocevar committed
254
    /* Initialize output method, it allocates direct buffers for us */
Sam Hocevar's avatar
 
Sam Hocevar committed
255
    if( p_vout->pf_init( p_vout ) )
Vincent Seguin's avatar
Vincent Seguin committed
256
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
257
        vlc_mutex_unlock( &p_vout->change_lock );
258
        return VLC_EGENERIC;
Sam Hocevar's avatar
 
Sam Hocevar committed
259 260
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
261
    if( !I_OUTPUTPICTURES )
Sam Hocevar's avatar
 
Sam Hocevar committed
262
    {
263 264
        msg_Err( p_vout, "plugin was unable to allocate at least "
                         "one direct buffer" );
Sam Hocevar's avatar
 
Sam Hocevar committed
265
        p_vout->pf_end( p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
266
        vlc_mutex_unlock( &p_vout->change_lock );
267
        return VLC_EGENERIC;
268
    }
Vincent Seguin's avatar
Vincent Seguin committed
269

270
    msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
Sam Hocevar's avatar
 
Sam Hocevar committed
271 272

    i_pgcd = ReduceHeight( p_vout->render.i_aspect );
273 274 275 276 277
    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
278 279

    i_pgcd = ReduceHeight( p_vout->output.i_aspect );
280 281 282 283 284
    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
285

Sam Hocevar's avatar
 
Sam Hocevar committed
286 287 288 289 290 291 292 293
    /* 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
294 295 296 297
    /* 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
298
     && ( vout_ChromaCmp( p_vout->output.i_chroma, p_vout->render.i_chroma ) )
Sam Hocevar's avatar
 
Sam Hocevar committed
299 300
     && ( p_vout->output.i_aspect == p_vout->render.i_aspect ) )
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
301 302 303 304
        /* 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
305 306
        p_vout->b_direct = 1;

Sam Hocevar's avatar
 
Sam Hocevar committed
307 308
        for( i = 1; i < VOUT_MAX_PICTURES; i++ )
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
309 310 311 312 313 314 315 316
            if( p_vout->p_picture[ i ].i_type != DIRECT_PICTURE &&
                I_RENDERPICTURES >= VOUT_MIN_DIRECT_PICTURES - 1 &&
                p_vout->p_picture[ i - 1 ].i_type == DIRECT_PICTURE )
            {
                /* We have enough direct buffers so there's no need to
                 * try to use system memory buffers. */
                break;
            }
Sam Hocevar's avatar
 
Sam Hocevar committed
317 318 319
            PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
            I_RENDERPICTURES++;
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
320 321 322 323

        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
324 325 326
    }
    else
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
327 328 329
        /* 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
330 331
        p_vout->b_direct = 0;

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

Sam Hocevar's avatar
 
Sam Hocevar committed
335 336
        if( p_vout->chroma.p_module == NULL )
        {
337 338
            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
339 340
            p_vout->pf_end( p_vout );
            vlc_mutex_unlock( &p_vout->change_lock );
341
            return VLC_EGENERIC;
Sam Hocevar's avatar
 
Sam Hocevar committed
342
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
343

Sam Hocevar's avatar
 
Sam Hocevar committed
344
        if( I_OUTPUTPICTURES < 2 * VOUT_MAX_PICTURES )
Sam Hocevar's avatar
 
Sam Hocevar committed
345
        {
346 347 348 349
            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
350 351 352
        }
        else
        {
353 354 355 356
            /* 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
357
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
358 359

        /* Append render buffers after the direct buffers */
Sam Hocevar's avatar
 
Sam Hocevar committed
360
        for( i = I_OUTPUTPICTURES; i < 2 * VOUT_MAX_PICTURES; i++ )
Sam Hocevar's avatar
 
Sam Hocevar committed
361 362 363 364 365
        {
            PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
            I_RENDERPICTURES++;
        }
    }
Vincent Seguin's avatar
Vincent Seguin committed
366

Sam Hocevar's avatar
 
Sam Hocevar committed
367 368 369 370 371 372 373 374 375 376 377
    /* 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;
    }

378
/* XXX XXX mark thread ready */
379
    return VLC_SUCCESS;
Vincent Seguin's avatar
Vincent Seguin committed
380 381
}

382
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
383
 * RunThread: video output thread
384
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
385 386 387
 * 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.
388
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
389
static void RunThread( vout_thread_t *p_vout)
Vincent Seguin's avatar
Vincent Seguin committed
390
{
Sam Hocevar's avatar
 
Sam Hocevar committed
391
    int             i_index;                                /* index in heap */
392
    int             i_idle_loops = 0;  /* loops without displaying a picture */
Sam Hocevar's avatar
 
Sam Hocevar committed
393 394 395 396
    mtime_t         current_date;                            /* current date */
    mtime_t         display_date;                            /* display date */

    picture_t *     p_picture;                            /* picture pointer */
397
    picture_t *     p_last_picture = NULL;                   /* last picture */
Sam Hocevar's avatar
 
Sam Hocevar committed
398 399 400 401 402 403 404 405 406 407 408
    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 */
409
        DestroyThread( p_vout );
Sam Hocevar's avatar
 
Sam Hocevar committed
410 411
        return;
    }
412

413
    /*
Sam Hocevar's avatar
 
Sam Hocevar committed
414 415
     * Main loop - it is not executed if an error occured during
     * initialization
416
     */
Sam Hocevar's avatar
 
Sam Hocevar committed
417
    while( (!p_vout->b_die) && (!p_vout->b_error) )
418
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
419
        /* Initialize loop variables */
420
        p_picture = NULL;
Sam Hocevar's avatar
 
Sam Hocevar committed
421 422
        display_date = 0;
        current_date = mdate();
Sam Hocevar's avatar
 
Sam Hocevar committed
423 424 425 426

#ifdef STATS
        p_vout->c_loops++;
        if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
427
        {
428 429
            msg_Dbg( p_vout, "picture heap: %d/%d",
                     I_RENDERPICTURES, p_vout->i_heap_size );
Sam Hocevar's avatar
 
Sam Hocevar committed
430
        }
431
#endif
Sam Hocevar's avatar
 
Sam Hocevar committed
432 433

        /*
434 435 436
         * Find the picture to display (the one with the earliest date).
         * This operation does not need lock, since only READY_PICTUREs
         * are handled. */
437
        for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
Sam Hocevar's avatar
 
Sam Hocevar committed
438
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
439 440 441
            if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
                && ( (p_picture == NULL) ||
                     (PP_RENDERPICTURE[i_index]->date < display_date) ) )
442
            {
Sam Hocevar's avatar
 
Sam Hocevar committed
443
                p_picture = PP_RENDERPICTURE[i_index];
Sam Hocevar's avatar
 
Sam Hocevar committed
444
                display_date = p_picture->date;
445 446
            }
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
447

448
        if( p_picture )
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
            /* 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 );
481
                p_last_picture = NULL;
482 483
            }

Sam Hocevar's avatar
 
Sam Hocevar committed
484 485 486 487
            /* Compute FPS rate */
            p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ]
                = display_date;

488
            if( !p_picture->b_force &&
489
                p_picture != p_last_picture &&
490
                display_date < current_date + p_vout->render_time )
Sam Hocevar's avatar
 
Sam Hocevar committed
491 492 493 494 495 496 497 498 499 500 501 502 503 504
            {
                /* 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
505
                    p_vout->i_heap_size--;
Sam Hocevar's avatar
 
Sam Hocevar committed
506
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
507
                msg_Warn( p_vout, "late picture skipped ("I64Fd")",
508
                                  current_date - display_date );
509 510 511 512
                vlc_mutex_unlock( &p_vout->picture_lock );

                continue;
            }
Christophe Massiot's avatar
Christophe Massiot committed
513 514
#if 0
            /* Removed because it causes problems for some people --Meuuh */
515
            if( display_date > current_date + VOUT_BOGUS_DELAY )
516 517 518 519 520 521 522 523 524 525 526 527 528 529 530
            {
                /* 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--;
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
531 532
                intf_WarnMsg( 1, "vout warning: early picture skipped "
                              "("I64Fd")", display_date - current_date );
Sam Hocevar's avatar
 
Sam Hocevar committed
533 534 535 536
                vlc_mutex_unlock( &p_vout->picture_lock );

                continue;
            }
Christophe Massiot's avatar
Christophe Massiot committed
537
#endif
538
            if( display_date > current_date + VOUT_DISPLAY_DELAY )
Sam Hocevar's avatar
 
Sam Hocevar committed
539 540 541 542 543 544 545 546
            {
                /* 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;
            }
547 548
            else if( p_picture == p_last_picture )
            {
549 550
                /* We are asked to repeat the previous picture, but we first
                 * wait for a couple of idle loops */
551 552 553 554 555 556 557
                if( i_idle_loops < 4 )
                {
                    p_picture    = NULL;
                    display_date = 0;
                }
                else
                {
558 559 560
                    /* We set the display date to something high, otherwise
                     * we'll have lots of problems with late pictures */
                    display_date = current_date + p_vout->render_time;
561 562 563 564 565 566 567
                }
            }
        }

        if( p_picture == NULL )
        {
            i_idle_loops++;
568 569
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
570 571 572 573
        /*
         * Check for subpictures to display
         */
        p_subpic = vout_SortSubPictures( p_vout, display_date );
574

Sam Hocevar's avatar
 
Sam Hocevar committed
575 576 577 578 579
        /*
         * Perform rendering
         */
        p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );

Sam Hocevar's avatar
 
Sam Hocevar committed
580
        /*
581
         * Call the plugin-specific rendering method if there is one
Sam Hocevar's avatar
 
Sam Hocevar committed
582
         */
583
        if( p_picture != NULL && p_vout->pf_render )
Sam Hocevar's avatar
 
Sam Hocevar committed
584 585 586 587 588
        {
            /* Render the direct buffer returned by vout_RenderPicture */
            p_vout->pf_render( p_vout, p_directbuffer );
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
589 590 591 592
        /*
         * Sleep, wake up
         */
        if( display_date != 0 )
593
        {
594
            /* Store render time using a sliding mean */
Sam Hocevar's avatar
 
Sam Hocevar committed
595 596
            p_vout->render_time += mdate() - current_date;
            p_vout->render_time >>= 1;
597 598
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
599 600 601 602 603
        /* 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
604
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
605
            mwait( display_date - VOUT_MWAIT_TOLERANCE );
606 607 608
        }
        else
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
609
            msleep( VOUT_IDLE_SLEEP );
610
        }
611

Sam Hocevar's avatar
 
Sam Hocevar committed
612 613 614 615 616 617 618 619 620 621
        /* 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 */
622 623 624 625
            if( p_vout->pf_display )
            {
                p_vout->pf_display( p_vout, p_directbuffer );
            }
Vincent Seguin's avatar
Vincent Seguin committed
626

627 628 629 630 631 632 633
            /* 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
634
        }
Vincent Seguin's avatar
Vincent Seguin committed
635

Sam Hocevar's avatar
 
Sam Hocevar committed
636 637 638
        /*
         * Check events and manage thread
         */
639
        if( p_vout->pf_manage && p_vout->pf_manage( p_vout ) )
Sam Hocevar's avatar
 
Sam Hocevar committed
640
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
641 642 643
            /* 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
644 645
            p_vout->b_error = 1;
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663

        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 ) )
            {
664
                msg_Err( p_vout, "cannot resize display" );
665
                /* FIXME: pf_end will be called again in EndThread() */
Gildas Bazin's avatar
 
Gildas Bazin committed
666 667 668 669
                p_vout->b_error = 1;
            }

            /* Need to reinitialise the chroma plugin */
670 671
            p_vout->chroma.p_module->pf_deactivate( VLC_OBJECT(p_vout) );
            p_vout->chroma.p_module->pf_activate( VLC_OBJECT(p_vout) );
Gildas Bazin's avatar
 
Gildas Bazin committed
672
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
673
    }
Vincent Seguin's avatar
Vincent Seguin committed
674

Sam Hocevar's avatar
 
Sam Hocevar committed
675 676 677 678
    /*
     * Error loop - wait until the thread destruction is requested
     */
    if( p_vout->b_error )
679
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
680
        ErrorThread( p_vout );
681
    }
Michel Kaempf's avatar
Michel Kaempf committed
682

Sam Hocevar's avatar
 
Sam Hocevar committed
683 684 685 686
    /* End of thread */
    EndThread( p_vout );

    /* Destroy thread structures allocated by CreateThread */
687
    DestroyThread( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
688 689
}

690
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
691
 * ErrorThread: RunThread() error loop
692
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
693 694 695
 * 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.
696
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
697
static void ErrorThread( vout_thread_t *p_vout )
698
{
Sam Hocevar's avatar
 
Sam Hocevar committed
699 700
    /* Wait until a `die' order */
    while( !p_vout->b_die )
701
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
702 703
        /* Sleep a while */
        msleep( VOUT_IDLE_SLEEP );
704
    }
705 706
}

707
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
708
 * EndThread: thread destruction
709
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
710 711
 * This function is called when the thread ends after a sucessful
 * initialization. It frees all ressources allocated by InitThread.
712
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
713
static void EndThread( vout_thread_t *p_vout )
Michel Kaempf's avatar
Michel Kaempf committed
714
{
Sam Hocevar's avatar
 
Sam Hocevar committed
715
    int     i_index;                                        /* index in heap */
Michel Kaempf's avatar
Michel Kaempf committed
716

Sam Hocevar's avatar
 
Sam Hocevar committed
717
#ifdef STATS
Vincent Seguin's avatar
Vincent Seguin committed
718
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
719 720
        struct tms cpu_usage;
        times( &cpu_usage );
Michel Kaempf's avatar
Michel Kaempf committed
721

722 723
        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
724
    }
Sam Hocevar's avatar
 
Sam Hocevar committed
725
#endif
Michel Kaempf's avatar
Michel Kaempf committed
726

Sam Hocevar's avatar
 
Sam Hocevar committed
727 728
    if( !p_vout->b_direct )
    {
729
        module_Unneed( p_vout, p_vout->chroma.p_module );
Sam Hocevar's avatar
 
Sam Hocevar committed
730 731
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
732
    /* Destroy all remaining pictures */
Sam Hocevar's avatar
 
Sam Hocevar committed
733
    for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES; i_index++ )
Vincent Seguin's avatar
Vincent Seguin committed
734
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
735
        if ( p_vout->p_picture[i_index].i_type == MEMORY_PICTURE )
Michel Kaempf's avatar
Michel Kaempf committed
736
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
737
            free( p_vout->p_picture[i_index].p_data_orig );
Michel Kaempf's avatar
Michel Kaempf committed
738
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
739
    }
Michel Kaempf's avatar
Michel Kaempf committed
740

Sam Hocevar's avatar
 
Sam Hocevar committed
741 742 743 744
    /* 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
745
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
746
            free( p_vout->p_subpicture[i_index].p_sys );
Vincent Seguin's avatar
Vincent Seguin committed
747
        }
Michel Kaempf's avatar
Michel Kaempf committed
748
    }
749

Sam Hocevar's avatar
 
Sam Hocevar committed
750 751 752 753 754
    /* 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
755 756
}

757
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
758
 * DestroyThread: thread destruction
759
 *****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
760 761
 * This function is called when the thread ends. It frees all ressources
 * allocated by CreateThread. Status is available at this stage.
762
 *****************************************************************************/
763
static void DestroyThread( vout_thread_t *p_vout )
Michel Kaempf's avatar
Michel Kaempf committed
764
{
Sam Hocevar's avatar
 
Sam Hocevar committed
765 766 767 768
    /* Destroy the locks */
    vlc_mutex_destroy( &p_vout->picture_lock );
    vlc_mutex_destroy( &p_vout->subpicture_lock );
    vlc_mutex_destroy( &p_vout->change_lock );
769

Sam Hocevar's avatar
 
Sam Hocevar committed
770
    /* Release the module */
771
    module_Unneed( p_vout, p_vout->p_module );
772 773
}

Sam Hocevar's avatar
 
Sam Hocevar committed
774 775
/* following functions are local */

Sam Hocevar's avatar
 
Sam Hocevar committed
776 777 778 779 780
static int ReduceHeight( int i_ratio )
{
    int i_dummy = VOUT_ASPECT_FACTOR;
    int i_pgcd  = 1;
 
Sam Hocevar's avatar
 
Sam Hocevar committed
781 782 783 784 785
    if( !i_ratio )
    {
        return i_pgcd;
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
786 787 788 789 790 791 792 793
    /* 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;
    }

794
    while( !(i_ratio % 3) && !(i_dummy % 3) )
Sam Hocevar's avatar
 
Sam Hocevar committed
795 796 797 798 799 800
    {
        i_ratio /= 3;
        i_dummy /= 3;
        i_pgcd  *= 3;
    }

801
    while( !(i_ratio % 5) && !(i_dummy % 5) )
Sam Hocevar's avatar
 
Sam Hocevar committed
802 803 804 805 806 807 808 809 810
    {
        i_ratio /= 5;
        i_dummy /= 5;
        i_pgcd  *= 5;
    }

    return i_pgcd;
}

Sam Hocevar's avatar
 
Sam Hocevar committed
811 812 813 814 815 816
/*****************************************************************************
 * 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.
 *****************************************************************************/
817
static int BinaryLog( uint32_t i )
Sam Hocevar's avatar
 
Sam Hocevar committed
818 819 820
{
    int i_log = 0;

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

823 824 825 826 827
    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
828

829
    return i_log;
Sam Hocevar's avatar
 
Sam Hocevar committed
830 831 832 833 834 835 836
}

/*****************************************************************************
 * MaskToShift: transform a color mask into right and left shifts
 *****************************************************************************
 * This function is used for obtaining color shifts from masks.
 *****************************************************************************/
837
static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask )
Sam Hocevar's avatar
 
Sam Hocevar committed
838
{
839
    uint32_t i_low, i_high;            /* lower hand higher bits of the mask */
Sam Hocevar's avatar
 
Sam Hocevar committed
840 841 842 843 844 845 846 847

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

    /* Get bits */
848
    i_low =  i_mask & (- (int32_t)i_mask);          /* lower bit of the mask */
Sam Hocevar's avatar
 
Sam Hocevar committed
849 850 851 852 853 854 855 856 857 858 859
    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
860 861 862
/*****************************************************************************
 * InitWindowSize: find the initial dimensions the video window should have.
 *****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
863
 * This function will check the "width", "height" and "zoom" config options and
Gildas Bazin's avatar
 
Gildas Bazin committed
864 865 866 867 868 869
 * 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
870 871 872
    uint64_t ll_zoom;

#define FP_FACTOR 1000                             /* our fixed point factor */
Gildas Bazin's avatar
 
Gildas Bazin committed
873

874 875
    i_width = config_GetInt( p_vout, "width" );
    i_height = config_GetInt( p_vout, "height" );
876
    ll_zoom = (uint64_t)( FP_FACTOR * config_GetFloat( p_vout, "zoom" ) );
Gildas Bazin's avatar
 
Gildas Bazin committed
877 878 879

    if( (i_width >= 0) && (i_height >= 0))
    {
880 881
        *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
        *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
Gildas Bazin's avatar
 
Gildas Bazin committed
882 883 884 885
        return;
    }
    else if( i_width >= 0 )
    {
886 887 888
        *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
        *pi_height = (int)( i_width * ll_zoom * VOUT_ASPECT_FACTOR /
                            p_vout->render.i_aspect / FP_FACTOR );
Gildas Bazin's avatar
 
Gildas Bazin committed
889 890 891 892
        return;
    }
    else if( i_height >= 0 )
    {
893 894 895
        *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
        *pi_width = (int)( i_height * ll_zoom * p_vout->render.i_aspect /
                           VOUT_ASPECT_FACTOR / FP_FACTOR );
Gildas Bazin's avatar
 
Gildas Bazin committed
896 897 898 899 900 901
        return;
    }

    if( p_vout->render.i_height * p_vout->render.i_aspect
        >= p_vout->render.i_width * VOUT_ASPECT_FACTOR )
    {
902 903 904
        *pi_width = (int)( p_vout->render.i_height * ll_zoom
          * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR / FP_FACTOR );
        *pi_height = (int)( p_vout->render.i_height * ll_zoom / FP_FACTOR );
Gildas Bazin's avatar
 
Gildas Bazin committed
905 906 907
    }
    else
    {
908 909 910
        *pi_width = (int)( p_vout->render.i_width * ll_zoom / FP_FACTOR );
        *pi_height = (int)( p_vout->render.i_width * ll_zoom
          * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect / FP_FACTOR );
Gildas Bazin's avatar
 
Gildas Bazin committed
911
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
912 913

#undef FP_FACTOR
Gildas Bazin's avatar
 
Gildas Bazin committed
914
}