video_output.c 76.2 KB
Newer Older
1
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
2
 * video_output.c : video output thread
3
 * (c)2000 VideoLAN
4
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
5 6 7
 * This module describes the programming interface for video output threads.
 * It includes functions allowing to open a new thread, send pictures to a
 * thread, and destroy a previously oppenned video output thread.
8
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
9

10
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
11
 * Preamble
12
 ******************************************************************************/
13
#include <errno.h>
Michel Kaempf's avatar
Michel Kaempf committed
14 15 16
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
Vincent Seguin's avatar
Vincent Seguin committed
17

Michel Kaempf's avatar
Michel Kaempf committed
18 19 20
#include "common.h"
#include "config.h"
#include "mtime.h"
21
#include "vlc_thread.h"
Michel Kaempf's avatar
Michel Kaempf committed
22 23
#include "video.h"
#include "video_output.h"
Vincent Seguin's avatar
Vincent Seguin committed
24
#include "video_text.h"
Vincent Seguin's avatar
Vincent Seguin committed
25
#include "video_sys.h"
26
#include "video_yuv.h"
Vincent Seguin's avatar
Vincent Seguin committed
27
#include "intf_msg.h"
28
#include "main.h"
Vincent Seguin's avatar
Vincent Seguin committed
29

30
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
31
 * Local prototypes
32
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
33 34
static int      BinaryLog         ( u32 i );
static void     MaskToShift       ( int *pi_left, int *pi_right, u32 i_mask );
35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
static int      InitThread        ( vout_thread_t *p_vout );
static void     RunThread         ( vout_thread_t *p_vout );
static void     ErrorThread       ( vout_thread_t *p_vout );
static void     EndThread         ( vout_thread_t *p_vout );
static void     DestroyThread     ( vout_thread_t *p_vout, int i_status );
static void     Print             ( vout_thread_t *p_vout, int i_x, int i_y, 
                                    int i_h_align, int i_v_align,
                                    unsigned char *psz_text );
static void     SetBufferArea     ( vout_thread_t *p_vout, int i_x, int i_y,
                                    int i_w, int i_h );
static void     SetBufferPicture  ( vout_thread_t *p_vout, picture_t *p_pic );
static void     RenderPicture     ( vout_thread_t *p_vout, picture_t *p_pic );
static void     RenderPictureInfo ( vout_thread_t *p_vout, picture_t *p_pic );
static void     RenderSubPicture  ( vout_thread_t *p_vout,
                                    subpicture_t *p_subpic );
static void     RenderInterface   ( vout_thread_t *p_vout );
static int      RenderIdle        ( vout_thread_t *p_vout );
static void     RenderInfo        ( vout_thread_t *p_vout );
static int      Manage            ( vout_thread_t *p_vout );
static int      Align             ( vout_thread_t *p_vout, int *pi_x,
                                    int *pi_y, int i_width, int i_height,
                                    int i_h_align, int i_v_align );
Michel Kaempf's avatar
Michel Kaempf committed
57

58
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
59
 * vout_CreateThread: creates a new video output thread
60
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
61 62 63
 * This function creates a new video output thread, and returns a pointer
 * to its description. On error, it returns NULL.
 * If pi_status is NULL, then the function will block until the thread is ready.
64
 * If not, it will be updated using one of the THREAD_* constants.
65
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
66 67
vout_thread_t * vout_CreateThread               ( char *psz_display, int i_root_window, 
                                                  int i_width, int i_height, int *pi_status )
