#include <stdio.h> /* sprintf() */
#include <string.h> /* strerror() */
+#ifdef STATS
+# include <sys/times.h>
+#endif
+
#include "config.h"
#include "common.h"
#include "threads.h"
#include "mtime.h"
-#include "plugins.h"
+#include "modules.h"
+
#include "video.h"
#include "video_output.h"
#include "video_text.h"
#include "video_yuv.h"
#include "intf_msg.h"
-#include "main.h"
-#include "vdec_idct.h"
-#include "video_decoder.h"
+#include "main.h"
/*****************************************************************************
* Local prototypes
static int RenderIdle ( vout_thread_t *p_vout );
static int RenderSplash ( vout_thread_t *p_vout );
static void RenderInfo ( vout_thread_t *p_vout );
-static void Synchronize ( vout_thread_t *p_vout, s64 i_delay );
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,
* If pi_status is NULL, then the function will block until the thread is ready.
* If not, it will be updated using one of the THREAD_* constants.
*****************************************************************************/
-vout_thread_t * vout_CreateThread ( char *psz_display, int i_root_window,
- int i_width, int i_height, int *pi_status,
- int i_method, void *p_data )
+vout_thread_t * vout_CreateThread ( int *pi_status )
{
vout_thread_t * p_vout; /* thread descriptor */
- typedef void ( vout_getplugin_t ) ( vout_thread_t * p_vout );
int i_status; /* thread status */
int i_index; /* index for array initialization */
- int i_best_index = 0, i_best_score = 0;
/* Allocate descriptor */
- intf_DbgMsg("\n");
p_vout = (vout_thread_t *) malloc( sizeof(vout_thread_t) );
if( p_vout == NULL )
{
- intf_ErrMsg( "error: %s\n", strerror(ENOMEM) );
+ intf_ErrMsg( "vout error: vout thread creation returned %s",
+ strerror(ENOMEM) );
return( NULL );
}
- p_vout->p_set_palette = SetPalette;
+ /* Choose the best module */
+ p_vout->p_module = module_Need( p_main->p_bank,
+ MODULE_CAPABILITY_VOUT, NULL );
- /* Get a suitable video plugin */
- for( i_index = 0 ; i_index < p_main->p_bank->i_plugin_count ; i_index++ )
- {
- /* If there's a plugin in p_info ... */
- if( p_main->p_bank->p_info[ i_index ] != NULL )
- {
- /* ... and if this plugin provides the functions we want ... */
- if( p_main->p_bank->p_info[ i_index ]->vout_GetPlugin != NULL )
- {
- /* ... and if this plugin has a good score ... */
- if( p_main->p_bank->p_info[ i_index ]->i_score > i_best_score )
- {
- /* ... then take it */
- i_best_score = p_main->p_bank->p_info[ i_index ]->i_score;
- i_best_index = i_index;
- }
- }
- }
- }
-
- if( i_best_score == 0 )
+ if( p_vout->p_module == NULL )
{
+ intf_ErrMsg( "vout error: no suitable vout module" );
free( p_vout );
return( NULL );
}
- /* Get the plugin functions */
- ( (vout_getplugin_t *)
- p_main->p_bank->p_info[ i_best_index ]->vout_GetPlugin )( p_vout );
+#define f p_vout->p_module->p_functions->vout.functions.vout
+ p_vout->pf_create = f.pf_create;
+ p_vout->pf_init = f.pf_init;
+ p_vout->pf_end = f.pf_end;
+ p_vout->pf_destroy = f.pf_destroy;
+ p_vout->pf_manage = f.pf_manage;
+ p_vout->pf_display = f.pf_display;
+ p_vout->pf_setpalette = f.pf_setpalette;
+#undef f
+
+ if( p_vout->pf_setpalette == NULL )
+ {
+ p_vout->pf_setpalette = SetPalette;
+ }
/* Initialize thread properties - thread id and locks will be initialized
* later */
* fields will probably be modified by the method, and are only
* preferences */
p_vout->i_changes = 0;
- p_vout->i_width = i_width;
- p_vout->i_height = i_height;
- p_vout->i_bytes_per_line = i_width * 2;
+ p_vout->i_width = main_GetIntVariable( VOUT_WIDTH_VAR,
+ VOUT_WIDTH_DEFAULT );
+ p_vout->i_height = main_GetIntVariable( VOUT_HEIGHT_VAR,
+ VOUT_HEIGHT_DEFAULT );
+ p_vout->i_bytes_per_line = p_vout->i_width * 2;
p_vout->i_screen_depth = 15;
p_vout->i_bytes_per_pixel = 2;
p_vout->f_gamma = VOUT_GAMMA;
+ p_vout->b_need_render = 1;
p_vout->b_grayscale = main_GetIntVariable( VOUT_GRAYSCALE_VAR,
- VOUT_GRAYSCALE_DEFAULT );
- p_vout->vdec_DecodeMacroblock = vdec_DecodeMacroblockC;
+ VOUT_GRAYSCALE_DEFAULT );
p_vout->b_info = 0;
p_vout->b_interface = 0;
p_vout->b_scale = 1;
- intf_DbgMsg( "wished configuration: %dx%d, %d/%d bpp (%d Bpl)\n",
- p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
- p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line );
+ intf_WarnMsg( 1, "wished configuration: %dx%d, %d/%d bpp (%d Bpl)",
+ p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
+ p_vout->i_bytes_per_pixel * 8, p_vout->i_bytes_per_line );
/* Initialize idle screen */
p_vout->last_display_date = 0;
p_vout->last_idle_date = 0;
p_vout->init_display_date = mdate();
+ p_vout->render_time = 10000;
-#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;
}
p_vout->i_pictures = 0;
- /* Initialize synchronization information */
- p_vout->i_synchro_level = VOUT_SYNCHRO_LEVEL_START;
-
/* Create and initialize system-dependant method - this function issues its
* own error messages */
- if( p_vout->p_sys_create( p_vout, psz_display, i_root_window, p_data ) )
+ if( p_vout->pf_create( p_vout ) )
{
+ module_Unneed( p_main->p_bank, p_vout->p_module );
free( p_vout );
return( NULL );
}
- intf_DbgMsg( "actual configuration: %dx%d, %d/%d bpp (%d Bpl), "
- "masks: 0x%x/0x%x/0x%x\n",
- p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
- 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 );
+ intf_WarnMsg( 1, "actual configuration: %dx%d, %d/%d bpp (%d Bpl), "
+ "masks: 0x%x/0x%x/0x%x",
+ p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
+ 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,
/* Load fonts - fonts must be initialized after the system method since
* they may be dependant on screen depth and other thread properties */
- p_vout->p_default_font = vout_LoadFont( DATA_PATH "/" VOUT_DEFAULT_FONT );
- if( p_vout->p_default_font == NULL )
- {
- p_vout->p_default_font = vout_LoadFont( "share/" VOUT_DEFAULT_FONT );
- }
+ p_vout->p_default_font = vout_LoadFont( VOUT_DEFAULT_FONT );
if( p_vout->p_default_font == NULL )
{
- intf_ErrMsg( "vout error: could not load default font\n" );
- p_vout->p_sys_destroy( p_vout );
+ intf_ErrMsg( "vout error: could not load default font" );
+ p_vout->pf_destroy( p_vout );
free( p_vout );
return( NULL );
}
- p_vout->p_large_font = vout_LoadFont( DATA_PATH "/" VOUT_LARGE_FONT );
- if( p_vout->p_large_font == NULL )
- {
- p_vout->p_large_font = vout_LoadFont( "share/" VOUT_LARGE_FONT );
- }
+
+ p_vout->p_large_font = vout_LoadFont( VOUT_LARGE_FONT );
if( p_vout->p_large_font == NULL )
{
- intf_ErrMsg( "vout error: could not load large font\n" );
+ intf_ErrMsg( "vout error: could not load large font" );
vout_UnloadFont( p_vout->p_default_font );
- p_vout->p_sys_destroy( p_vout );
+ p_vout->pf_destroy( p_vout );
free( p_vout );
return( NULL );
}
vlc_mutex_init( &p_vout->picture_lock );
vlc_mutex_init( &p_vout->subpicture_lock );
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) )
{
- intf_ErrMsg("error: %s\n", strerror(ENOMEM));
+ intf_ErrMsg("vout error: %s", strerror(ENOMEM));
vout_UnloadFont( p_vout->p_default_font );
vout_UnloadFont( p_vout->p_large_font );
- p_vout->p_sys_destroy( p_vout );
+ p_vout->pf_destroy( p_vout );
free( p_vout );
return( NULL );
}
- intf_Msg( "Video display initialized (%dx%d, %d/%d bpp)\n", p_vout->i_width,
- p_vout->i_height, p_vout->i_screen_depth,
+ intf_Msg( "vout: video display initialized (%dx%d, %d/%d bpp)",
+ p_vout->i_width, p_vout->i_height, p_vout->i_screen_depth,
p_vout->i_bytes_per_pixel * 8 );
/* If status is NULL, wait until the thread is created */
int i_status; /* thread status */
/* Set status */
- intf_DbgMsg("\n");
+ intf_DbgMsg("");
p_vout->pi_status = (pi_status != NULL) ? pi_status : &i_status;
*p_vout->pi_status = THREAD_DESTROY;
*****************************************************************************/
void vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
{
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
char psz_begin_date[MSTRTIME_MAX_SIZE]; /* buffer for date string */
char psz_end_date[MSTRTIME_MAX_SIZE]; /* buffer for date string */
#endif
/* Check if status is valid */
if( p_subpic->i_status != RESERVED_SUBPICTURE )
{
- intf_DbgMsg("error: subpicture %p has invalid status %d\n", p_subpic,
+ intf_DbgMsg("error: subpicture %p has invalid status %d", p_subpic,
p_subpic->i_status );
}
#endif
/* Remove reservation flag */
p_subpic->i_status = READY_SUBPICTURE;
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
/* Send subpicture information */
- intf_DbgMsg("subpicture %p: type=%d, begin date=%s, end date=%s\n",
+ intf_DbgMsg("subpicture %p: type=%d, begin date=%s, end date=%s",
p_subpic, p_subpic->i_type,
mstrtime( psz_begin_date, p_subpic->begin_date ),
mstrtime( psz_end_date, p_subpic->end_date ) );
* 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",
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("subpicture %p (in destroyed subpicture slot)",
&p_vout->p_subpicture[i_subpic] );
#endif
vlc_mutex_unlock( &p_vout->subpicture_lock );
break;
#ifdef DEBUG
default:
- intf_DbgMsg("error: unknown subpicture type %d\n", i_type );
+ intf_DbgMsg("error: unknown subpicture type %d", i_type );
p_free_subpic->p_data = NULL;
break;
#endif
p_free_subpic->i_type = EMPTY_SUBPICTURE;
p_free_subpic->i_status = FREE_SUBPICTURE;
p_free_subpic = NULL;
- intf_ErrMsg("spu warning: %s\n", strerror( ENOMEM ) );
+ intf_ErrMsg( "vout error: spu allocation returned %s",
+ strerror( ENOMEM ) );
}
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("subpicture %p (in free subpicture slot)\n", p_free_subpic );
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("subpicture %p (in free subpicture slot)", 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: subpicture heap is full\n" );
+ intf_DbgMsg( "warning: subpicture heap is full" );
vlc_mutex_unlock( &p_vout->subpicture_lock );
return( NULL );
}
/* Check if status is valid */
if( p_subpic->i_status != RESERVED_SUBPICTURE )
{
- intf_DbgMsg("error: subpicture %p has invalid status %d\n",
+ intf_DbgMsg("error: subpicture %p has invalid status %d",
p_subpic, p_subpic->i_status );
}
#endif
p_subpic->i_status = DESTROYED_SUBPICTURE;
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("subpicture %p\n", p_subpic);
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("subpicture %p", p_subpic);
#endif
}
break;
#ifdef DEBUG
default:
- intf_DbgMsg("error: picture %p has invalid status %d\n", p_pic, p_pic->i_status );
+ intf_DbgMsg("error: picture %p has invalid status %d", p_pic, p_pic->i_status );
break;
#endif
}
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("picture %p\n", p_pic);
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("picture %p", p_pic);
#endif
vlc_mutex_unlock( &p_vout->picture_lock );
}
*****************************************************************************/
void vout_DatePicture( vout_thread_t *p_vout, picture_t *p_pic, mtime_t date )
{
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
char psz_date[MSTRTIME_MAX_SIZE]; /* date */
#endif
break;
#ifdef DEBUG
default:
- intf_DbgMsg("error: picture %p has invalid status %d\n", p_pic, p_pic->i_status );
+ intf_DbgMsg("error: picture %p has invalid status %d", p_pic, p_pic->i_status );
break;
#endif
}
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("picture %p, display date: %s\n", p_pic, mstrtime( psz_date, p_pic->date) );
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("picture %p, display date: %s", p_pic, mstrtime( psz_date, p_pic->date) );
#endif
vlc_mutex_unlock( &p_vout->picture_lock );
}
* memory allocation needs to be done */
p_vout->p_picture[i_picture].i_status = RESERVED_PICTURE;
p_vout->i_pictures++;
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("picture %p (in destroyed picture slot)\n",
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("picture %p (in destroyed picture slot)",
&p_vout->p_picture[i_picture] );
#endif
vlc_mutex_unlock( &p_vout->picture_lock );
break;
#ifdef DEBUG
default:
- intf_DbgMsg("error: unknown picture type %d\n", i_type );
+ intf_DbgMsg("error: unknown picture type %d", i_type );
p_free_picture->p_data = NULL;
break;
#endif
p_free_picture->i_type = EMPTY_PICTURE;
p_free_picture->i_status = FREE_PICTURE;
p_free_picture = NULL;
- intf_ErrMsg("vout warning: %s\n", strerror( ENOMEM ) );
+ intf_ErrMsg( "vout error: picture allocation returned %s",
+ strerror( ENOMEM ) );
}
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("picture %p (in free picture slot)\n", p_free_picture );
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("picture %p (in free picture slot)", p_free_picture );
#endif
vlc_mutex_unlock( &p_vout->picture_lock );
+
+ /* Initialize mutex */
+ vlc_mutex_init( &(p_free_picture->lock_deccount) );
+
return( p_free_picture );
}
/* No free or destroyed picture could be found */
- intf_DbgMsg( "warning: picture heap is full\n" );
+ intf_DbgMsg( "warning: picture heap is full" );
vlc_mutex_unlock( &p_vout->picture_lock );
return( NULL );
}
*****************************************************************************/
void vout_DestroyPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
- vlc_mutex_lock( &p_vout->picture_lock );
+ vlc_mutex_lock( &p_vout->picture_lock );
#ifdef DEBUG
- /* Check if picture status is valid */
- if( (p_pic->i_status != RESERVED_PICTURE) &&
- (p_pic->i_status != RESERVED_DATED_PICTURE) &&
- (p_pic->i_status != RESERVED_DISP_PICTURE) )
- {
- intf_DbgMsg("error: picture %p has invalid status %d\n", p_pic, p_pic->i_status );
- }
+ /* Check if picture status is valid */
+ if( (p_pic->i_status != RESERVED_PICTURE) &&
+ (p_pic->i_status != RESERVED_DATED_PICTURE) &&
+ (p_pic->i_status != RESERVED_DISP_PICTURE) )
+ {
+ intf_DbgMsg("error: picture %p has invalid status %d", p_pic, p_pic->i_status );
+ }
#endif
- p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_pictures--;
+ p_pic->i_status = DESTROYED_PICTURE;
+ p_vout->i_pictures--;
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("picture %p\n", p_pic);
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("picture %p", p_pic);
#endif
- vlc_mutex_unlock( &p_vout->picture_lock );
+
+ /* destroy the lock that had been initialized in CreatePicture */
+ vlc_mutex_destroy( &(p_pic->lock_deccount) );
+
+ vlc_mutex_unlock( &p_vout->picture_lock );
}
/*****************************************************************************
vlc_mutex_lock( &p_vout->picture_lock );
p_pic->i_refcount++;
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("picture %p refcount=%d\n", p_pic, p_pic->i_refcount );
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("picture %p refcount=%d", p_pic, p_pic->i_refcount );
#endif
vlc_mutex_unlock( &p_vout->picture_lock );
vlc_mutex_lock( &p_vout->picture_lock );
p_pic->i_refcount--;
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
if( p_pic->i_refcount < 0 )
{
- intf_DbgMsg("error: refcount < 0\n");
+ intf_DbgMsg("error: refcount < 0");
p_pic->i_refcount = 0;
}
#endif
p_vout->i_pictures--;
}
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("picture %p refcount=%d\n", p_pic, p_pic->i_refcount );
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("picture %p refcount=%d", p_pic, p_pic->i_refcount );
#endif
vlc_mutex_unlock( &p_vout->picture_lock );
*****************************************************************************/
static int BinaryLog(u32 i)
{
- int i_log;
+ int i_log = 0;
- i_log = 0;
- if (i & 0xffff0000)
+ if(i & 0xffff0000)
{
- i_log = 16;
+ i_log += 16;
}
- if (i & 0xff00ff00)
+ if(i & 0xff00ff00)
{
i_log += 8;
}
- if (i & 0xf0f0f0f0)
+ if(i & 0xf0f0f0f0)
{
i_log += 4;
}
- if (i & 0xcccccccc)
+ if(i & 0xcccccccc)
{
i_log += 2;
}
- if (i & 0xaaaaaaaa)
+ if(i & 0xaaaaaaaa)
{
- i_log++;
+ i_log += 1;
}
+
if (i != ((u32)1 << i_log))
{
- intf_DbgMsg("internal error: binary log overflow\n");
+ intf_DbgMsg("internal error: binary log overflow");
}
return( i_log );
static int InitThread( vout_thread_t *p_vout )
{
/* Update status */
- intf_DbgMsg("\n");
*p_vout->pi_status = THREAD_START;
+ vlc_mutex_lock( &p_vout->change_lock );
+
+#ifdef STATS
+ p_vout->c_loops = 0;
+#endif
+
/* Initialize output method - this function issues its own error messages */
- if( p_vout->p_sys_init( p_vout ) )
+ if( p_vout->pf_init( p_vout ) )
{
return( 1 );
}
/* Initialize convertion tables and functions */
if( vout_InitYUV( p_vout ) )
{
- intf_ErrMsg("error: can't allocate YUV translation tables\n");
+ intf_ErrMsg("vout error: can't allocate YUV translation tables");
return( 1 );
}
*p_vout->pi_status = THREAD_READY;
- intf_DbgMsg("thread ready\n");
+ intf_DbgMsg("thread ready");
return( 0 );
}
*****************************************************************************/
static void RunThread( vout_thread_t *p_vout)
{
- /* XXX?? welcome to gore land */
- static int i_trash_count = 0;
- static mtime_t last_display_date = 0;
-
int i_index; /* index in heap */
mtime_t current_date; /* current date */
mtime_t display_date; /* display date */
DestroyThread( p_vout, THREAD_ERROR );
return;
}
- intf_DbgMsg("\n");
/*
* Main loop - it is not executed if an error occured during
p_subpic = NULL;
display_date = 0;
current_date = mdate();
+#ifdef STATS
+ p_vout->c_loops++;
+ if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
+ {
+ intf_Msg("vout stats: picture heap: %d/%d",
+ p_vout->i_pictures, VOUT_MAX_PICTURES);
+ }
+#endif
/*
* Find the picture to display - this operation does not need lock,
if( p_pic )
{
-#ifdef STATS
/* Computes FPS rate */
p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date;
-#endif
-/* XXX?? */
-i_trash_count++;
-//fprintf( stderr, "gap : %Ld\n", display_date-last_display_date );
-last_display_date = display_date;
-#if 1
- if( display_date < current_date && i_trash_count > 4 )
+
+ if( display_date < current_date - p_vout->render_time )
{
/* Picture is late: it will be destroyed and the thread
* will sleep and go to next picture */
p_pic->i_status = DESTROYED_PICTURE;
p_vout->i_pictures--;
}
- intf_DbgMsg( "warning: late picture %p skipped refcount=%d\n", p_pic, p_pic->i_refcount );
+ intf_WarnMsg( 3,
+ "warning: late picture skipped (%p)", p_pic );
vlc_mutex_unlock( &p_vout->picture_lock );
- /* Update synchronization information as if display delay
- * was 0 */
- Synchronize( p_vout, display_date - current_date );
-
- p_pic = NULL;
- display_date = 0;
- i_trash_count = 0;
+ continue;
}
- else
-#endif
- if( display_date > current_date + VOUT_DISPLAY_DELAY )
+ else if( display_date > current_date + VOUT_DISPLAY_DELAY )
{
/* A picture is ready to be rendered, but its rendering date
* is far from the current one so the thread will perform an
p_pic = NULL;
display_date = 0;
}
- else
- {
- /* Picture will be displayed, update synchronization
- * information */
- Synchronize( p_vout, display_date - current_date );
- }
}
/*
* Find the subpictures to display - this operation does not need
}
}
-
/*
* Perform rendering, sleep and display rendered picture
*/
-
if( p_pic ) /* picture and perhaps subpicture */
{
b_display = p_vout->b_active;
p_vout->last_display_date = display_date;
+ p_vout->p_rendered_pic = p_pic;
+
+
- if( b_display )
- {
- /* Set picture dimensions and clear buffer */
- SetBufferPicture( p_vout, p_pic );
+ /* Set picture dimensions and clear buffer */
+ SetBufferPicture( p_vout, p_pic );
+
+ /* FIXME: if b_need_render == 0 we need to do something with
+ * the subpictures one day. */
+
+ if( p_vout->b_need_render && b_display )
+ {
/* Render picture and information */
RenderPicture( p_vout, p_pic );
if( p_vout->b_info )
}
}
- /* Remove picture from heap */
- vlc_mutex_lock( &p_vout->picture_lock );
- if( p_pic->i_refcount )
- {
- p_pic->i_status = DISPLAYED_PICTURE;
- }
- else
- {
- p_pic->i_status = DESTROYED_PICTURE;
- p_vout->i_pictures--;
- }
- vlc_mutex_unlock( &p_vout->picture_lock );
-
/* Render interface and subpicture */
- if( b_display && p_vout->b_interface )
+ if( b_display && p_vout->b_interface && p_vout->b_need_render )
{
RenderInterface( p_vout );
}
}
- else if( p_vout->b_active && p_vout->init_display_date == 0) /* idle or interface screen alone */
+ else if( p_vout->b_active && p_vout->b_need_render
+ && p_vout->init_display_date == 0)
{
+ /* Idle or interface screen alone */
+
if( p_vout->b_interface && 0 /* && XXX?? intf_change */ )
{
/* Interface has changed, so a new rendering is required - force
/*
- * chech for the current time and
+ * Check for the current time and
* display splash screen if everything is on time
*/
- if( p_vout->init_display_date > 0)
+ if( p_vout->init_display_date > 0 && p_vout->b_need_render )
{
if( p_vout->b_active &&
mdate()-p_vout->init_display_date < 5000000)
} else {
/* no splash screen ! */
- intf_ErrMsgImm("End of splash screen\n");
p_vout->init_display_date=0;
}
}
-
-
/*
* Sleep, wake up and display rendered picture
*/
-#ifdef STATS
- /* Store render time */
- p_vout->render_time = mdate() - current_date;
-#endif
+ if( display_date != 0 )
+ {
+ /* Store render time using Bresenham algorithm */
+ p_vout->render_time += mdate() - current_date;
+ p_vout->render_time >>= 1;
+ }
/* Give back change lock */
vlc_mutex_unlock( &p_vout->change_lock );
/* Sleep a while or until a given date */
if( display_date != 0 )
{
- mwait( display_date );
+ mwait( display_date - VOUT_MWAIT_TOLERANCE );
}
else
{
/* On awakening, take back lock and send immediately picture to display,
* then swap buffers */
vlc_mutex_lock( &p_vout->change_lock );
-#ifdef DEBUG_VIDEO
- intf_DbgMsg( "picture %p, subpicture %p in buffer %d, display=%d\n", p_pic, p_subpic,
- p_vout->i_buffer_index, b_display && !(p_vout->i_changes & VOUT_NODISPLAY_CHANGE) );
+#ifdef DEBUG_VOUT
+ intf_DbgMsg( "picture %p, subpicture %p in buffer %d, display=%d", p_pic, p_subpic,
+ p_vout->i_buffer_index, b_display /* && !(p_vout->i_changes & VOUT_NODISPLAY_CHANGE) */ );
#endif
- if( b_display && !(p_vout->i_changes & VOUT_NODISPLAY_CHANGE) )
+ if( b_display /* && !(p_vout->i_changes & VOUT_NODISPLAY_CHANGE) */ )
{
- p_vout->p_sys_display( p_vout );
+ p_vout->pf_display( p_vout );
#ifndef SYS_BEOS
p_vout->i_buffer_index = ++p_vout->i_buffer_index & 1;
#endif
}
+ if( p_pic )
+ {
+ /* Remove picture from heap */
+ vlc_mutex_lock( &p_vout->picture_lock );
+ if( p_pic->i_refcount )
+ {
+ p_pic->i_status = DISPLAYED_PICTURE;
+ }
+ else
+ {
+ p_pic->i_status = DESTROYED_PICTURE;
+ p_vout->i_pictures--;
+ }
+ vlc_mutex_unlock( &p_vout->picture_lock );
+ }
+
+
/*
* Check events and manage thread
*/
- if( p_vout->p_sys_manage( p_vout ) | Manage( p_vout ) )
+ if( p_vout->pf_manage( p_vout ) | Manage( p_vout ) )
{
/* A fatal error occured, and the thread must terminate immediately,
* without displaying anything - setting b_error to 1 cause the
/* End of thread */
EndThread( p_vout );
DestroyThread( p_vout, THREAD_OVER );
- intf_DbgMsg( "thread end\n" );
+ intf_DbgMsg( "thread end" );
}
/*****************************************************************************
static void ErrorThread( vout_thread_t *p_vout )
{
/* Wait until a `die' order */
- intf_DbgMsg("\n");
while( !p_vout->b_die )
{
/* Sleep a while */
int i_index; /* index in heap */
/* Store status */
- intf_DbgMsg("\n");
*p_vout->pi_status = THREAD_END;
+#ifdef STATS
+ {
+ struct tms cpu_usage;
+ times( &cpu_usage );
+
+ intf_Msg( "vout stats: cpu usage (user: %d, system: %d)",
+ cpu_usage.tms_utime, cpu_usage.tms_stime );
+ }
+#endif
+
/* Destroy all remaining pictures and subpictures */
for( i_index = 0; i_index < VOUT_MAX_PICTURES; i_index++ )
{
free( p_vout->p_picture[i_index].p_data );
}
}
+
for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
{
if( p_vout->p_subpicture[i_index].i_status != FREE_SUBPICTURE )
/* Destroy translation tables */
vout_EndYUV( p_vout );
- p_vout->p_sys_end( p_vout );
+ p_vout->pf_end( p_vout );
+
+ /* Release the change lock */
+ vlc_mutex_unlock( &p_vout->change_lock );
}
/*****************************************************************************
int *pi_status; /* status adress */
/* Store status adress */
- intf_DbgMsg("\n");
pi_status = p_vout->pi_status;
/* Destroy thread structures allocated by Create and InitThread */
vout_UnloadFont( p_vout->p_default_font );
vout_UnloadFont( p_vout->p_large_font );
- p_vout->p_sys_destroy( p_vout );
+ p_vout->pf_destroy( p_vout );
+
+ /* Destroy the locks */
+ vlc_mutex_destroy( &p_vout->picture_lock );
+ vlc_mutex_destroy( &p_vout->subpicture_lock );
+ vlc_mutex_destroy( &p_vout->change_lock );
+
+ /* Release the module */
+ module_Unneed( p_main->p_bank, p_vout->p_module );
/* Free structure */
free( p_vout );
}
else
{
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("area overflow\n");
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("area overflow");
#endif
p_buffer->pi_area_end[VOUT_MAX_AREAS - 1] = i_h;
}
* move all old areas down */
if( p_buffer->i_areas == VOUT_MAX_AREAS )
{
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("areas overflow\n");
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("areas overflow");
#endif
p_buffer->pi_area_end[VOUT_MAX_AREAS - 2] = p_buffer->pi_area_end[VOUT_MAX_AREAS - 1];
}
/* Set picture position */
i_pic_x = (p_vout->i_width - i_pic_width) / 2;
i_pic_y = (p_vout->i_height - i_pic_height) / 2;
+
}
else
{
*/
for( i_area = 0; i_area < p_buffer->i_areas; i_area++ )
{
-#ifdef DEBUG_VIDEO
- intf_DbgMsg("clearing picture %p area in buffer %d: %d-%d\n", p_pic,
+#ifdef DEBUG_VOUT
+ intf_DbgMsg("clearing picture %p area in buffer %d: %d-%d", p_pic,
p_vout->i_buffer_index, p_buffer->pi_area_begin[i_area], p_buffer->pi_area_end[i_area] );
#endif
i_data_size = (p_buffer->pi_area_end[i_area] - p_buffer->pi_area_begin[i_area] + 1) * p_vout->i_bytes_per_line;
*****************************************************************************/
static void RenderPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
char psz_date[MSTRTIME_MAX_SIZE]; /* picture date */
mtime_t render_time; /* picture rendering time */
#endif
p_pic_data = p_buffer->p_data +
p_buffer->i_pic_x * p_vout->i_bytes_per_pixel +
p_buffer->i_pic_y * p_vout->i_bytes_per_line;
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
render_time = mdate();
#endif
+
+
/*
* Choose appropriate rendering function and render picture
*/
break;
#ifdef DEBUG
default:
- intf_DbgMsg("error: unknown picture type %d\n", p_pic->i_type );
+ intf_DbgMsg("error: unknown picture type %d", p_pic->i_type );
break;
#endif
}
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
/* Print picture date and rendering time */
- intf_DbgMsg("picture %p rendered in buffer %d (%ld us), display date: %s\n", p_pic,
+ intf_DbgMsg("picture %p rendered in buffer %d (%ld us), display date: %s", p_pic,
p_vout->i_buffer_index, (long) (mdate() - render_time),
mstrtime( psz_date, p_pic->date ));
#endif
*****************************************************************************/
static void RenderPictureInfo( vout_thread_t *p_vout, picture_t *p_pic )
{
-#if defined(STATS) || defined(DEBUG)
char psz_buffer[256]; /* string buffer */
-#endif
-#ifdef STATS
/*
* Print FPS rate in upper right corner
*/
sprintf( psz_buffer, "%ld frames, render: %ldus",
(long) p_vout->c_fps_samples, (long) p_vout->render_time );
Print( p_vout, 0, 0, LEFT_RALIGN, TOP_RALIGN, psz_buffer );
-#endif
-#ifdef DEBUG
+#ifdef STATS
/*
* Print picture information in lower right corner
*/
*****************************************************************************/
int RenderIdle( vout_thread_t *p_vout )
{
+#if 0
int i_x = 0, i_y = 0; /* text position */
int i_width, i_height; /* text size */
- mtime_t current_date; /* current date */
int i_amount = 0; /* amount to draw */
char *psz_text = "Waiting for stream"; /* text to display */
char *psz_wtext = "[................]";
+#endif
+ mtime_t current_date; /* current date */
memset( p_vout->p_buffer[ p_vout->i_buffer_index ].p_data,
// && (current_date - p_vout->last_idle_date) > VOUT_IDLE_DELAY
)
{
+ /* FIXME: idle screen disabled */
+#if 0
SetBufferPicture( p_vout, NULL );
vout_TextSize( p_vout->p_large_font, WIDE_TEXT | OUTLINED_TEXT, psz_text,
&i_width, &i_height );
SetBufferArea( p_vout, i_x, i_y, i_width, i_height * 2 );
}
+#endif
return( 1 );
}
return( 0 );
#ifdef DEBUG
default:
- intf_DbgMsg( "error: unknown subpicture %p type %d\n",
+ intf_DbgMsg( "error: unknown subpicture %p type %d",
p_subpic, p_subpic->i_type );
#endif
}
SetBufferArea( p_vout, 0, p_vout->i_height - i_height, p_vout->i_width, i_height );
}
-/*****************************************************************************
- * Synchronize: update synchro level depending of heap state
- *****************************************************************************
- * This function is called during the main vout loop.
- *****************************************************************************/
-static void Synchronize( vout_thread_t *p_vout, s64 i_delay )
-{
- int i_synchro_inc = 0;
- /* XXX?? gore following */
- static int i_panic_count = 0;
- static int i_last_synchro_inc = 0;
- static int i_synchro_level = VOUT_SYNCHRO_LEVEL_START;
- static int i_truc = 10;
-
- if( i_delay < 0 )
- {
- //fprintf( stderr, "PANIC %d\n", i_panic_count );
- i_panic_count++;
- }
-
- i_truc *= 2;
-
- if( p_vout->i_pictures > VOUT_SYNCHRO_HEAP_IDEAL_SIZE+1 )
- {
- i_truc = 40;
- i_synchro_inc += p_vout->i_pictures - VOUT_SYNCHRO_HEAP_IDEAL_SIZE - 1;
-
- }
- else
- {
- if( p_vout->i_pictures < VOUT_SYNCHRO_HEAP_IDEAL_SIZE )
- {
- i_truc = 32;
- i_synchro_inc += p_vout->i_pictures - VOUT_SYNCHRO_HEAP_IDEAL_SIZE;
- }
- }
-
- if( i_truc > VOUT_SYNCHRO_LEVEL_MAX >> 5 ||
- i_synchro_inc*i_last_synchro_inc < 0 )
- {
- i_truc = 32;
- }
-
- if( i_delay < 6000 )
- {
- i_truc = 16;
- i_synchro_inc -= 2;
- }
- else if( i_delay < 70000 )
- {
- i_truc = 24+(24*i_delay)/70000;
- if( i_truc < 16 )
- i_truc = 16;
- i_synchro_inc -= 1+(5*(70000-i_delay))/70000;
- }
- else if( i_delay > 100000 )
- {
- i_synchro_level += 1 << 10;
- if( i_delay > 130000 )
- i_synchro_level += 1 << 10;
- }
-
- i_synchro_level += ( i_synchro_inc << 10 ) / i_truc;
- p_vout->i_synchro_level = ( i_synchro_level + (1 << 9) );
-
- if( i_synchro_level > VOUT_SYNCHRO_LEVEL_MAX )
- {
- i_synchro_level = VOUT_SYNCHRO_LEVEL_MAX;
- }
-
- //fprintf( stderr, "synchro level : %d, heap : %d (%d, %d) (%d, %f) - %Ld\n", p_vout->i_synchro_level,
- // p_vout->i_pictures, i_last_synchro_inc, i_synchro_inc, i_truc, r_synchro_level, i_delay );
- i_last_synchro_inc = i_synchro_inc;
-}
-
/*****************************************************************************
* Manage: manage thread
*****************************************************************************
*****************************************************************************/
static int Manage( vout_thread_t *p_vout )
{
-#ifdef DEBUG_VIDEO
+#ifdef DEBUG_VOUT
if( p_vout->i_changes )
{
- intf_DbgMsg("changes: 0x%x (no display: 0x%x)\n", p_vout->i_changes,
- p_vout->i_changes & VOUT_NODISPLAY_CHANGE );
+ intf_DbgMsg("changes: 0x%x (no display: 0x%x)", p_vout->i_changes,
+ 0 /* p_vout->i_changes & VOUT_NODISPLAY_CHANGE */ );
}
#endif
if( p_vout->i_changes & (VOUT_GAMMA_CHANGE | VOUT_GRAYSCALE_CHANGE |
VOUT_YUV_CHANGE) )
{
- /* Change vdec_DecodeMacroblock when switching between BW and C */
- if( !p_vout->b_grayscale )
- {
- p_vout->vdec_DecodeMacroblock = vdec_DecodeMacroblockC;
- }
- else if( p_vout->b_grayscale)
- {
- p_vout->vdec_DecodeMacroblock = vdec_DecodeMacroblockBW;
- }
if( vout_ResetYUV( p_vout ) )
{
- intf_ErrMsg("error: can't rebuild convertion tables\n");
+ intf_ErrMsg( "vout error: can't rebuild conversion tables" );
return( 1 );
}
}
/* Clear changes flags which does not need management or have been
* handled */
- p_vout->i_changes &= ~(VOUT_GAMMA_CHANGE | VOUT_GRAYSCALE_CHANGE |
- VOUT_YUV_CHANGE | VOUT_INFO_CHANGE |
- VOUT_INTF_CHANGE | VOUT_SCALE_CHANGE );
+ p_vout->i_changes &= ~(VOUT_GAMMA_CHANGE | VOUT_GRAYSCALE_CHANGE |
+ VOUT_YUV_CHANGE | VOUT_INFO_CHANGE |
+ VOUT_INTF_CHANGE | VOUT_SCALE_CHANGE |
+ VOUT_CURSOR_CHANGE | VOUT_FULLSCREEN_CHANGE );
/* Detect unauthorized changes */
if( p_vout->i_changes )
{
- /* Some changes were not acknowledged by p_vout->p_sys_manage or this
+ /* Some changes were not acknowledged by p_vout->pf_manage or this
* function, it means they should not be authorized */
- intf_ErrMsg( "error: unauthorized changes in the video output thread\n" );
+ intf_ErrMsg( "vout error: unauthorized changes in the vout thread" );
return( 1 );
}
static void SetPalette ( p_vout_thread_t p_vout, u16 *red,
u16 *green, u16 *blue, u16 *transp )
{
- intf_ErrMsg( "SetPalette: method does not support palette changing\n" );
+ intf_ErrMsg( "vout error: method does not support palette changing" );
}
projects / vlc / blobdiff