video_output.c 42.7 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_sys.h"
25
#include "video_yuv.h"
Vincent Seguin's avatar
Vincent Seguin committed
26
#include "intf_msg.h"
27
#include "main.h"
Vincent Seguin's avatar
Vincent Seguin committed
28

29
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
30
 * Local prototypes
31
 ******************************************************************************/
32 33 34 35
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 );
Vincent Seguin's avatar
Vincent Seguin committed
36 37 38 39 40
static void     RenderBlank             ( vout_thread_t *p_vout );
static int      RenderPicture           ( vout_thread_t *p_vout, picture_t *p_pic, boolean_t b_blank );
static int      RenderPictureInfo       ( vout_thread_t *p_vout, picture_t *p_pic, boolean_t b_blank );
static int      RenderIdle              ( vout_thread_t *p_vout, boolean_t b_blank );
static int      RenderInfo              ( vout_thread_t *p_vout, boolean_t b_balnk );
Vincent Seguin's avatar
Vincent Seguin committed
41
static int      Manage                  ( vout_thread_t *p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
42

43
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
44
 * vout_CreateThread: creates a new video output thread
45
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
46 47 48
 * 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.
49
 * If not, it will be updated using one of the THREAD_* constants.
50
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
51 52
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
53
{
54 55
    vout_thread_t * p_vout;                              /* thread descriptor */
    int             i_status;                                /* thread status */
Michel Kaempf's avatar
Michel Kaempf committed
56

57
    /* Allocate descriptor */
58
    intf_DbgMsg("\n");    
Michel Kaempf's avatar
Michel Kaempf committed
59
    p_vout = (vout_thread_t *) malloc( sizeof(vout_thread_t) );
60
    if( p_vout == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
61
    {
62
        intf_ErrMsg("error: %s\n", strerror(ENOMEM));        
Michel Kaempf's avatar
Michel Kaempf committed
63 64
        return( NULL );
    }
65

66 67 68 69 70 71 72
    /* Initialize thread properties */
    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;    

73
    /* Initialize some fields used by the system-dependant method - these fields will
74
     * probably be modified by the method, and are only preferences */
75 76
    p_vout->b_grayscale         = main_GetIntVariable( VOUT_GRAYSCALE_VAR, 
                                                       VOUT_GRAYSCALE_DEFAULT );
77 78
    p_vout->i_width             = i_width;
    p_vout->i_height            = i_height;
79
    p_vout->i_bytes_per_line    = i_width * 2;    
80 81
    p_vout->i_screen_depth      = 15;
    p_vout->i_bytes_per_pixel   = 2;
82
    p_vout->f_gamma             = VOUT_GAMMA;    
Vincent Seguin's avatar
Vincent Seguin committed
83 84 85 86 87 88
#ifdef DEBUG
    p_vout->b_info              = 1;    
#else
    p_vout->b_info              = 0;    
#endif
    intf_DbgMsg("wished configuration: %dx%d,%d (%d bytes/pixel, %d bytes/line)\n",
89
                p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
Vincent Seguin's avatar
Vincent Seguin committed
90
                p_vout->i_bytes_per_pixel, p_vout->i_bytes_per_line );
91 92 93
   
    /* Create and initialize system-dependant method - this function issues its
     * own error messages */
Vincent Seguin's avatar
Vincent Seguin committed
94
    if( vout_SysCreate( p_vout, psz_display, i_root_window ) )
Michel Kaempf's avatar
Michel Kaempf committed
95
    {
Vincent Seguin's avatar
Vincent Seguin committed
96 97
      free( p_vout );
      return( NULL );
Michel Kaempf's avatar
Michel Kaempf committed
98
    }
Vincent Seguin's avatar
Vincent Seguin committed
99
    intf_DbgMsg("actual configuration: %dx%d,%d (%d bytes/pixel, %d bytes/line)\n",
100
                p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
Vincent Seguin's avatar
Vincent Seguin committed
101
                p_vout->i_bytes_per_pixel, p_vout->i_bytes_per_line );
102
 
103
#ifdef STATS
104
    /* Initialize statistics fields */
Vincent Seguin's avatar
Vincent Seguin committed
105
    p_vout->render_time           = 0;    
Vincent Seguin's avatar
Vincent Seguin committed
106
    p_vout->c_fps_samples       = 0;    
107
#endif      
Michel Kaempf's avatar
Michel Kaempf committed
108

Vincent Seguin's avatar
Vincent Seguin committed
109 110 111 112 113
    /* Initialize running properties */
    p_vout->i_changes           = 0;
    p_vout->last_picture_date   = 0;
    p_vout->last_display_date   = 0;

Michel Kaempf's avatar
Michel Kaempf committed
114
    /* Create thread and set locks */
Vincent Seguin's avatar
Vincent Seguin committed
115 116
    vlc_mutex_init( &p_vout->picture_lock );
    vlc_mutex_init( &p_vout->subtitle_lock );    
Vincent Seguin's avatar
Vincent Seguin committed
117 118 119
    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
120
    {
121
        intf_ErrMsg("error: %s\n", strerror(ENOMEM));
Vincent Seguin's avatar
Vincent Seguin committed
122
	vout_SysDestroy( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
123 124 125 126
        free( p_vout );
        return( NULL );
    }   

127
    intf_Msg("Video display initialized (%dx%d, %d bpp)\n", 
128 129
             p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth );    

Michel Kaempf's avatar
Michel Kaempf committed
130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145
    /* 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 );
}

146
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
147
 * vout_DestroyThread: destroys a previously created thread
148
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
149 150 151 152
 * 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.
153
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
154 155
void vout_DestroyThread( vout_thread_t *p_vout, int *pi_status )
{  
156
    int     i_status;                                        /* thread status */
Michel Kaempf's avatar
Michel Kaempf committed
157 158

    /* Set status */
159
    intf_DbgMsg("\n");
Michel Kaempf's avatar
Michel Kaempf committed
160
    p_vout->pi_status = (pi_status != NULL) ? pi_status : &i_status;
Vincent Seguin's avatar
Vincent Seguin committed
161
    *p_vout->pi_status = THREAD_DESTROY;    
Michel Kaempf's avatar
Michel Kaempf committed
162 163 164 165 166
     
    /* Request thread destruction */
    p_vout->b_die = 1;

    /* If status is NULL, wait until thread has been destroyed */
167
    if( pi_status == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
168 169 170 171 172 173 174 175 176
    {
        do
        {
            msleep( THREAD_SLEEP );
        }while( (i_status != THREAD_OVER) && (i_status != THREAD_ERROR) 
                && (i_status != THREAD_FATAL) );   
    }
}

177
/******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
178
 * vout_DisplaySubtitle: display a subtitle
179
 ******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
180 181 182
 * Remove the reservation flag of a subtitle, which will cause it to be ready for
 * display. The picture does not need to be locked, since it is ignored by
 * the output thread if is reserved.
183
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
184 185 186
void  vout_DisplaySubtitle( vout_thread_t *p_vout, subtitle_t *p_sub )
{
#ifdef DEBUG_VIDEO
187 188
    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
189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209
#endif

#ifdef DEBUG
    /* Check if status is valid */
    if( p_sub->i_status != RESERVED_SUBTITLE )
    {
        intf_DbgMsg("error: subtitle %p has invalid status %d\n", p_sub, p_sub->i_status );       
    }   
#endif

    /* Remove reservation flag */
    p_sub->i_status = READY_SUBTITLE;

#ifdef DEBUG_VIDEO
    /* Send subtitle informations */
    intf_DbgMsg("subtitle %p: type=%d, begin date=%s, end date=%s\n", p_sub, p_sub->i_type, 
                mstrtime( psz_begin_date, p_sub->begin_date ), 
                mstrtime( psz_end_date, p_sub->end_date ) );    
#endif
}

210
/******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
211
 * vout_CreateSubtitle: allocate a subtitle in the video output heap.
212
 ******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
213 214 215 216
 * This function create a reserved subtitle in the video output heap. 
 * A null pointer is returned if the function fails. This method provides an
 * already allocated zone of memory in the subtitle data fields. It needs locking
 * since several pictures can be created by several producers threads. 
217
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
218 219 220 221 222 223
subtitle_t *vout_CreateSubtitle( vout_thread_t *p_vout, int i_type, 
                                 int i_size )
{
    //???
}

224
/******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
225
 * vout_DestroySubtitle: remove a permanent or reserved subtitle from the heap
226
 ******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
227 228 229 230
 * This function frees a previously reserved subtitle.
 * It is meant to be used when the construction of a picture aborted.
 * This function does not need locking since reserved subtitles are ignored by
 * the output thread.
231
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248
void vout_DestroySubtitle( vout_thread_t *p_vout, subtitle_t *p_sub )
{
#ifdef DEBUG
   /* Check if subtitle status is valid */
   if( p_sub->i_status != RESERVED_SUBTITLE )
   {
       intf_DbgMsg("error: subtitle %p has invalid status %d\n", p_sub, p_sub->i_status );       
   }   
#endif

    p_sub->i_status = DESTROYED_SUBTITLE;

#ifdef DEBUG_VIDEO
    intf_DbgMsg("subtitle %p\n", p_sub);    
#endif
}

249
/******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
250
 * vout_DisplayPicture: display a picture
251
 ******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
252
 * Remove the reservation flag of a picture, which will cause it to be ready for
253 254
 * display. The picture won't be displayed until vout_DatePicture has been 
 * called.
255
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
256
void  vout_DisplayPicture( vout_thread_t *p_vout, picture_t *p_pic )
Michel Kaempf's avatar
Michel Kaempf committed
257
{
258 259
    vlc_mutex_lock( &p_vout->picture_lock );
    switch( p_pic->i_status )
260
    {
261 262 263 264 265 266 267 268 269 270
    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;        
271
#endif
272
    }
Michel Kaempf's avatar
Michel Kaempf committed
273

274
#ifdef DEBUG_VIDEO
275
    intf_DbgMsg("picture %p\n", p_pic );
276
#endif
277 278

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

281
/******************************************************************************
282
 * vout_DatePicture: date a picture
283
 ******************************************************************************
284
 * Remove the reservation flag of a picture, which will cause it to be ready for
285 286
 * display. The picture won't be displayed until vout_DisplayPicture has been 
 * called.
287
 ******************************************************************************/
288 289
void  vout_DatePicture( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date )
{
290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309
    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
    intf_DbgMsg("picture %p\n", p_pic);
#endif
310 311

    vlc_mutex_unlock( &p_vout->picture_lock );
312 313
}

314
/******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
315
 * vout_CreatePicture: allocate a picture in the video output heap.
316
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
317
 * This function create a reserved image in the video output heap. 
Vincent Seguin's avatar
Vincent Seguin committed
318
 * A null pointer is returned if the function fails. This method provides an
319
 * already allocated zone of memory in the picture data fields. It needs locking
320
 * since several pictures can be created by several producers threads. 
321
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
322
picture_t *vout_CreatePicture( vout_thread_t *p_vout, int i_type, 
323
			       int i_width, int i_height )
Michel Kaempf's avatar
Michel Kaempf committed
324
{
325 326 327 328
    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
329

Vincent Seguin's avatar
Vincent Seguin committed
330
    /* Get lock */
Vincent Seguin's avatar
Vincent Seguin committed
331
    vlc_mutex_lock( &p_vout->picture_lock );
Michel Kaempf's avatar
Michel Kaempf committed
332

Vincent Seguin's avatar
Vincent Seguin committed
333 334 335 336 337 338 339 340 341
    /* 
     * Look for an empty place 
     */
    for( i_picture = 0; 
         i_picture < VOUT_MAX_PICTURES; 
         i_picture++ )
    {
	if( p_vout->p_picture[i_picture].i_status == DESTROYED_PICTURE )
	{
342 343 344
	    /* 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
345 346
	    if( (p_vout->p_picture[i_picture].i_type           == i_type)   &&
		(p_vout->p_picture[i_picture].i_height         == i_height) &&
347
		(p_vout->p_picture[i_picture].i_width          == i_width) )
Vincent Seguin's avatar
Vincent Seguin committed
348 349 350 351 352
	    {
		/* 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;
353 354 355 356
#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
357
		vlc_mutex_unlock( &p_vout->picture_lock );
Vincent Seguin's avatar
Vincent Seguin committed
358 359 360 361 362 363 364 365 366 367 368 369 370 371 372
		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
373 374
    }

Vincent Seguin's avatar
Vincent Seguin committed
375 376 377 378 379 380 381
    /* 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
382 383
    }

Vincent Seguin's avatar
Vincent Seguin committed
384 385 386 387 388 389 390
    /*
     * Prepare picture
     */
    if( p_free_picture != NULL )
    {
        /* Allocate memory */
        switch( i_type )
Michel Kaempf's avatar
Michel Kaempf committed
391
        {
392
        case YUV_420_PICTURE:          /* YUV 420: 1,1/4,1/4 samples per pixel */
Vincent Seguin's avatar
Vincent Seguin committed
393 394
            i_chroma_width = i_width / 2;            
            p_free_picture->p_data = malloc( i_height * i_chroma_width * 3 * sizeof( yuv_data_t ) );
395
            p_free_picture->p_y = (yuv_data_t *)p_free_picture->p_data;
Vincent Seguin's avatar
Vincent Seguin committed
396 397
            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;
398 399
            break;
        case YUV_422_PICTURE:          /* YUV 422: 1,1/2,1/2 samples per pixel */
400 401 402
            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
403 404
            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;
405 406
            break;
        case YUV_444_PICTURE:              /* YUV 444: 1,1,1 samples per pixel */
407 408 409
            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
410 411
            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
412 413 414
            break;                
#ifdef DEBUG
        default:
415
            intf_DbgMsg("error: unknown picture type %d\n", i_type );
416 417
            p_free_picture->p_data   =  NULL;            
            break;            
Vincent Seguin's avatar
Vincent Seguin committed
418
#endif    
Michel Kaempf's avatar
Michel Kaempf committed
419 420
        }

Vincent Seguin's avatar
Vincent Seguin committed
421 422
        if( p_free_picture->p_data != NULL )
        {        
423
            /* Copy picture informations, set some default values */
424 425
            p_free_picture->i_type                      = i_type;
            p_free_picture->i_status                    = RESERVED_PICTURE;
426
            p_free_picture->i_matrix_coefficients       = 1; 
427 428
            p_free_picture->i_width                     = i_width;
            p_free_picture->i_height                    = i_height;
429 430 431 432 433 434
            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;            
435
            p_free_picture->i_refcount                  = 0;            
Vincent Seguin's avatar
Vincent Seguin committed
436 437 438 439
        }
        else
        {
            /* Memory allocation failed : set picture as empty */
440 441 442 443
            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
444 445
        }
        
446 447 448
#ifdef DEBUG_VIDEO
        intf_DbgMsg("picture %p (in free picture slot)\n", p_free_picture );        
#endif
Vincent Seguin's avatar
Vincent Seguin committed
449
        vlc_mutex_unlock( &p_vout->picture_lock );
Vincent Seguin's avatar
Vincent Seguin committed
450
        return( p_free_picture );
Michel Kaempf's avatar
Michel Kaempf committed
451
    }
Vincent Seguin's avatar
Vincent Seguin committed
452 453
    
    // No free or destroyed picture could be found
454
    intf_DbgMsg( "warning: heap is full\n" );
Vincent Seguin's avatar
Vincent Seguin committed
455
    vlc_mutex_unlock( &p_vout->picture_lock );
Vincent Seguin's avatar
Vincent Seguin committed
456
    return( NULL );
Michel Kaempf's avatar
Michel Kaempf committed
457 458
}

459
/******************************************************************************
460
 * vout_DestroyPicture: remove a permanent or reserved picture from the heap
461
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
462
 * This function frees a previously reserved picture or a permanent
Vincent Seguin's avatar
Vincent Seguin committed
463 464
 * 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 !
465 466
 * This function does not need locking since reserved pictures are ignored by
 * the output thread.
467
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
468
void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
Michel Kaempf's avatar
Michel Kaempf committed
469
{
470
#ifdef DEBUG
471
   /* Check if picture status is valid */
472 473 474
   if( (p_pic->i_status != RESERVED_PICTURE) && 
       (p_pic->i_status != RESERVED_DATED_PICTURE) &&
       (p_pic->i_status != RESERVED_DISP_PICTURE) )
475
   {
Vincent Seguin's avatar
Vincent Seguin committed
476
       intf_DbgMsg("error: picture %p has invalid status %d\n", p_pic, p_pic->i_status );       
477 478 479
   }   
#endif

Vincent Seguin's avatar
Vincent Seguin committed
480
    p_pic->i_status = DESTROYED_PICTURE;
481 482 483 484

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

487
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
488
 * vout_LinkPicture: increment reference counter of a picture
489
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
490
 * This function increment the reference counter of a picture in the video
491
 * heap. It needs a lock since several producer threads can access the picture.
492
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
493 494
void vout_LinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
Vincent Seguin's avatar
Vincent Seguin committed
495
    vlc_mutex_lock( &p_vout->picture_lock );
Michel Kaempf's avatar
Michel Kaempf committed
496
    p_pic->i_refcount++;
497 498

#ifdef DEBUG_VIDEO
499
    intf_DbgMsg("picture %p refcount=%d\n", p_pic, p_pic->i_refcount );    
500
#endif
501 502

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

505
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
506
 * vout_UnlinkPicture: decrement reference counter of a picture
507
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
508
 * This function decrement the reference counter of a picture in the video heap.
509
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
510 511
void vout_UnlinkPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
Vincent Seguin's avatar
Vincent Seguin committed
512
    vlc_mutex_lock( &p_vout->picture_lock );
Michel Kaempf's avatar
Michel Kaempf committed
513
    p_pic->i_refcount--;
514 515 516 517 518 519 520 521 522

#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
523
    if( (p_pic->i_refcount == 0) && (p_pic->i_status == DISPLAYED_PICTURE) )
Michel Kaempf's avatar
Michel Kaempf committed
524
    {
Vincent Seguin's avatar
Vincent Seguin committed
525
	p_pic->i_status = DESTROYED_PICTURE;
Michel Kaempf's avatar
Michel Kaempf committed
526
    }
527 528

#ifdef DEBUG_VIDEO
529
    intf_DbgMsg("picture %p refcount=%d\n", p_pic, p_pic->i_refcount );    
530
#endif
531 532

    vlc_mutex_unlock( &p_vout->picture_lock );
Michel Kaempf's avatar
Michel Kaempf committed
533 534 535 536
}

/* following functions are local */

537
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
538
 * InitThread: initialize video output thread
539
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
540 541 542
 * 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.
543
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
544 545
static int InitThread( vout_thread_t *p_vout )
{
546
    int     i_index;                                         /* generic index */    
Michel Kaempf's avatar
Michel Kaempf committed
547 548

    /* Update status */
549
    intf_DbgMsg("\n");
Michel Kaempf's avatar
Michel Kaempf committed
550 551
    *p_vout->pi_status = THREAD_START;    

552 553
    /* Initialize output method - this function issues its own error messages */
    if( vout_SysInit( p_vout ) )
Michel Kaempf's avatar
Michel Kaempf committed
554 555 556 557 558
    {
        *p_vout->pi_status = THREAD_ERROR;        
        return( 1 );
    } 

Vincent Seguin's avatar
Vincent Seguin committed
559
    /* Initialize pictures and subtitles */    
560
    for( i_index = 0; i_index < VOUT_MAX_PICTURES; i_index++)
Vincent Seguin's avatar
Vincent Seguin committed
561
    {
Vincent Seguin's avatar
Vincent Seguin committed
562 563 564 565
        p_vout->p_picture[i_index].i_type   = EMPTY_PICTURE;
        p_vout->p_picture[i_index].i_status = FREE_PICTURE;
        p_vout->p_subtitle[i_index].i_type  = EMPTY_SUBTITLE;
        p_vout->p_subtitle[i_index].i_status= FREE_SUBTITLE;
566 567 568 569 570 571
    }

    /* Initialize convertion tables and functions */
    if( vout_InitTables( p_vout ) )
    {
        intf_ErrMsg("error: can't allocate translation tables\n");
572
        return( 1 );                
Vincent Seguin's avatar
Vincent Seguin committed
573 574
    }
    
Michel Kaempf's avatar
Michel Kaempf committed
575
    /* Mark thread as running and return */
576 577
    p_vout->b_active =          1;    
    *p_vout->pi_status =        THREAD_READY;    
578
    intf_DbgMsg("thread ready\n");    
579
    return( 0 );    
Michel Kaempf's avatar
Michel Kaempf committed
580 581
}

582
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
583
 * RunThread: video output thread
584
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
585 586 587
 * 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.
588
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
589 590
static void RunThread( vout_thread_t *p_vout)
{
591 592 593 594 595
    int             i_picture;                               /* picture index */
    mtime_t         current_date;                             /* current date */
    mtime_t         pic_date = 0;                             /* picture date */    
    boolean_t       b_display;                                /* display flag */    
    picture_t *     p_pic;                                 /* picture pointer */
596
     
Michel Kaempf's avatar
Michel Kaempf committed
597 598 599 600 601 602
    /* 
     * Initialize thread and free configuration 
     */
    p_vout->b_error = InitThread( p_vout );
    if( p_vout->b_error )
    {
603
        free( p_vout );                                 /* destroy descriptor */
Michel Kaempf's avatar
Michel Kaempf committed
604 605
        return;        
    }    
606
    intf_DbgMsg("\n");
Michel Kaempf's avatar
Michel Kaempf committed
607 608 609 610 611 612

    /*
     * Main loop - it is not executed if an error occured during
     * initialization
     */
    while( (!p_vout->b_die) && (!p_vout->b_error) )
613
    {            
Vincent Seguin's avatar
Vincent Seguin committed
614
        /* 
615 616 617
	 * Find the picture to display - this operation does not need lock,
         * since only READY_PICTURES are handled 
         */
618
        p_pic = NULL;         
Vincent Seguin's avatar
Vincent Seguin committed
619
        current_date = mdate();
620
        for( i_picture = 0; i_picture < VOUT_MAX_PICTURES; i_picture++ )
Vincent Seguin's avatar
Vincent Seguin committed
621 622 623
	{
	    if( (p_vout->p_picture[i_picture].i_status == READY_PICTURE) &&
		( (p_pic == NULL) || 
624
		  (p_vout->p_picture[i_picture].date < pic_date) ) )
Vincent Seguin's avatar
Vincent Seguin committed
625
	    {
626
                p_pic = &p_vout->p_picture[i_picture];
627
                pic_date = p_pic->date;                
Vincent Seguin's avatar
Vincent Seguin committed
628 629
	    }
	}
Vincent Seguin's avatar
Vincent Seguin committed
630
 
Vincent Seguin's avatar
Vincent Seguin committed
631 632 633 634
        /* 
	 * Render picture if any
	 */
        if( p_pic )
Michel Kaempf's avatar
Michel Kaempf committed
635
        {
636 637
#ifdef STATS
            /* Computes FPS rate */
638 639
            p_vout->fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ] = pic_date;
#endif	    
640
	    if( pic_date < current_date )
Vincent Seguin's avatar
Vincent Seguin committed
641
	    {
642 643
		/* Picture is late: it will be destroyed and the thread will sleep and
                 * go to next picture */
Vincent Seguin's avatar
Vincent Seguin committed
644
                vlc_mutex_lock( &p_vout->picture_lock );
645
                p_pic->i_status = p_pic->i_refcount ? DISPLAYED_PICTURE : DESTROYED_PICTURE;
646
#ifdef DEBUG_VIDEO
647
		intf_DbgMsg( "warning: late picture %p skipped refcount=%d\n", p_pic, p_pic->i_refcount );
648
#endif
649
                vlc_mutex_unlock( &p_vout->picture_lock );
650
                p_pic =         NULL;                
Vincent Seguin's avatar
Vincent Seguin committed
651
	    }
652
	    else if( pic_date > current_date + VOUT_DISPLAY_DELAY )
Vincent Seguin's avatar
Vincent Seguin committed
653 654 655 656
	    {
		/* 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 */
657
                p_pic =         NULL;                
Vincent Seguin's avatar
Vincent Seguin committed
658
	    }
Michel Kaempf's avatar
Michel Kaempf committed
659
        }
Vincent Seguin's avatar
Vincent Seguin committed
660 661 662
              
        /*
         * Perform rendering, sleep and display rendered picture
663
         */
Vincent Seguin's avatar
Vincent Seguin committed
664
        if( p_pic )
665
        {
Vincent Seguin's avatar
Vincent Seguin committed
666 667 668
            /* A picture is ready to be displayed : render it */
            if( p_vout->b_active )
            {                    
Vincent Seguin's avatar
Vincent Seguin committed
669
                b_display = RenderPicture( p_vout, p_pic, 1 );
Vincent Seguin's avatar
Vincent Seguin committed
670 671
                if( p_vout->b_info )
                {
Vincent Seguin's avatar
Vincent Seguin committed
672 673
                    b_display |= RenderPictureInfo( p_vout, p_pic, b_display );
                    b_display |= RenderInfo( p_vout, b_display );                    
Vincent Seguin's avatar
Vincent Seguin committed
674 675 676 677 678 679 680 681 682 683 684 685 686 687 688
                }                    
            }
            else
            {
                b_display = 0;                
            } 

            /* 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 );                          
        }            
        else
        {
            /* No picture. However, an idle screen may be ready to display */
Vincent Seguin's avatar
Vincent Seguin committed
689 690 691 692 693 694 695 696 697 698 699 700
            if( p_vout->b_active )
            {                
                b_display = RenderIdle( p_vout, 1 );
                if( p_vout->b_info )
                {                    
                    b_display |= RenderInfo( p_vout, b_display );
                }        
            }
            else
            {
                b_display = 0;                
            }            
Vincent Seguin's avatar
Vincent Seguin committed
701 702
        }

Vincent Seguin's avatar
Vincent Seguin committed
703 704 705
        /* Give back change lock */
        vlc_mutex_unlock( &p_vout->change_lock );        

Vincent Seguin's avatar
Vincent Seguin committed
706 707 708 709 710 711 712 713 714 715
        /* Sleep a while or until a given date */
        if( p_pic )
        {
            mwait( pic_date );
        }
        else
        {
            msleep( VOUT_IDLE_SLEEP );                
        }            

Vincent Seguin's avatar
Vincent Seguin committed
716 717 718 719
        /* On awakening, take back lock and send immediately picture to display */
        vlc_mutex_lock( &p_vout->change_lock );        
        if( b_display && p_vout->b_active && 
            !(p_vout->i_changes & VOUT_NODISPLAY_CHANGE) )
Vincent Seguin's avatar
Vincent Seguin committed
720 721 722
        {
            vout_SysDisplay( p_vout );
        }
723

Vincent Seguin's avatar
Vincent Seguin committed
724
        /*
Vincent Seguin's avatar
Vincent Seguin committed
725
         * Check events and manage thread
Vincent Seguin's avatar
Vincent Seguin committed
726
	 */
Vincent Seguin's avatar
Vincent Seguin committed
727
        if( vout_SysManage( p_vout ) | Manage( p_vout ) )
Vincent Seguin's avatar
Vincent Seguin committed
728 729 730 731 732
	{
	    /* A fatal error occured, and the thread must terminate immediately,
	     * without displaying anything - setting b_error to 1 cause the
	     * immediate end of the main while() loop. */
	    p_vout->b_error = 1;
Vincent Seguin's avatar
Vincent Seguin committed
733
	}  
Michel Kaempf's avatar
Michel Kaempf committed
734 735 736 737 738 739 740 741 742 743 744 745
    } 

    /*
     * Error loop
     */
    if( p_vout->b_error )
    {
        ErrorThread( p_vout );        
    }

    /* End of thread */
    EndThread( p_vout );
746
    intf_DbgMsg( "thread end\n" );
Michel Kaempf's avatar
Michel Kaempf committed
747 748
}

749
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
750
 * ErrorThread: RunThread() error loop
751
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
752 753 754
 * 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.
755
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
756 757 758
static void ErrorThread( vout_thread_t *p_vout )
{
    /* Wait until a `die' order */
759
    intf_DbgMsg("\n");
Michel Kaempf's avatar
Michel Kaempf committed
760 761 762 763 764 765 766
    while( !p_vout->b_die )
    {
        /* Sleep a while */
        msleep( VOUT_IDLE_SLEEP );                
    }
}

767
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
768
 * EndThread: thread destruction
769
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
770 771
 * This function is called when the thread ends after a sucessfull 
 * initialization.
772
 ******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
773 774
static void EndThread( vout_thread_t *p_vout )
{
775
    int *   pi_status;                                       /* thread status */
Vincent Seguin's avatar
Vincent Seguin committed
776
    int     i_picture;
Michel Kaempf's avatar
Michel Kaempf committed
777 778
        
    /* Store status */
779
    intf_DbgMsg("\n");
Michel Kaempf's avatar
Michel Kaempf committed
780 781 782
    pi_status = p_vout->pi_status;    
    *pi_status = THREAD_END;    

Vincent Seguin's avatar
Vincent Seguin committed
783 784 785 786 787 788 789 790
    /* Destroy all remaining pictures */
    for( i_picture = 0; i_picture < VOUT_MAX_PICTURES; i_picture++ )
    {
	if( p_vout->p_picture[i_picture].i_status != FREE_PICTURE )
	{
            free( p_vout->p_picture[i_picture].p_data );
        }
    }
Vincent Seguin's avatar
Vincent Seguin committed
791

792
    /* Destroy translation tables */
793
    vout_EndTables( p_vout );
Vincent Seguin's avatar
Vincent Seguin committed
794
    
Michel Kaempf's avatar
Michel Kaempf committed
795
    /* Destroy thread structures allocated by InitThread */
Vincent Seguin's avatar
Vincent Seguin committed
796
    vout_SysEnd( p_vout );
797
    vout_SysDestroy( p_vout );
Michel Kaempf's avatar
Michel Kaempf committed
798 799 800 801 802 803
    free( p_vout );

    /* Update status */
    *pi_status = THREAD_OVER;    
}

804
/******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
805
 * RenderBlank: render a blank screen
806
 ******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
807 808
 * This function is called by all other rendering functions when they arrive on
 * a non blanked screen.
809
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
810 811
static void RenderBlank( vout_thread_t *p_vout )
{
812
    //?? toooooo slow
813 814 815
    int  i_index;                                   /* current 64 bits sample */    
    int  i_width;                                /* number of 64 bits samples */    
    u64 *p_pic;                                 /* pointer to 64 bits samples */
Vincent Seguin's avatar
Vincent Seguin committed
816 817 818
    
    /* Initialize variables */
    p_pic =     vout_SysGetPicture( p_vout );
819
    i_width =   p_vout->i_bytes_per_line * p_vout->i_height / 256;
Vincent Seguin's avatar
Vincent Seguin committed
820

821
    /* Clear beginning of screen by 256 bytes blocks */
Vincent Seguin's avatar
Vincent Seguin committed
822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846
    for( i_index = 0; i_index < i_width; i_index++ )
    {
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
        *p_pic++ = 0;   *p_pic++ = 0;
    }

    /* Clear last pixels */
    //??
}