Michel Kaempf's avatar
Michel Kaempf committed
68
{
69 70
    vout_thread_t * p_vout;                              /* thread descriptor */
    int             i_status;                                /* thread status */
71
    int             i_index;                /* index for array initialization */
Michel Kaempf's avatar
Michel Kaempf committed
72

73
    /* Allocate descriptor */
74
    intf_DbgMsg("\n");    
Michel Kaempf's avatar
Michel Kaempf committed
75
    p_vout = (vout_thread_t *) malloc( sizeof(vout_thread_t) );
76
    if( p_vout == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
77
    {
78
        intf_ErrMsg("error: %s\n", strerror(ENOMEM));        
Michel Kaempf's avatar
Michel Kaempf committed
79 80
        return( NULL );
    }
81

82 83
    /* Initialize thread properties - thread id and locks will be initialized 
     * later */
84 85 86 87 88 89
    p_vout->b_die               = 0;
    p_vout->b_error             = 0;    
    p_vout->b_active            = 0;
    p_vout->pi_status           = (pi_status != NULL) ? pi_status : &i_status;
    *p_vout->pi_status          = THREAD_CREATE;    

90
    /* Initialize some fields used by the system-dependant method - these fields will
91
     * probably be modified by the method, and are only preferences */
92
    p_vout->i_changes           = 0;
93 94
    p_vout->i_width             = i_width;
    p_vout->i_height            = i_height;
95
    p_vout->i_bytes_per_line    = i_width * 2;    
96 97
    p_vout->i_screen_depth      = 15;
    p_vout->i_bytes_per_pixel   = 2;
98
    p_vout->f_gamma             = VOUT_GAMMA;    
99

Vincent Seguin's avatar
Vincent Seguin committed
100
    p_vout->b_grayscale         = main_GetIntVariable( VOUT_GRAYSCALE_VAR, VOUT_GRAYSCALE_DEFAULT );
Vincent Seguin's avatar
Vincent Seguin committed
101
    p_vout->b_info              = 0;    
102 103 104
    p_vout->b_interface         = 0;
    p_vout->b_scale             = 0;
    
Vincent Seguin's avatar
Vincent Seguin committed
105
    intf_DbgMsg("wished configuration: %dx%d, %d/%d bpp (%d Bpl)\n",
106
                p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
Vincent Seguin's avatar
Vincent Seguin committed
107
                p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line );
108

109 110 111 112
    /* Initialize idle screen */
    p_vout->last_display_date   = mdate();
    p_vout->last_idle_date      = 0;

113 114 115 116 117 118 119 120 121
#ifdef STATS
    /* Initialize statistics fields */
    p_vout->render_time         = 0;    
    p_vout->c_fps_samples       = 0;    
#endif      

    /* Initialize buffer index */
    p_vout->i_buffer_index      = 0;

122
    /* Initialize pictures and subpictures - translation tables and functions
123 124 125
     * will be initialized later in InitThread */    
    for( i_index = 0; i_index < VOUT_MAX_PICTURES; i_index++)
    {
126 127 128 129
        p_vout->p_picture[i_index].i_type   =   EMPTY_PICTURE;
        p_vout->p_picture[i_index].i_status =   FREE_PICTURE;
        p_vout->p_subpicture[i_index].i_type  = EMPTY_SUBPICTURE;
        p_vout->p_subpicture[i_index].i_status= FREE_SUBPICTURE;
130
    }
131 132 133
   
    /* Create and initialize system-dependant method - this function issues its
     * own error messages */
Vincent Seguin's avatar
Vincent Seguin committed
134
    if( vout_SysCreate( p_vout, psz_display, i_root_window ) )
Michel Kaempf's avatar
Michel Kaempf committed
135
    {
Vincent Seguin's avatar
Vincent Seguin committed
136 137
      free( p_vout );
      return( NULL );
Michel Kaempf's avatar
Michel Kaempf committed
138
    }
Vincent Seguin's avatar
Vincent Seguin committed
139
    intf_DbgMsg("actual configuration: %dx%d, %d/%d bpp (%d Bpl), masks: 0x%x/0x%x/0x%x\n",
140
                p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
Vincent Seguin's avatar
Vincent Seguin committed
141 142 143 144 145 146 147 148 149 150 151 152 153
                p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line,
                p_vout->i_red_mask, p_vout->i_green_mask, p_vout->i_blue_mask );

    /* Calculate shifts from system-updated masks */
    MaskToShift( &p_vout->i_red_lshift,   &p_vout->i_red_rshift,   p_vout->i_red_mask );
    MaskToShift( &p_vout->i_green_lshift, &p_vout->i_green_rshift, p_vout->i_green_mask );
    MaskToShift( &p_vout->i_blue_lshift,  &p_vout->i_blue_rshift,  p_vout->i_blue_mask );

    /* Set some usefull colors */
    p_vout->i_white_pixel = RGB2PIXEL( p_vout, 255, 255, 255 );
    p_vout->i_black_pixel = RGB2PIXEL( p_vout, 0, 0, 0 );
    p_vout->i_gray_pixel  = RGB2PIXEL( p_vout, 128, 128, 128 );
    p_vout->i_blue_pixel  = RGB2PIXEL( p_vout, 0, 0, 50 );    
Vincent Seguin's avatar
Vincent Seguin committed
154

155 156
    /* Load fonts - fonts must be initialized after the systme method since
     * they may be dependant of screen depth and other thread properties */
Vincent Seguin's avatar
Vincent Seguin committed
157 158 159 160 161 162 163 164 165 166 167 168 169 170
    p_vout->p_default_font      = vout_LoadFont( VOUT_DEFAULT_FONT );    
    if( p_vout->p_default_font == NULL )
    {
        vout_SysDestroy( p_vout );        
        free( p_vout );        
        return( NULL );        
    }    
    p_vout->p_large_font        = vout_LoadFont( VOUT_LARGE_FONT );        
    if( p_vout->p_large_font == NULL )
    {
        vout_UnloadFont( p_vout->p_default_font );        
        vout_SysDestroy( p_vout );        
        free( p_vout );        
        return( NULL );        
171
    }     
Vincent Seguin's avatar
Vincent Seguin committed
172

Michel Kaempf's avatar
Michel Kaempf committed
173
    /* Create thread and set locks */
Vincent Seguin's avatar
Vincent Seguin committed
174
    vlc_mutex_init( &p_vout->picture_lock );
175
    vlc_mutex_init( &p_vout->subpicture_lock );    
Vincent Seguin's avatar
Vincent Seguin committed
176 177 178
    vlc_mutex_init( &p_vout->change_lock );    
    vlc_mutex_lock( &p_vout->change_lock );    
    if( vlc_thread_create( &p_vout->thread_id, "video output", (void *) RunThread, (void *) p_vout) )
Michel Kaempf's avatar
Michel Kaempf committed
179
    {
180
        intf_ErrMsg("error: %s\n", strerror(ENOMEM));
Vincent Seguin's avatar
Vincent Seguin committed
181 182
        vout_UnloadFont( p_vout->p_default_font );
        vout_UnloadFont( p_vout->p_large_font );        
Vincent Seguin's avatar
Vincent Seguin committed
183
	vout_SysDestroy( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
184 185 186 187
        free( p_vout );
        return( NULL );
    }   

Vincent Seguin's avatar
Vincent Seguin committed
188 189
    intf_Msg("Video display initialized (%dx%d, %d/%d bpp)\n", p_vout->i_width, 
             p_vout->i_height, p_vout->i_screen_depth, p_vout->i_bytes_per_pixel * 8 );
190

Michel Kaempf's avatar
Michel Kaempf committed
191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
    /* If status is NULL, wait until the thread is created */
    if( pi_status == NULL )
    {
        do
        {            
            msleep( THREAD_SLEEP );
        }while( (i_status != THREAD_READY) && (i_status != THREAD_ERROR) 
                && (i_status != THREAD_FATAL) );
        if( i_status != THREAD_READY )
        {
            return( NULL );            
        }        
    }
    return( p_vout );
}

207
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
208
 * vout_DestroyThread: destroys a previously created thread
209
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
210 211 212 213
 * Destroy a terminated thread. 
 * The function will request a destruction of the specified thread. If pi_error
 * is NULL, it will return once the thread is destroyed. Else, it will be 
 * update using one of the THREAD_* constants.
214
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
215 216
void vout_DestroyThread( vout_thread_t *p_vout, int *pi_status )
{  
217
    int     i_status;                                        /* thread status */
Michel Kaempf's avatar
Michel Kaempf committed
218 219

    /* Set status */
220
    intf_DbgMsg("\n");
Michel Kaempf's avatar
Michel Kaempf committed
221
    p_vout->pi_status = (pi_status != NULL) ? pi_status : &i_status;
Vincent Seguin's avatar
Vincent Seguin committed
222
    *p_vout->pi_status = THREAD_DESTROY;    
Michel Kaempf's avatar
Michel Kaempf committed
223 224 225 226 227
     
    /* Request thread destruction */
    p_vout->b_die = 1;

    /* If status is NULL, wait until thread has been destroyed */
228
    if( pi_status == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
229 230 231 232 233 234 235 236 237
    {
        do
        {
            msleep( THREAD_SLEEP );
        }while( (i_status != THREAD_OVER) && (i_status != THREAD_ERROR) 
                && (i_status != THREAD_FATAL) );   
    }
}

238
/******************************************************************************
239
 * vout_DisplaySubPicture: display a subpicture unit
240
 ******************************************************************************
241 242
 * Remove the reservation flag of an subpicture, which will cause it to be ready 
 * for display. The picture does not need to be locked, since it is ignored by
Vincent Seguin's avatar
Vincent Seguin committed
243
 * the output thread if is reserved.
244
 ******************************************************************************/
245
void  vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
Vincent Seguin's avatar
Vincent Seguin committed
246 247
{
#ifdef DEBUG_VIDEO
248 249
    char        psz_begin_date[MSTRTIME_MAX_SIZE];  /* buffer for date string */
    char        psz_end_date[MSTRTIME_MAX_SIZE];    /* buffer for date string */
Vincent Seguin's avatar
Vincent Seguin committed
250 251 252 253
#endif

#ifdef DEBUG
    /* Check if status is valid */
254
    if( p_subpic->i_status != RESERVED_SUBPICTURE )
Vincent Seguin's avatar
Vincent Seguin committed
255
    {
256 257
        intf_DbgMsg("error: subpicture %p has invalid status %d\n", p_subpic, 
                    p_subpic->i_status );       
Vincent Seguin's avatar
Vincent Seguin committed
258 259 260 261
    }   
#endif

    /* Remove reservation flag */
262
    p_subpic->i_status = READY_SUBPICTURE;
Vincent Seguin's avatar
Vincent Seguin committed
263 264

#ifdef DEBUG_VIDEO
265
    /* Send subpicture informations */
266 267 268 269
    intf_DbgMsg("subpicture %p: type=%d, begin date=%s, end date=%s\n", 
                p_subpic, p_subpic->i_type, 
                mstrtime( psz_begin_date, p_subpic->begin_date ), 
                mstrtime( psz_end_date, p_subpic->end_date ) );    
Vincent Seguin's avatar
Vincent Seguin committed
270 271 272
#endif
}

273
/******************************************************************************
274
 * vout_CreateSubPicture: allocate an subpicture in the video output heap.
275
 ******************************************************************************
276
 * This function create a reserved subpicture in the video output heap. 
Vincent Seguin's avatar
Vincent Seguin committed
277
 * A null pointer is returned if the function fails. This method provides an
278
 * already allocated zone of memory in the spu data fields. It needs locking
Vincent Seguin's avatar
Vincent Seguin committed
279
 * since several pictures can be created by several producers threads. 
280
 ******************************************************************************/
281 282
subpicture_t *vout_CreateSubPicture( vout_thread_t *p_vout, int i_type, 
                                     int i_size )
Vincent Seguin's avatar
Vincent Seguin committed
283
{
284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387
    int                 i_subpic;                          /* subpicture index */
    subpicture_t *      p_free_subpic = NULL;         /* first free subpicture */    
    subpicture_t *      p_destroyed_subpic = NULL;   /* first destroyed subpic */

    /* Get lock */
    vlc_mutex_lock( &p_vout->subpicture_lock );

    /* 
     * Look for an empty place 
     */
    for( i_subpic = 0; i_subpic < VOUT_MAX_PICTURES; i_subpic++ )
    {
	if( p_vout->p_subpicture[i_subpic].i_status == DESTROYED_SUBPICTURE )
	{
	    /* Subpicture is marked for destruction, but is still allocated */
	    if( (p_vout->p_subpicture[i_subpic].i_type  == i_type)   &&
		(p_vout->p_subpicture[i_subpic].i_size  >= i_size) )
	    {
		/* Memory size do match or is smaller : memory will not be reallocated, 
                 * and function can end immediately - this is the best possible case, 
                 * since no memory allocation needs to be done */
		p_vout->p_subpicture[i_subpic].i_status = RESERVED_SUBPICTURE;
#ifdef DEBUG_VIDEO
                intf_DbgMsg("subpicture %p (in destroyed subpicture slot)\n", 
                            &p_vout->p_subpicture[i_subpic] );                
#endif
		vlc_mutex_unlock( &p_vout->subpicture_lock );
		return( &p_vout->p_subpicture[i_subpic] );
	    }
	    else if( p_destroyed_subpic == NULL )
	    {
		/* Memory size do not match, but subpicture index will be kept in
		 * case no other place are left */
		p_destroyed_subpic = &p_vout->p_subpicture[i_subpic];                
	    }	    
	}
        else if( (p_free_subpic == NULL) && 
                 (p_vout->p_subpicture[i_subpic].i_status == FREE_SUBPICTURE ))
        {
	    /* Subpicture is empty and ready for allocation */
            p_free_subpic = &p_vout->p_subpicture[i_subpic];
        }
    }

    /* If no free subpicture is available, use a destroyed subpicture */
    if( (p_free_subpic == NULL) && (p_destroyed_subpic != NULL ) )
    { 
	/* No free subpicture or matching destroyed subpicture has been found, but
	 * a destroyed subpicture is still avalaible */
        free( p_destroyed_subpic->p_data );        
        p_free_subpic = p_destroyed_subpic;
    }

    /*
     * Prepare subpicture
     */
    if( p_free_subpic != NULL )
    {
        /* Allocate memory */
        switch( i_type )
        {
        case TEXT_SUBPICTURE:                               /* text subpicture */
            p_free_subpic->p_data = malloc( i_size + 1 );             
            break;
#ifdef DEBUG
        default:
            intf_DbgMsg("error: unknown subpicture type %d\n", i_type );
            p_free_subpic->p_data   =  NULL;            
            break;            
#endif    
        }

        if( p_free_subpic->p_data != NULL )
        {                    /* Copy subpicture informations, set some default values */
            p_free_subpic->i_type                      = i_type;
            p_free_subpic->i_status                    = RESERVED_SUBPICTURE;
            p_free_subpic->i_size                      = i_size;            
            p_free_subpic->i_x                         = 0;
            p_free_subpic->i_y                         = 0;             
            p_free_subpic->i_width                     = 0;
            p_free_subpic->i_height                    = 0;
            p_free_subpic->i_horizontal_align          = CENTER_RALIGN;             
            p_free_subpic->i_vertical_align            = CENTER_RALIGN;             
        }
        else
        {
            /* Memory allocation failed : set subpicture as empty */
            p_free_subpic->i_type   =  EMPTY_SUBPICTURE;            
            p_free_subpic->i_status =  FREE_SUBPICTURE;            
            p_free_subpic =            NULL;            
            intf_ErrMsg("warning: %s\n", strerror( ENOMEM ) );            
        }
        
#ifdef DEBUG_VIDEO
        intf_DbgMsg("subpicture %p (in free subpicture slot)\n", p_free_subpic );        
#endif
        vlc_mutex_unlock( &p_vout->subpicture_lock );
        return( p_free_subpic );
    }
    
    /* No free or destroyed subpicture could be found */
    intf_DbgMsg( "warning: heap is full\n" );
    vlc_mutex_unlock( &p_vout->subpicture_lock );
    return( NULL );
Vincent Seguin's avatar
Vincent Seguin committed
388 389
}

390
/******************************************************************************
391
 * vout_DestroySubPicture: remove a subpicture from the heap
392
 ******************************************************************************
393
 * This function frees a previously reserved subpicture.
Vincent Seguin's avatar
Vincent Seguin committed
394
 * It is meant to be used when the construction of a picture aborted.
395 396
 * This function does not need locking since reserved subpictures are ignored 
 * by the output thread.
397
 ******************************************************************************/
398
void vout_DestroySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
Vincent Seguin's avatar
Vincent Seguin committed
399 400
{
#ifdef DEBUG
401 402
   /* Check if status is valid */
   if( p_subpic->i_status != RESERVED_SUBPICTURE )
Vincent Seguin's avatar
Vincent Seguin committed
403
   {
404 405
       intf_DbgMsg("error: subpicture %p has invalid status %d\n", 
                   p_subpic, p_subpic->i_status );       
Vincent Seguin's avatar
Vincent Seguin committed
406 407 408
   }   
#endif

409
    p_subpic->i_status = DESTROYED_SUBPICTURE;
Vincent Seguin's avatar
Vincent Seguin committed
410 411

#ifdef DEBUG_VIDEO
412
    intf_DbgMsg("subpicture %p\n", p_subpic);    
Vincent Seguin's avatar
Vincent Seguin committed
413 414 415
#endif
}

Vincent Seguin's avatar
Vincent Seguin committed
416
/*******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
417
 * vout_DisplayPicture: display a picture
Vincent Seguin's avatar
Vincent Seguin committed
418
 *******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
419
 * Remove the reservation flag of a picture, which will cause it to be ready for
420 421
 * display. The picture won't be displayed until vout_DatePicture has been 
 * called.
Vincent Seguin's avatar
Vincent Seguin committed
422
 *******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
423
void  vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
Michel Kaempf's avatar
Michel Kaempf committed
424
{
425 426
    vlc_mutex_lock( &p_vout->picture_lock );
    switch( p_pic->i_status )
427
    {
428 429 430 431 432 433 434 435 436 437
    case RESERVED_PICTURE:        
        p_pic->i_status = RESERVED_DISP_PICTURE;
        break;        
    case RESERVED_DATED_PICTURE:
        p_pic->i_status = READY_PICTURE;
        break;        
#ifdef DEBUG
    default:        
        intf_DbgMsg("error: picture %p has invalid status %d\n", p_pic, p_pic->i_status );    
        break;        
438
#endif
439
    }
Michel Kaempf's avatar
Michel Kaempf committed
440

441
#ifdef DEBUG_VIDEO
Vincent Seguin's avatar
Vincent Seguin committed
442
    intf_DbgMsg("picture %p\n", p_pic);
443
#endif
444
    vlc_mutex_unlock( &p_vout->picture_lock );
Michel Kaempf's avatar
Michel Kaempf committed
445 446
}

Vincent Seguin's avatar
Vincent Seguin committed
447
/*******************************************************************************
448
 * vout_DatePicture: date a picture
Vincent Seguin's avatar
Vincent Seguin committed
449
 *******************************************************************************
450
 * Remove the reservation flag of a picture, which will cause it to be ready for
451 452
 * display. The picture won't be displayed until vout_DisplayPicture has been 
 * called.
Vincent Seguin's avatar
Vincent Seguin committed
453
 *******************************************************************************/
454 455
void  vout_DatePicture( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date )
{
Vincent Seguin's avatar
Vincent Seguin committed
456 457 458 459
#ifdef DEBUG_VIDEO
    char        psz_date[MSTRTIME_MAX_SIZE];                           /* date */
#endif

460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477
    vlc_mutex_lock( &p_vout->picture_lock );
    p_pic->date = date;    
    switch( p_pic->i_status )
    {
    case RESERVED_PICTURE:        
        p_pic->i_status = RESERVED_DATED_PICTURE;
        break;        
    case RESERVED_DISP_PICTURE:
        p_pic->i_status = READY_PICTURE;
        break;        
#ifdef DEBUG
    default:        
        intf_DbgMsg("error: picture %p has invalid status %d\n", p_pic, p_pic->i_status );    
        break;        
#endif
    }

#ifdef DEBUG_VIDEO
Vincent Seguin's avatar
Vincent Seguin committed
478
    intf_DbgMsg("picture %p, display date: %s\n", p_pic, mstrtime( psz_date, p_pic->date) );
479
#endif
480
    vlc_mutex_unlock( &p_vout->picture_lock );
481 482
}

483
/******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
484
 * vout_CreatePicture: allocate a picture in the video output heap.
485
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
486
 * This function create a reserved image in the video output heap. 
Vincent Seguin's avatar
Vincent Seguin committed
487
 * A null pointer is returned if the function fails. This method provides an
488
 * already allocated zone of memory in the picture data fields. It needs locking
489
 * since several pictures can be created by several producers threads. 
490
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
491
picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type, 
492
			       int i_width, int i_height )
Michel Kaempf's avatar
Michel Kaempf committed
493
{
494 495 496 497
    int         i_picture;                                   /* picture index */
    int         i_chroma_width = 0;                           /* chroma width */    
    picture_t * p_free_picture = NULL;                  /* first free picture */    
    picture_t * p_destroyed_picture = NULL;        /* first destroyed picture */    
Michel Kaempf's avatar
Michel Kaempf committed
498

Vincent Seguin's avatar
Vincent Seguin committed
499
    /* Get lock */
Vincent Seguin's avatar
Vincent Seguin committed
500
    vlc_mutex_lock( &p_vout->picture_lock );
Michel Kaempf's avatar
Michel Kaempf committed
501

Vincent Seguin's avatar
Vincent Seguin committed
502 503 504
    /* 
     * Look for an empty place 
     */
505
    for( i_picture = 0; i_picture < VOUT_MAX_PICTURES; i_picture++ )
Vincent Seguin's avatar
Vincent Seguin committed
506 507 508
    {
	if( p_vout->p_picture[i_picture].i_status == DESTROYED_PICTURE )
	{
509 510 511
	    /* Picture is marked for destruction, but is still allocated - note
             * that if width and type are the same for two pictures, chroma_width 
             * should also be the same */
Vincent Seguin's avatar
Vincent Seguin committed
512 513
	    if( (p_vout->p_picture[i_picture].i_type           == i_type)   &&
		(p_vout->p_picture[i_picture].i_height         == i_height) &&
514
		(p_vout->p_picture[i_picture].i_width          == i_width) )
Vincent Seguin's avatar
Vincent Seguin committed
515 516 517 518 519
	    {
		/* Memory size do match : memory will not be reallocated, and function
                 * can end immediately - this is the best possible case, since no
                 * memory allocation needs to be done */
		p_vout->p_picture[i_picture].i_status = RESERVED_PICTURE;
520 521 522 523
#ifdef DEBUG_VIDEO
                intf_DbgMsg("picture %p (in destroyed picture slot)\n", 
                            &p_vout->p_picture[i_picture] );                
#endif
Vincent Seguin's avatar
Vincent Seguin committed
524
		vlc_mutex_unlock( &p_vout->picture_lock );
Vincent Seguin's avatar
Vincent Seguin committed
525 526 527 528 529 530 531 532 533 534 535 536 537 538 539
		return( &p_vout->p_picture[i_picture] );
	    }
	    else if( p_destroyed_picture == NULL )
	    {
		/* Memory size do not match, but picture index will be kept in
		 * case no other place are left */
		p_destroyed_picture = &p_vout->p_picture[i_picture];                
	    }	    
	}
        else if( (p_free_picture == NULL) && 
                 (p_vout->p_picture[i_picture].i_status == FREE_PICTURE ))
        {
	    /* Picture is empty and ready for allocation */
            p_free_picture = &p_vout->p_picture[i_picture];            
        }
Michel Kaempf's avatar
Michel Kaempf committed
540 541
    }

Vincent Seguin's avatar
Vincent Seguin committed
542 543 544 545 546 547 548
    /* If no free picture is available, use a destroyed picture */
    if( (p_free_picture == NULL) && (p_destroyed_picture != NULL ) )
    { 
	/* No free picture or matching destroyed picture has been found, but
	 * a destroyed picture is still avalaible */
        free( p_destroyed_picture->p_data );        
        p_free_picture = p_destroyed_picture;        
Michel Kaempf's avatar
Michel Kaempf committed
549 550
    }

Vincent Seguin's avatar
Vincent Seguin committed
551 552 553 554 555 556 557
    /*
     * Prepare picture
     */
    if( p_free_picture != NULL )
    {
        /* Allocate memory */
        switch( i_type )
Michel Kaempf's avatar
Michel Kaempf committed
558
        {
559
        case YUV_420_PICTURE:          /* YUV 420: 1,1/4,1/4 samples per pixel */
Vincent Seguin's avatar
Vincent Seguin committed
560 561
            i_chroma_width = i_width / 2;            
            p_free_picture->p_data = malloc( i_height * i_chroma_width * 3 * sizeof( yuv_data_t ) );
562
            p_free_picture->p_y = (yuv_data_t *)p_free_picture->p_data;
Vincent Seguin's avatar
Vincent Seguin committed
563 564
            p_free_picture->p_u = (yuv_data_t *)p_free_picture->p_data +i_height*i_chroma_width*4/2;
            p_free_picture->p_v = (yuv_data_t *)p_free_picture->p_data +i_height*i_chroma_width*5/2;
565 566
            break;
        case YUV_422_PICTURE:          /* YUV 422: 1,1/2,1/2 samples per pixel */
567 568 569
            i_chroma_width = i_width / 2;            
            p_free_picture->p_data = malloc( i_height * i_chroma_width * 4 * sizeof( yuv_data_t ) );
            p_free_picture->p_y = (yuv_data_t *)p_free_picture->p_data;
Vincent Seguin's avatar
Vincent Seguin committed
570 571
            p_free_picture->p_u = (yuv_data_t *)p_free_picture->p_data +i_height*i_chroma_width*2;
            p_free_picture->p_v = (yuv_data_t *)p_free_picture->p_data +i_height*i_chroma_width*3;
572 573
            break;
        case YUV_444_PICTURE:              /* YUV 444: 1,1,1 samples per pixel */
574 575 576
            i_chroma_width = i_width;            
            p_free_picture->p_data = malloc( i_height * i_chroma_width * 3 * sizeof( yuv_data_t ) );
            p_free_picture->p_y = (yuv_data_t *)p_free_picture->p_data;
Vincent Seguin's avatar
Vincent Seguin committed
577 578
            p_free_picture->p_u = (yuv_data_t *)p_free_picture->p_data +i_height*i_chroma_width;
            p_free_picture->p_v = (yuv_data_t *)p_free_picture->p_data +i_height*i_chroma_width*2;
Vincent Seguin's avatar
Vincent Seguin committed
579 580 581
            break;                
#ifdef DEBUG
        default:
582
            intf_DbgMsg("error: unknown picture type %d\n", i_type );
583 584
            p_free_picture->p_data   =  NULL;            
            break;            
Vincent Seguin's avatar
Vincent Seguin committed
585
#endif    
Michel Kaempf's avatar
Michel Kaempf committed
586 587
        }

Vincent Seguin's avatar
Vincent Seguin committed
588 589
        if( p_free_picture->p_data != NULL )
        {        
590
            /* Copy picture informations, set some default values */
591 592
            p_free_picture->i_type                      = i_type;
            p_free_picture->i_status                    = RESERVED_PICTURE;
593
            p_free_picture->i_matrix_coefficients       = 1; 
594 595
            p_free_picture->i_width                     = i_width;
            p_free_picture->i_height                    = i_height;
596 597 598 599 600 601
            p_free_picture->i_chroma_width              = i_chroma_width;            
            p_free_picture->i_display_horizontal_offset = 0;
            p_free_picture->i_display_vertical_offset   = 0;            
            p_free_picture->i_display_width             = i_width;
            p_free_picture->i_display_height            = i_height;
            p_free_picture->i_aspect_ratio              = AR_SQUARE_PICTURE;            
602
            p_free_picture->i_refcount                  = 0;            
Vincent Seguin's avatar
Vincent Seguin committed
603 604 605 606
        }
        else
        {
            /* Memory allocation failed : set picture as empty */
607 608 609 610
            p_free_picture->i_type   =  EMPTY_PICTURE;            
            p_free_picture->i_status =  FREE_PICTURE;            
            p_free_picture =            NULL;            
            intf_ErrMsg("warning: %s\n", strerror( ENOMEM ) );            
Vincent Seguin's avatar
Vincent Seguin committed
611 612
        }
        
613 614 615
#ifdef DEBUG_VIDEO
        intf_DbgMsg("picture %p (in free picture slot)\n", p_free_picture );        
#endif
Vincent Seguin's avatar
Vincent Seguin committed
616
        vlc_mutex_unlock( &p_vout->picture_lock );
Vincent Seguin's avatar
Vincent Seguin committed
617
        return( p_free_picture );
Michel Kaempf's avatar
Michel Kaempf committed
618
    }
Vincent Seguin's avatar
Vincent Seguin committed
619
    
620
    /* No free or destroyed picture could be found */
621
    intf_DbgMsg( "warning: heap is full\n" );
Vincent Seguin's avatar
Vincent Seguin committed
622
    vlc_mutex_unlock( &p_vout->picture_lock );
Vincent Seguin's avatar
Vincent Seguin committed
623
    return( NULL );
Michel Kaempf's avatar
Michel Kaempf committed
624 625
}

626
/******************************************************************************
627
 * vout_DestroyPicture: remove a permanent or reserved picture from the heap
628
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
629
 * This function frees a previously reserved picture or a permanent
Vincent Seguin's avatar
Vincent Seguin committed
630 631
 * picture. It is meant to be used when the construction of a picture aborted.
 * Note that the picture will be destroyed even if it is linked !
632 633
 * This function does not need locking since reserved pictures are ignored by
 * the output thread.
634
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
635
void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
Michel Kaempf's avatar
Michel Kaempf committed
636
{
637
#ifdef DEBUG
638
   /* Check if picture status is valid */
639 640 641
   if( (p_pic->i_status != RESERVED_PICTURE) && 
       (p_pic->i_status != RESERVED_DATED_PICTURE) &&
       (p_pic->i_status != RESERVED_DISP_PICTURE) )
642
   {
Vincent Seguin's avatar
Vincent Seguin committed
643
       intf_DbgMsg("error: picture %p has invalid status %d\n", p_pic, p_pic->i_status );       
644 645 646
   }   
#endif

Vincent Seguin's avatar
Vincent Seguin committed
647
    p_pic->i_status = DESTROYED_PICTURE;
648 649 650 651

#ifdef DEBUG_VIDEO
    intf_DbgMsg("picture %p\n", p_pic);    
#endif
Michel Kaempf's avatar
Michel Kaempf committed
652 653
}

654
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
655
 * vout_LinkPicture: increment reference counter of a picture
656
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
657
 * This function increment the reference counter of a picture in the video
658
 * heap. It needs a lock since several producer threads can access the picture.
659
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
660 661
void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
Vincent Seguin's avatar
Vincent Seguin committed
662
    vlc_mutex_lock( &p_vout->picture_lock );
Michel Kaempf's avatar
Michel Kaempf committed
663
    p_pic->i_refcount++;
664 665

#ifdef DEBUG_VIDEO
666
    intf_DbgMsg("picture %p refcount=%d\n", p_pic, p_pic->i_refcount );    
667
#endif
668 669

    vlc_mutex_unlock( &p_vout->picture_lock );
Michel Kaempf's avatar
Michel Kaempf committed
670 671
}

