video_output.c 32.1 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
8
 * $Id: video_output.c,v 1.200 2002/11/20 13:37:36 sam 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,
66 67 68 69
                                      unsigned int i_width,
                                      unsigned int i_height,
                                      vlc_fourcc_t i_chroma,
                                      unsigned int i_aspect )
Michel Kaempf's avatar
Michel Kaempf committed
70
{
71
    vout_thread_t * p_vout;                             /* thread descriptor */
Sam Hocevar's avatar
 
Sam Hocevar committed
72
    int             i_index;                                /* loop variable */
Sam Hocevar's avatar
 
Sam Hocevar committed
73
    char          * psz_plugin;
Michel Kaempf's avatar
Michel Kaempf committed
74

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

Gildas Bazin's avatar
 
Gildas Bazin committed
83 84 85
    /* 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
86
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
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 115 116
        /* 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
117 118
    }

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

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

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

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

Sam Hocevar's avatar
 
Sam Hocevar committed
143 144 145 146
    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
147
    p_vout->render.i_last_used_pic = -1;
Gildas Bazin's avatar
 
Gildas Bazin committed
148 149
    p_vout->render.b_allow_modify_pics = 1;

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

172 173 174 175 176
    /* 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 );
177

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

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

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

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

207 208
    vlc_object_attach( p_vout, p_parent );

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

218
    return p_vout;
Michel Kaempf's avatar
Michel Kaempf committed
219 220
}

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

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

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

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

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

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

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

Gildas Bazin's avatar
 
Gildas Bazin committed
272 273 274 275 276 277 278 279 280
    if( I_OUTPUTPICTURES > VOUT_MAX_PICTURES )
    {
        msg_Err( p_vout, "plugin allocated too many direct buffers, "
                         "our internal buffers must have overflown." );
        p_vout->pf_end( p_vout );
        vlc_mutex_unlock( &p_vout->change_lock );
        return VLC_EGENERIC;
    }

281
    msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
Sam Hocevar's avatar
 
Sam Hocevar committed
282 283

    i_pgcd = ReduceHeight( p_vout->render.i_aspect );
284 285 286 287 288
    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
289 290

    i_pgcd = ReduceHeight( p_vout->output.i_aspect );
291 292 293 294 295
    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
296

Sam Hocevar's avatar
 
Sam Hocevar committed
297 298 299 300 301 302 303 304
    /* 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
305 306 307 308
    /* 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
309
     && ( vout_ChromaCmp( p_vout->output.i_chroma, p_vout->render.i_chroma ) )
Sam Hocevar's avatar
 
Sam Hocevar committed
310 311
     && ( p_vout->output.i_aspect == p_vout->render.i_aspect ) )
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
312 313 314 315
        /* 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
316 317
        p_vout->b_direct = 1;

Sam Hocevar's avatar
 
Sam Hocevar committed
318 319
        for( i = 1; i < VOUT_MAX_PICTURES; i++ )
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
320 321 322 323 324 325 326 327
            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
328 329 330
            PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
            I_RENDERPICTURES++;
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
331 332 333 334

        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
335 336 337
    }
    else
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
338 339 340
        /* 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
341 342
        p_vout->b_direct = 0;

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

Sam Hocevar's avatar
 
Sam Hocevar committed
346 347
        if( p_vout->chroma.p_module == NULL )
        {
348 349
            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
350 351
            p_vout->pf_end( p_vout );
            vlc_mutex_unlock( &p_vout->change_lock );
352
            return VLC_EGENERIC;
Sam Hocevar's avatar
 
Sam Hocevar committed
353
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
354

Gildas Bazin's avatar
 
Gildas Bazin committed
355 356 357 358
        msg_Dbg( p_vout, "indirect render, mapping "
                 "render pictures 0-%i to system pictures %i-%i",
                 VOUT_MAX_PICTURES - 1, I_OUTPUTPICTURES,
                 I_OUTPUTPICTURES + VOUT_MAX_PICTURES - 1 );
Sam Hocevar's avatar
 
Sam Hocevar committed
359 360

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

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

Sam Hocevar's avatar
 
Sam Hocevar committed
372 373 374 375 376 377 378 379 380 381 382
    /* 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;
    }

383
/* XXX XXX mark thread ready */
384
    return VLC_SUCCESS;
Vincent Seguin's avatar
Vincent Seguin committed
385 386
}

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

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

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