847
/******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
848
 * RenderPicture: render a picture
849
 ******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
850 851 852
 * This function convert a picture from a video heap to a pixel-encoded image
 * and copy it to the current rendering buffer. No lock is required, since the
 * rendered picture has been determined as existant, and will only be destroyed
Vincent Seguin's avatar
Vincent Seguin committed
853
 * by the vout thread later.
854
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
855
static int RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, boolean_t b_blank )
Michel Kaempf's avatar
Michel Kaempf committed
856
{
857 858 859 860 861 862
    int         i_display_height, i_display_width;      /* display dimensions */
    int         i_height, i_width;               /* source picture dimensions */
    int         i_scaled_height;              /* scaled height of the picture */   
    int         i_aspect_scale;                /* aspect ratio vertical scale */
    int         i_eol;                       /* end of line offset for source */    
    byte_t *    p_convert_dst;                      /* convertion destination */        
Vincent Seguin's avatar
Vincent Seguin committed
863
    
864 865 866 867 868
#ifdef STATS
    /* Start recording render time */
    p_vout->render_time = mdate();
#endif

Vincent Seguin's avatar
Vincent Seguin committed
869
    /* Mark last picture date */
Vincent Seguin's avatar
Vincent Seguin committed
870 871 872 873 874 875 876 877
    p_vout->last_picture_date = p_pic->date;
    i_width =                   p_pic->i_width;    
    i_height =                  p_pic->i_height;
    i_display_width =           p_vout->i_width;    
    i_display_height =          p_vout->i_height;    

    /* Select scaling depending of aspect ratio */
    switch( p_pic->i_aspect_ratio )