672
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
673
 * vout_UnlinkPicture: decrement reference counter of a picture
674
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
675
 * This function decrement the reference counter of a picture in the video heap.
676
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
677 678
void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
Vincent Seguin's avatar
Vincent Seguin committed
679
    vlc_mutex_lock( &p_vout->picture_lock );
Michel Kaempf's avatar
Michel Kaempf committed
680
    p_pic->i_refcount--;
681 682 683 684 685 686 687 688 689

#ifdef DEBUG_VIDEO
    if( p_pic->i_refcount < 0 )
    {
        intf_DbgMsg("error: refcount < 0\n");
        p_pic->i_refcount = 0;        
    }    
#endif

Vincent Seguin's avatar
Vincent Seguin committed
690
    if( (p_pic->i_refcount == 0) && (p_pic->i_status == DISPLAYED_PICTURE) )
Michel Kaempf's avatar
Michel Kaempf committed
691
    {
Vincent Seguin's avatar
Vincent Seguin committed
692
	p_pic->i_status = DESTROYED_PICTURE;
Michel Kaempf's avatar
Michel Kaempf committed
693
    }
694 695

#ifdef DEBUG_VIDEO
696
    intf_DbgMsg("picture %p refcount=%d\n", p_pic, p_pic->i_refcount );    