#ifdef STATS
        p_vout->c_loops++;
        if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
432
        {
433 434
            msg_Dbg( p_vout, "picture heap: %d/%d",
                     I_RENDERPICTURES, p_vout->i_heap_size );
Sam Hocevar's avatar
 
Sam Hocevar committed
435
        }
436
#endif
Sam Hocevar's avatar
 
Sam Hocevar committed
437 438

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

453
        if( p_picture )
454
        {
455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485
            /* 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 );
486
                p_last_picture = NULL;
487 488
            }

Sam Hocevar's avatar
 
Sam Hocevar committed
489 490 491 492
            /* Compute FPS rate */
            p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ]
                = display_date;

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

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

                continue;
            }
Christophe Massiot's avatar
Christophe Massiot committed
542
#endif
543
            if( display_date > current_date + VOUT_DISPLAY_DELAY )
Sam Hocevar's avatar
 
Sam Hocevar committed
544 545 546 547 548 549 550 551
            {
                /* 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;
            }
552 553
            else if( p_picture == p_last_picture )
            {
554 555
                /* We are asked to repeat the previous picture, but we first
                 * wait for a couple of idle loops */
556 557 558 559 560 561 562
                if( i_idle_loops < 4 )
                {
                    p_picture    = NULL;
                    display_date = 0;
                }
                else
                {
563 564 565
                    /* 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;
566 567 568 569 570 571 572
                }
            }
        }

        if( p_picture == NULL )
        {
            i_idle_loops++;
573 574
        }

Sam Hocevar's avatar
 
Sam Hocevar committed
575 576 577 578
        /*
         * Check for subpictures to display
         */
        p_subpic = vout_SortSubPictures( p_vout, display_date );
579

Sam Hocevar's avatar
 
Sam Hocevar committed
580 581 582 583 584
        /*
         * Perform rendering
         */
        p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );

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

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

Sam Hocevar's avatar
 
Sam Hocevar committed
604 605 606 607 608
        /* 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
609
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
610
            mwait( display_date - VOUT_MWAIT_TOLERANCE );
611 612 613
        }
        else
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
614
            msleep( VOUT_IDLE_SLEEP );
615
        }
616

Sam Hocevar's avatar
 
Sam Hocevar committed
617 618 619 620 621 622 623 624 625 626
        /* 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 */
627 628 629 630
            if( p_vout->pf_display )
            {
                p_vout->pf_display( p_vout, p_directbuffer );
            }
Vincent Seguin's avatar
Vincent Seguin committed
631

632 633 634 635 636 637 638
            /* 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
639
        }
Vincent Seguin's avatar
Vincent Seguin committed
640

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

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

            /* Need to reinitialise the chroma plugin */
675 676
            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
677
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
678
    }
Vincent Seguin's avatar
Vincent Seguin committed
679

Sam Hocevar's avatar
 
Sam Hocevar committed
680 681 682 683
    /*
     * Error loop - wait until the thread destruction is requested
     */
    if( p_vout->b_error )
684
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
685
        ErrorThread( p_vout );
686
    }
Michel Kaempf's avatar
Michel Kaempf committed
687

Sam Hocevar's avatar
 
Sam Hocevar committed
688 689 690 691
    /* End of thread */
    EndThread( p_vout );

    /* Destroy thread structures allocated by CreateThread */
692
    DestroyThread( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
693 694
}

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

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

Sam Hocevar's avatar
 
Sam Hocevar committed
722
#ifdef STATS
Vincent Seguin's avatar
Vincent Seguin committed
723
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
724 725
        struct tms cpu_usage;
        times( &cpu_usage );