Vincent Seguin's avatar
Vincent Seguin committed
878
    {
Vincent Seguin's avatar
Vincent Seguin committed
879 880 881 882 883 884 885 886 887 888 889 890 891 892 893
    case AR_3_4_PICTURE:
        i_aspect_scale = (4 * i_height - 3 * i_width) ? 
            1 + 3 * i_width / ( 4 * i_height - 3 * i_width ) : 0;
        break;
    case AR_16_9_PICTURE:
        i_aspect_scale = ( 16 * i_height - 9 * i_width ) ? 
            1 + 9 * i_width / ( 16 * i_height - 9 * i_width ) : 0;
        break;
    case AR_221_1_PICTURE:        
        i_aspect_scale = ( 221 * i_height - 100 * i_width ) ?
            1 + 100 * i_width / ( 221 * i_height - 100 * i_width ) : 0;
        break;               
    case AR_SQUARE_PICTURE:
    default:
        i_aspect_scale = 0;        
Vincent Seguin's avatar
Vincent Seguin committed
894
    }
Vincent Seguin's avatar
Vincent Seguin committed
895 896 897 898
    i_scaled_height = (i_aspect_scale ? i_height * (i_aspect_scale - 1) / i_aspect_scale : i_height);
    
    /* Crop picture if too large for the screen */
    if( i_width > i_display_width )