697
#endif
698 699

    vlc_mutex_unlock( &p_vout->picture_lock );
Michel Kaempf's avatar
Michel Kaempf committed
700 701
}

702
/******************************************************************************
703
 * vout_SetBuffers: set buffers adresses
704
 ******************************************************************************
705 706
 * This function is called by system drivers to set buffers video memory 
 * adresses.
707
 ******************************************************************************/
708
void vout_SetBuffers( vout_thread_t *p_vout, void *p_buf1, void *p_buf2 )
709 710
{
    /* No picture previously */
711 712 713 714 715 716 717 718
    p_vout->p_buffer[0].i_pic_x =         0;
    p_vout->p_buffer[0].i_pic_y =         0;
    p_vout->p_buffer[0].i_pic_width =     0;
    p_vout->p_buffer[0].i_pic_height =    0;
    p_vout->p_buffer[1].i_pic_x =         0;
    p_vout->p_buffer[1].i_pic_y =         0;
    p_vout->p_buffer[1].i_pic_width =     0;
    p_vout->p_buffer[1].i_pic_height =    0;
719 720

    /* The first area covers all the screen */
721 722 723 724 725 726 727 728 729 730
    p_vout->p_buffer[0].i_areas =                 1;
    p_vout->p_buffer[0].pi_area_begin[0] =        0;
    p_vout->p_buffer[0].pi_area_end[0] =          p_vout->i_height - 1;
    p_vout->p_buffer[1].i_areas =                 1;
    p_vout->p_buffer[1].pi_area_begin[0] =        0;
    p_vout->p_buffer[1].pi_area_end[0] =          p_vout->i_height - 1;

    /* Set adresses */
    p_vout->p_buffer[0].p_data = p_buf1;    
    p_vout->p_buffer[1].p_data = p_buf2;    
731 732
}