Michel Kaempf's avatar
Michel Kaempf committed
726

727 728
        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
729
    }
Sam Hocevar's avatar
 
Sam Hocevar committed
730
#endif
Michel Kaempf's avatar
Michel Kaempf committed
731

Sam Hocevar's avatar
 
Sam Hocevar committed
732 733
    if( !p_vout->b_direct )
    {
734
        module_Unneed( p_vout, p_vout->chroma.p_module );
Sam Hocevar's avatar
 
Sam Hocevar committed
735 736
    }

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

Sam Hocevar's avatar
 
Sam Hocevar committed
746 747 748 749
    /* 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
750
        {
Sam Hocevar's avatar
 
Sam Hocevar committed
751
            free( p_vout->p_subpicture[i_index].p_sys );
Vincent Seguin's avatar
Vincent Seguin committed
752
        }
Michel Kaempf's avatar
Michel Kaempf committed
753
    }
754

Sam Hocevar's avatar
 
Sam Hocevar committed
755 756 757 758 759
    /* 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
760 761
}

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

Sam Hocevar's avatar
 
Sam Hocevar committed
775
    /* Release the module */
776
    module_Unneed( p_vout, p_vout->p_module );
777 778
}

Sam Hocevar's avatar
 
Sam Hocevar committed
779 780
/* following functions are local */

Sam Hocevar's avatar
 
Sam Hocevar committed
781 782 783 784 785
static int ReduceHeight( int i_ratio )
{
    int i_dummy = VOUT_ASPECT_FACTOR;
    int i_pgcd  = 1;
 
Sam Hocevar's avatar
 
Sam Hocevar committed
786 787 788 789 790
    if( !i_ratio )
    {
        return i_pgcd;
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
791 792 793 794 795 796 797 798
    /* 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;
    }

799
    while( !(i_ratio % 3) && !(i_dummy % 3) )
Sam Hocevar's avatar
 
Sam Hocevar committed
800 801 802 803 804 805
    {
        i_ratio /= 3;
        i_dummy /= 3;
        i_pgcd  *= 3;
    }

806
    while( !(i_ratio % 5) && !(i_dummy % 5) )
Sam Hocevar's avatar
 
Sam Hocevar committed
807 808 809 810 811 812 813 814 815
    {
        i_ratio /= 5;
        i_dummy /= 5;
        i_pgcd  *= 5;
    }

    return i_pgcd;
}

Sam Hocevar's avatar
 
Sam Hocevar committed
816 817 818 819 820 821
/*****************************************************************************
 * 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.
 *****************************************************************************/
822
static int BinaryLog( uint32_t i )
Sam Hocevar's avatar
 
Sam Hocevar committed
823 824 825
{
    int i_log = 0;

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

828 829 830 831 832
    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
833

834
    return i_log;
Sam Hocevar's avatar
 
Sam Hocevar committed
835 836 837 838 839 840 841
}

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

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

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

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

879 880
    i_width = config_GetInt( p_vout, "width" );
    i_height = config_GetInt( p_vout, "height" );
881
    ll_zoom = (uint64_t)( FP_FACTOR * config_GetFloat( p_vout, "zoom" ) );
Gildas Bazin's avatar
 
Gildas Bazin committed
882 883 884

    if( (i_width >= 0) && (i_height >= 0))
    {
885 886
        *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
887 888 889 890
        return;
    }
    else if( i_width >= 0 )
    {
891 892 893
        *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
894 895 896 897
        return;
    }
    else if( i_height >= 0 )
    {
898 899 900
        *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
901 902 903 904 905 906
        return;
    }

    if( p_vout->render.i_height * p_vout->render.i_aspect
        >= p_vout->render.i_width * VOUT_ASPECT_FACTOR )
    {
907 908 909
        *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
910 911 912
    }
    else
    {
913 914 915
        *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
916
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
917 918

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