899
    {
Vincent Seguin's avatar
Vincent Seguin committed
900 901 902 903 904 905 906 907 908 909 910
        i_eol = i_width - i_display_width / 16 * 16;
        i_width = i_display_width / 16 * 16;        
    }
    else
    {
        i_eol = 0;        
    }
    if( i_scaled_height > i_display_height )
    {
        i_height = (i_aspect_scale * i_display_height / (i_aspect_scale - 1)) / 2 * 2;
        i_scaled_height = i_display_height;        
911
    }    
Vincent Seguin's avatar
Vincent Seguin committed
912 913 914
    p_convert_dst = vout_SysGetPicture( p_vout ) + 
        ( i_display_width - i_width ) / 2 * p_vout->i_bytes_per_pixel +
        ( i_display_height - i_scaled_height ) / 2 * p_vout->i_bytes_per_line;
915

916 917 918
    /*
     * Choose appropriate rendering function and render picture
     */
919 920
    switch( p_pic->i_type )
    {
921
    case YUV_420_PICTURE:
Vincent Seguin's avatar
Vincent Seguin committed
922
        p_vout->p_ConvertYUV420( p_vout, p_convert_dst, 
923
                                 p_pic->p_y, p_pic->p_u, p_pic->p_v,
Vincent Seguin's avatar
Vincent Seguin committed
924 925 926
                                 i_width, i_height, i_eol, 
                                 p_vout->i_bytes_per_line / p_vout->i_bytes_per_pixel - i_width,
                                 i_aspect_scale, p_pic->i_matrix_coefficients );
927
        break;        
928
    case YUV_422_PICTURE:
Vincent Seguin's avatar
Vincent Seguin committed
929 930 931 932 933 934
        p_vout->p_ConvertYUV422( p_vout, p_convert_dst, 
                                 p_pic->p_y, p_pic->p_u, p_pic->p_v,
                                 i_width, i_height, i_eol, 
                                 p_vout->i_bytes_per_line / p_vout->i_bytes_per_pixel - i_width,
                                 i_aspect_scale, p_pic->i_matrix_coefficients );
        break;        
935
    case YUV_444_PICTURE:
Vincent Seguin's avatar
Vincent Seguin committed
936 937 938 939 940 941
        p_vout->p_ConvertYUV444( p_vout, p_convert_dst, 
                                 p_pic->p_y, p_pic->p_u, p_pic->p_v,
                                 i_width, i_height, i_eol, 
                                 p_vout->i_bytes_per_line / p_vout->i_bytes_per_pixel - i_width,
                                 i_aspect_scale, p_pic->i_matrix_coefficients );
        break;                
942 943
#ifdef DEBUG
    default:        
944
        intf_DbgMsg("error: unknown picture type %d\n", p_pic->i_type );
945 946 947
        break;        
#endif
    }
948

949 950 951 952
#ifdef STATS
    /* End recording render time */
    p_vout->render_time = mdate() - p_vout->render_time;
#endif
Vincent Seguin's avatar
Vincent Seguin committed
953
    return( 1 );    
Michel Kaempf's avatar
Michel Kaempf committed
954 955
}

956
/******************************************************************************
957
 * RenderPictureInfo: print additionnal informations on a picture
958
 ******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
959 960
 * This function will print informations such as fps and other picture
 * dependant informations.
961
 ******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
962
static int RenderPictureInfo( vout_thread_t *p_vout, picture_t *p_pic, boolean_t b_blank )
963
{
964
    char        psz_buffer[256];                             /* string buffer */
965 966

#ifdef STATS
967 968 969
    /* 
     * Print FPS rate in upper right corner 
     */
970
    if( p_vout->c_fps_samples > VOUT_FPS_SAMPLES )