Vincent Seguin's avatar
Vincent Seguin committed
733 734 735 736 737 738 739 740 741 742 743 744 745
/*****************************************************************************
 * vout_Pixel2RGB: return red, green and blue from pixel value
 *****************************************************************************
 * Return color values, in 0-255 range, of the decomposition of a pixel. This
 * is a slow routine and should only be used for initialization phase.
 *****************************************************************************/
void vout_Pixel2RGB( vout_thread_t *p_vout, u32 i_pixel, int *pi_red, int *pi_green, int *pi_blue )
{
    *pi_red =   i_pixel & p_vout->i_red_mask;
    *pi_green = i_pixel & p_vout->i_green_mask;
    *pi_blue =  i_pixel & p_vout->i_blue_mask;
}

Michel Kaempf's avatar
Michel Kaempf committed
746 747
/* following functions are local */

Vincent Seguin's avatar
Vincent Seguin committed
748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808
/*****************************************************************************
 * BinaryLog: computes the base 2 log of a binary value
 *****************************************************************************
 * This functions is used by MaskToShift, to get a bit index from a binary 
 * value.
 *****************************************************************************/
static int BinaryLog(u32 i)
{
    int i_log;

    i_log = 0;
    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++;
    }    
    if (i != ((u32)1 << i_log))
    {        
	intf_ErrMsg("internal error: binary log overflow\n");        
    }    

    return( i_log );
}

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

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

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

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

809
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
810
 * InitThread: initialize video output thread
811
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
812 813 814
 * 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.
815
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
816 817 818
static int InitThread( vout_thread_t *p_vout )
{
    /* Update status */
819
    intf_DbgMsg("\n");
Michel Kaempf's avatar
Michel Kaempf committed
820 821
    *p_vout->pi_status = THREAD_START;    

822 823
    /* Initialize output method - this function issues its own error messages */
    if( vout_SysInit( p_vout ) )
Michel Kaempf's avatar
Michel Kaempf committed
824 825 826 827
    {
        return( 1 );
    } 

828
    /* Initialize convertion tables and functions */
829
    if( vout_InitYUV( p_vout ) )
830
    {
831
        intf_ErrMsg("error: can't allocate YUV translation tables\n");
832
        return( 1 );                
Vincent Seguin's avatar
Vincent Seguin committed
833 834
    }
    
Michel Kaempf's avatar
Michel Kaempf committed
835
    /* Mark thread as running and return */
836 837
    p_vout->b_active =          1;    
    *p_vout->pi_status =        THREAD_READY;    
838
    intf_DbgMsg("thread ready\n");    
839
    return( 0 );    
Michel Kaempf's avatar
Michel Kaempf committed
840 841
}

842
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
843
 * RunThread: video output thread
844
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
845 846 847
 * 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.
848
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
849 850
static void RunThread( vout_thread_t *p_vout)
{
851
    int             i_index;                                 /* index in heap */
852
    mtime_t         current_date;                             /* current date */
853
    mtime_t         display_date;                             /* display date */    
854 855
    boolean_t       b_display;                                /* display flag */    
    picture_t *     p_pic;                                 /* picture pointer */
856
    subpicture_t *  p_subpic;                           /* subpicture pointer */    
857
     
Michel Kaempf's avatar
Michel Kaempf committed
858
    /* 
859
     * Initialize thread
Michel Kaempf's avatar
Michel Kaempf committed
860 861 862 863
     */
    p_vout->b_error = InitThread( p_vout );
    if( p_vout->b_error )
    {
864
        DestroyThread( p_vout, THREAD_ERROR );
Michel Kaempf's avatar
Michel Kaempf committed
865 866
        return;        
    }    
867
    intf_DbgMsg("\n");
Michel Kaempf's avatar
Michel Kaempf committed
868 869 870 871 872 873

    /*
     * Main loop - it is not executed if an error occured during
     * initialization
     */
    while( (!p_vout->b_die) && (!p_vout->b_error) )
874 875 876
    {
        /* Initialize loop variables */
        p_pic =         NULL;
877
        p_subpic =      NULL;
878 879 880
        display_date =  0;        
        current_date =  mdate();

Vincent Seguin's avatar
Vincent Seguin committed
881
        /* 
882
	 * Find the picture to display - this operation does not need lock,
883
         * since only READY_PICTUREs are handled 
884
         */
885
        for( i_index = 0; i_index < VOUT_MAX_PICTURES; i_index++ )
Vincent Seguin's avatar
Vincent Seguin committed
886
	{
887
	    if( (p_vout->p_picture[i_index].i_status == READY_PICTURE) &&
Vincent Seguin's avatar
Vincent Seguin committed
888
		( (p_pic == NULL) || 
889
		  (p_vout->p_picture[i_index].date < display_date) ) )
Vincent Seguin's avatar
Vincent Seguin committed
890
	    {
891 892
                p_pic = &p_vout->p_picture[i_index];
                display_date = p_pic->date;                
Vincent Seguin's avatar
Vincent Seguin committed
893 894
	    }
	}
Vincent Seguin's avatar
Vincent Seguin committed
895
 
Vincent Seguin's avatar
Vincent Seguin committed
896
        if( p_pic )
Michel Kaempf's avatar
Michel Kaempf committed
897
        {
898 899
#ifdef STATS
            /* Computes FPS rate */
900
            p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date;
901
#endif	    
902
	    if( display_date < current_date )
Vincent Seguin's avatar
Vincent Seguin committed
903
	    {
904 905
		/* Picture is late: it will be destroyed and the thread will sleep and
                 * go to next picture */
Vincent Seguin's avatar
Vincent Seguin committed
906
                vlc_mutex_lock( &p_vout->picture_lock );
907
                p_pic->i_status = p_pic->i_refcount ? DISPLAYED_PICTURE : DESTROYED_PICTURE;
908 909
		intf_DbgMsg( "warning: late picture %p skipped refcount=%d\n", p_pic, p_pic->i_refcount );
                vlc_mutex_unlock( &p_vout->picture_lock );
910
                p_pic =         NULL;                
911
                display_date =  0;                
Vincent Seguin's avatar
Vincent Seguin committed
912
	    }
913
	    else if( display_date > current_date + VOUT_DISPLAY_DELAY )
Vincent Seguin's avatar
Vincent Seguin committed
914 915 916 917
	    {
		/* 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 */
918
                p_pic =         NULL;                
919
                display_date =  0;                
Vincent Seguin's avatar
Vincent Seguin committed
920
	    }
Michel Kaempf's avatar
Michel Kaempf committed
921
        }
922 923

        /*
924
         * Find the subpicture to display - this operation does not need lock, since
925 926
         * only READY_SUBPICTURES are handled. If no picture has been selected,
         * display_date will depend on the subpicture
927 928 929
         */
        //??

Vincent Seguin's avatar
Vincent Seguin committed
930 931
        /*
         * Perform rendering, sleep and display rendered picture
932
         */
933
        if( p_pic )                          /* picture and perhaps subpicture */
934
        {
935
            b_display = p_vout->b_active;            
936 937
            p_vout->last_display_date = display_date;
            
938 939 940 941 942 943 944
            if( b_display )
            {                
                /* Set picture dimensions and clear buffer */
                SetBufferPicture( p_vout, p_pic );

                /* Render picture and informations */
                RenderPicture( p_vout, p_pic );             
Vincent Seguin's avatar
Vincent Seguin committed
945 946
                if( p_vout->b_info )
                {
947 948 949
                    RenderPictureInfo( p_vout, p_pic );
                    RenderInfo( p_vout );                
                }
Vincent Seguin's avatar
Vincent Seguin committed
950
            }
951
            
Vincent Seguin's avatar
Vincent Seguin committed
952 953 954 955
            /* Remove picture from heap */
            vlc_mutex_lock( &p_vout->picture_lock );
            p_pic->i_status = p_pic->i_refcount ? DISPLAYED_PICTURE : DESTROYED_PICTURE;
            vlc_mutex_unlock( &p_vout->picture_lock );                          
956

957
            /* Render interface and subpicture */
958 959 960 961
            if( b_display && p_vout->b_interface )
            {
                RenderInterface( p_vout );                
            }