* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: video_output.c,v 1.176 2002/05/17 14:17:05 lool Exp $
+ * $Id: video_output.c,v 1.205 2002/12/18 14:17:11 sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
#include <stdlib.h> /* free() */
-#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
-#include <videolan/vlc.h>
+#include <vlc/vlc.h>
#ifdef HAVE_SYS_TIMES_H
# include <sys/times.h>
#include "video.h"
#include "video_output.h"
+#if defined( SYS_DARWIN )
+#include "darwin_specific.h"
+#endif
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-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 int InitThread ( vout_thread_t * );
+static void RunThread ( vout_thread_t * );
+static void ErrorThread ( vout_thread_t * );
+static void EndThread ( vout_thread_t * );
+static void DestroyThread ( vout_thread_t * );
static int ReduceHeight ( int );
-static int BinaryLog ( u32 );
-static void MaskToShift ( int *, int *, u32 );
+static int BinaryLog ( uint32_t );
+static void MaskToShift ( int *, int *, uint32_t );
static void InitWindowSize ( vout_thread_t *, int *, int * );
/*****************************************************************************
- * vout_InitBank: initialize the video output bank.
+ * vout_Request: find a video output thread, create one, or destroy one.
+ *****************************************************************************
+ * This function looks for a video output thread matching the current
+ * properties. If not found, it spawns a new one.
*****************************************************************************/
-void vout_InitBank ( void )
+vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout,
+ unsigned int i_width, unsigned int i_height,
+ vlc_fourcc_t i_chroma, unsigned int i_aspect )
{
- p_vout_bank->i_count = 0;
+ if( !i_width || !i_height || !i_chroma )
+ {
+ /* Reattach video output to p_vlc before bailing out */
+ if( p_vout )
+ {
+ vlc_object_detach( p_vout );
+ vlc_object_attach( p_vout, p_this->p_vlc );
+ }
- vlc_mutex_init( &p_vout_bank->lock );
-}
+ return NULL;
+ }
-/*****************************************************************************
- * vout_EndBank: empty the video output bank.
- *****************************************************************************
- * This function ends all unused video outputs and empties the bank in
- * case of success.
- *****************************************************************************/
-void vout_EndBank ( void )
-{
- /* Ask all remaining video outputs to die */
- while( p_vout_bank->i_count )
+ /* If a video output was provided, lock it, otherwise look for one. */
+ if( p_vout )
{
- vout_DestroyThread(
- p_vout_bank->pp_vout[ --p_vout_bank->i_count ], NULL );
+ vlc_object_yield( p_vout );
+ }
+ else
+ {
+ p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_CHILD );
+
+ if( !p_vout )
+ {
+ p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ }
}
- vlc_mutex_destroy( &p_vout_bank->lock );
+ /* If we now have a video output, check it has the right properties */
+ if( p_vout )
+ {
+ if( ( p_vout->render.i_width != i_width ) ||
+ ( p_vout->render.i_height != i_height ) ||
+ ( p_vout->render.i_chroma != i_chroma ) ||
+ ( p_vout->render.i_aspect != i_aspect ) )
+ {
+ /* We are not interested in this format, close this vout */
+ vlc_object_detach( p_vout );
+ vlc_object_release( p_vout );
+ vout_Destroy( p_vout );
+ p_vout = NULL;
+ }
+ else
+ {
+ /* This video output is cool! Hijack it. */
+ vlc_object_detach( p_vout );
+ vlc_object_attach( p_vout, p_this );
+ vlc_object_release( p_vout );
+ }
+ }
+
+ if( !p_vout )
+ {
+ msg_Dbg( p_this, "no usable vout present, spawning one" );
+
+ p_vout = vout_Create( p_this, i_width, i_height, i_chroma, i_aspect );
+ }
+
+ return p_vout;
}
/*****************************************************************************
- * vout_CreateThread: creates a new video output thread
+ * vout_Create: creates a new video output thread
*****************************************************************************
* 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.
- * If not, it will be updated using one of the THREAD_* constants.
*****************************************************************************/
-vout_thread_t * vout_CreateThread ( int *pi_status,
- int i_width, int i_height,
- u32 i_chroma, int i_aspect )
+vout_thread_t * __vout_Create( vlc_object_t *p_parent,
+ unsigned int i_width, unsigned int i_height,
+ vlc_fourcc_t i_chroma, unsigned int i_aspect )
{
vout_thread_t * p_vout; /* thread descriptor */
- int i_status; /* thread status */
int i_index; /* loop variable */
char * psz_plugin;
+ vlc_value_t val;
/* Allocate descriptor */
- p_vout = (vout_thread_t *) malloc( sizeof(vout_thread_t) );
+ p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
if( p_vout == NULL )
{
- intf_ErrMsg( "vout error: vout thread creation returned %s",
- strerror(ENOMEM) );
- return( NULL );
+ msg_Err( p_parent, "out of memory" );
+ return NULL;
}
- /* Choose the best module */
- if( !(psz_plugin = config_GetPszVariable( "filter" )) )
+ var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_vout, "intf-change", val );
+
+ /* If the parent is not a VOUT object, that means we are at the start of
+ * the video output pipe */
+ if( p_parent->i_object_type != VLC_OBJECT_VOUT )
{
- psz_plugin = config_GetPszVariable( "vout" );
+ char *psz_aspect = config_GetPsz( p_parent, "aspect-ratio" );
+
+ /* Check whether the user tried to override aspect ratio */
+ if( psz_aspect )
+ {
+ unsigned int i_new_aspect = i_aspect;
+ char *psz_parser = strchr( psz_aspect, ':' );
+
+ if( psz_parser )
+ {
+ *psz_parser++ = '\0';
+ i_new_aspect = atoi( psz_aspect ) * VOUT_ASPECT_FACTOR
+ / atoi( psz_parser );
+ }
+ else
+ {
+ i_new_aspect = i_width * VOUT_ASPECT_FACTOR
+ * atof( psz_aspect )
+ / i_height;
+ }
+
+ free( psz_aspect );
+
+ if( i_new_aspect && i_new_aspect != i_aspect )
+ {
+ int i_pgcd = ReduceHeight( i_new_aspect );
+
+ msg_Dbg( p_vout, "overriding source aspect ratio to %i:%i",
+ i_new_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
+
+ i_aspect = i_new_aspect;
+ }
+ }
+
+ /* Look for the default filter configuration */
+ p_vout->psz_filter_chain = config_GetPsz( p_parent, "filter" );
+ }
+ else
+ {
+ /* continue the parent's filter chain */
+ char *psz_end;
+
+ psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' );
+ if( psz_end && *(psz_end+1) )
+ p_vout->psz_filter_chain = strdup( psz_end+1 );
+ else p_vout->psz_filter_chain = NULL;
}
- /* Initialize thread properties - thread id and locks will be initialized
- * later */
- 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;
+ /* Choose the video output module */
+ if( !p_vout->psz_filter_chain )
+ {
+ psz_plugin = config_GetPsz( p_parent, "vout" );
+ }
+ else
+ {
+ /* the filter chain is a string list of filters separated by double
+ * colons */
+ char *psz_end;
+
+ psz_end = strchr( p_vout->psz_filter_chain, ':' );
+ if( psz_end )
+ psz_plugin = strndup( p_vout->psz_filter_chain,
+ psz_end - p_vout->psz_filter_chain );
+ else psz_plugin = strdup( p_vout->psz_filter_chain );
+ }
/* Initialize pictures and subpictures - translation tables and functions
* will be initialized later in InitThread */
p_vout->render.i_gmask = 0;
p_vout->render.i_bmask = 0;
+ p_vout->render.i_last_used_pic = -1;
+ p_vout->render.b_allow_modify_pics = 1;
+
/* Zero the output heap */
I_OUTPUTPICTURES = 0;
p_vout->output.i_width = 0;
p_vout->render_time = 10;
p_vout->c_fps_samples= 0;
+ /* Mouse coordinates */
+ var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
+ var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
+ var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
+ var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
+
/* user requested fullscreen? */
- if( config_GetIntVariable( "fullscreen" ) )
+ if( config_GetInt( p_vout, "fullscreen" ) )
+ {
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
+ }
/* Initialize the dimensions of the video window */
InitWindowSize( p_vout, &p_vout->i_window_width,
&p_vout->i_window_height );
- p_vout->p_module
- = module_Need( MODULE_CAPABILITY_VOUT, psz_plugin, (void *)p_vout );
+ p_vout->p_module = module_Need( p_vout,
+ ( p_vout->psz_filter_chain ) ?
+ "video filter" : "video output",
+ psz_plugin );
if( psz_plugin ) free( psz_plugin );
if( p_vout->p_module == NULL )
{
- intf_ErrMsg( "vout error: no suitable vout module" );
- free( p_vout );
- return( NULL );
+ msg_Err( p_vout, "no suitable vout module" );
+ vlc_object_destroy( p_vout );
+ return NULL;
}
-#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_render = f.pf_render;
- p_vout->pf_display = f.pf_display;
-#undef f
-
/* Create thread and set locks */
- vlc_mutex_init( &p_vout->picture_lock );
- vlc_mutex_init( &p_vout->subpicture_lock );
- vlc_mutex_init( &p_vout->change_lock );
+ vlc_mutex_init( p_vout, &p_vout->picture_lock );
+ vlc_mutex_init( p_vout, &p_vout->subpicture_lock );
+ vlc_mutex_init( p_vout, &p_vout->change_lock );
- if( vlc_thread_create( &p_vout->thread_id, "video output",
- (void *) RunThread, (void *) p_vout) )
- {
- intf_ErrMsg("vout error: %s", strerror(ENOMEM));
- p_vout->pf_destroy( p_vout );
- module_Unneed( p_vout->p_module );
- free( p_vout );
- return( NULL );
- }
+ vlc_object_attach( p_vout, p_parent );
- /* If status is NULL, wait until the thread is created */
- if( pi_status == NULL )
+ if( vlc_thread_create( p_vout, "video output", RunThread,
+ VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) )
{
- do
- {
- msleep( THREAD_SLEEP );
- }while( (i_status != THREAD_READY) && (i_status != THREAD_ERROR)
- && (i_status != THREAD_FATAL) );
- if( i_status != THREAD_READY )
- {
- return( NULL );
- }
+ msg_Err( p_vout, "out of memory" );
+ module_Unneed( p_vout, p_vout->p_module );
+ vlc_object_destroy( p_vout );
+ return NULL;
}
- return( p_vout );
+ return p_vout;
}
/*****************************************************************************
- * vout_DestroyThread: destroys a previously created thread
+ * vout_Destroy: destroys a previously created video output
*****************************************************************************
* 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.
*****************************************************************************/
-void vout_DestroyThread( vout_thread_t *p_vout, int *pi_status )
+void vout_Destroy( vout_thread_t *p_vout )
{
- int i_status; /* thread status */
-
- /* Set status */
- p_vout->pi_status = (pi_status != NULL) ? pi_status : &i_status;
- *p_vout->pi_status = THREAD_DESTROY;
-
/* Request thread destruction */
- p_vout->b_die = 1;
-
- /* If status is NULL, wait until thread has been destroyed */
- if( pi_status == NULL )
- {
- do
- {
- msleep( THREAD_SLEEP );
- } while( (i_status != THREAD_OVER) && (i_status != THREAD_ERROR)
- && (i_status != THREAD_FATAL) );
- }
-}
-
-/*****************************************************************************
- * vout_ChromaCmp: compare two chroma values
- *****************************************************************************
- * This function returns 1 if the two fourcc values given as argument are
- * the same format (eg. UYVY / UYNV) or almost the same format (eg. I420/YV12)
- *****************************************************************************/
-int vout_ChromaCmp( u32 i_chroma, u32 i_amorhc )
-{
- /* If they are the same, they are the same ! */
- if( i_chroma == i_amorhc )
- {
- return 1;
- }
-
- /* Check for equivalence classes */
- switch( i_chroma )
- {
- case FOURCC_I420:
- case FOURCC_IYUV:
- case FOURCC_YV12:
- switch( i_amorhc )
- {
- case FOURCC_I420:
- case FOURCC_IYUV:
- case FOURCC_YV12:
- return 1;
+ p_vout->b_die = VLC_TRUE;
+ vlc_thread_join( p_vout );
- default:
- return 0;
- }
+ var_Destroy( p_vout, "intf-change" );
- case FOURCC_UYVY:
- case FOURCC_UYNV:
- case FOURCC_Y422:
- switch( i_amorhc )
- {
- case FOURCC_UYVY:
- case FOURCC_UYNV:
- case FOURCC_Y422:
- return 1;
-
- default:
- return 0;
- }
-
- case FOURCC_YUY2:
- case FOURCC_YUNV:
- switch( i_amorhc )
- {
- case FOURCC_YUY2:
- case FOURCC_YUNV:
- return 1;
-
- default:
- return 0;
- }
-
- default:
- return 0;
- }
+ /* Free structure */
+ vlc_object_destroy( p_vout );
}
/*****************************************************************************
{
int i, i_pgcd;
- /* Update status */
- *p_vout->pi_status = THREAD_START;
-
vlc_mutex_lock( &p_vout->change_lock );
#ifdef STATS
if( p_vout->pf_init( p_vout ) )
{
vlc_mutex_unlock( &p_vout->change_lock );
- return( 1 );
+ return VLC_EGENERIC;
}
if( !I_OUTPUTPICTURES )
{
- intf_ErrMsg( "vout error: plugin was unable to allocate at least "
- "one direct buffer" );
+ msg_Err( p_vout, "plugin was unable to allocate at least "
+ "one direct buffer" );
+ p_vout->pf_end( p_vout );
+ vlc_mutex_unlock( &p_vout->change_lock );
+ return VLC_EGENERIC;
+ }
+
+ if( I_OUTPUTPICTURES > VOUT_MAX_PICTURES )
+ {
+ msg_Err( p_vout, "plugin allocated too many direct buffers, "
+ "our internal buffers must have overflown." );
p_vout->pf_end( p_vout );
vlc_mutex_unlock( &p_vout->change_lock );
- return( 1 );
+ return VLC_EGENERIC;
}
- intf_WarnMsg( 1, "vout info: got %i direct buffer(s)", I_OUTPUTPICTURES );
+ msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
+
+#if 0
+ if( !p_vout->psz_filter_chain )
+ {
+ char *psz_aspect = config_GetPsz( p_vout, "pixel-ratio" );
+
+ if( psz_aspect )
+ {
+ int i_new_aspect = p_vout->output.i_width * VOUT_ASPECT_FACTOR
+ * atof( psz_aspect )
+ / p_vout->output.i_height;
+ free( psz_aspect );
+
+ if( i_new_aspect && i_new_aspect != p_vout->output.i_aspect )
+ {
+ int i_pgcd = ReduceHeight( i_new_aspect );
+ msg_Dbg( p_vout, "output ratio forced to %i:%i\n",
+ i_new_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
+ p_vout->output.i_aspect = i_new_aspect;
+ }
+ }
+ }
+#endif
i_pgcd = ReduceHeight( p_vout->render.i_aspect );
- intf_WarnMsg( 1, "vout info: picture in %ix%i, chroma 0x%.8x (%4.4s), "
- "aspect ratio %i:%i",
- p_vout->render.i_width, p_vout->render.i_height,
- p_vout->render.i_chroma, (char*)&p_vout->render.i_chroma,
- p_vout->render.i_aspect / i_pgcd,
- VOUT_ASPECT_FACTOR / i_pgcd );
+ msg_Dbg( p_vout,
+ "picture in %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i",
+ p_vout->render.i_width, p_vout->render.i_height,
+ p_vout->render.i_chroma, (char*)&p_vout->render.i_chroma,
+ p_vout->render.i_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
i_pgcd = ReduceHeight( p_vout->output.i_aspect );
- intf_WarnMsg( 1, "vout info: picture out %ix%i, chroma 0x%.8x (%4.4s), "
- "aspect ratio %i:%i",
- p_vout->output.i_width, p_vout->output.i_height,
- p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma,
- p_vout->output.i_aspect / i_pgcd,
- VOUT_ASPECT_FACTOR / i_pgcd );
+ msg_Dbg( p_vout,
+ "picture out %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i",
+ p_vout->output.i_width, p_vout->output.i_height,
+ p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma,
+ p_vout->output.i_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd );
/* Calculate shifts from system-updated masks */
MaskToShift( &p_vout->output.i_lrshift, &p_vout->output.i_rrshift,
p_vout->output.i_bmask );
/* Check whether we managed to create direct buffers similar to
- * the render buffers, ie same size, chroma and aspect ratio */
+ * the render buffers, ie same size and chroma */
if( ( p_vout->output.i_width == p_vout->render.i_width )
&& ( p_vout->output.i_height == p_vout->render.i_height )
- && ( vout_ChromaCmp( p_vout->output.i_chroma, p_vout->render.i_chroma ) )
- && ( p_vout->output.i_aspect == p_vout->render.i_aspect ) )
+ && ( vout_ChromaCmp( p_vout->output.i_chroma, p_vout->render.i_chroma ) ) )
{
/* Cool ! We have direct buffers, we can ask the decoder to
* directly decode into them ! Map the first render buffers to
* for memcpy operations */
p_vout->b_direct = 1;
- intf_WarnMsg( 2, "vout info: direct render, mapping "
- "render pictures 0-%i to system pictures 1-%i",
- VOUT_MAX_PICTURES - 2, VOUT_MAX_PICTURES - 1 );
-
for( i = 1; i < VOUT_MAX_PICTURES; i++ )
{
+ if( p_vout->p_picture[ i ].i_type != DIRECT_PICTURE &&
+ I_RENDERPICTURES >= VOUT_MIN_DIRECT_PICTURES - 1 &&
+ p_vout->p_picture[ i - 1 ].i_type == DIRECT_PICTURE )
+ {
+ /* We have enough direct buffers so there's no need to
+ * try to use system memory buffers. */
+ break;
+ }
PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
I_RENDERPICTURES++;
}
+
+ msg_Dbg( p_vout, "direct render, mapping "
+ "render pictures 0-%i to system pictures 1-%i",
+ VOUT_MAX_PICTURES - 2, VOUT_MAX_PICTURES - 1 );
}
else
{
p_vout->b_direct = 0;
/* Choose the best module */
- p_vout->chroma.p_module
- = module_Need( MODULE_CAPABILITY_CHROMA, NULL, (void *)p_vout );
+ p_vout->chroma.p_module = module_Need( p_vout, "chroma", NULL );
if( p_vout->chroma.p_module == NULL )
{
- intf_ErrMsg( "vout error: no chroma module for %4.4s to %4.4s",
- &p_vout->render.i_chroma, &p_vout->output.i_chroma );
+ msg_Err( p_vout, "no chroma module for %4.4s to %4.4s",
+ (char*)&p_vout->render.i_chroma,
+ (char*)&p_vout->output.i_chroma );
p_vout->pf_end( p_vout );
vlc_mutex_unlock( &p_vout->change_lock );
- return( 1 );
+ return VLC_EGENERIC;
}
-#define f p_vout->chroma.p_module->p_functions->chroma.functions.chroma
- p_vout->chroma.pf_init = f.pf_init;
- p_vout->chroma.pf_end = f.pf_end;
-#undef f
-
- if( I_OUTPUTPICTURES < 2 * VOUT_MAX_PICTURES )
- {
- intf_WarnMsg( 2, "vout info: indirect render, mapping "
- "render pictures %i-%i to system pictures %i-%i",
- I_OUTPUTPICTURES - 1, 2 * VOUT_MAX_PICTURES - 2,
- I_OUTPUTPICTURES, 2 * VOUT_MAX_PICTURES - 1 );
- }
- else
- {
- /* FIXME: if this happens, we don't have any render picture left */
- intf_WarnMsg( 2, "vout info: indirect render, no system "
- "pictures needed, we have %i directbuffers",
- I_OUTPUTPICTURES );
- intf_ErrMsg( "vout: this is a bug!\n");
- }
+ msg_Dbg( p_vout, "indirect render, mapping "
+ "render pictures 0-%i to system pictures %i-%i",
+ VOUT_MAX_PICTURES - 1, I_OUTPUTPICTURES,
+ I_OUTPUTPICTURES + VOUT_MAX_PICTURES - 1 );
/* Append render buffers after the direct buffers */
for( i = I_OUTPUTPICTURES; i < 2 * VOUT_MAX_PICTURES; i++ )
{
PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
I_RENDERPICTURES++;
+
+ /* Check if we have enough render pictures */
+ if( I_RENDERPICTURES == VOUT_MAX_PICTURES )
+ break;
}
}
PP_OUTPUTPICTURE[ i ]->p_heap = &p_vout->output;
}
- /* Mark thread as running and return */
- p_vout->b_active = 1;
- *p_vout->pi_status = THREAD_READY;
-
- return( 0 );
+/* XXX XXX mark thread ready */
+ return VLC_SUCCESS;
}
/*****************************************************************************
static void RunThread( vout_thread_t *p_vout)
{
int i_index; /* index in heap */
+ int i_idle_loops = 0; /* loops without displaying a picture */
mtime_t current_date; /* current date */
mtime_t display_date; /* display date */
picture_t * p_picture; /* picture pointer */
+ picture_t * p_last_picture = NULL; /* last picture */
picture_t * p_directbuffer; /* direct buffer to display */
subpicture_t * p_subpic; /* subpicture pointer */
if( p_vout->b_error )
{
/* Destroy thread structures allocated by Create and InitThread */
- p_vout->pf_destroy( p_vout );
-
- DestroyThread( p_vout, THREAD_ERROR );
+ DestroyThread( p_vout );
return;
}
while( (!p_vout->b_die) && (!p_vout->b_error) )
{
/* Initialize loop variables */
+ p_picture = NULL;
display_date = 0;
current_date = mdate();
p_vout->c_loops++;
if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
{
- intf_Msg( "vout stats: picture heap: %d/%d",
- I_RENDERPICTURES, p_vout->i_heap_size );
+ msg_Dbg( p_vout, "picture heap: %d/%d",
+ I_RENDERPICTURES, p_vout->i_heap_size );
}
#endif
/*
- * Find the picture to display - this operation does not need lock,
- * since only READY_PICTUREs are handled
- */
- p_picture = NULL;
-
- for( i_index = 0;
- i_index < I_RENDERPICTURES;
- i_index++ )
+ * Find the picture to display (the one with the earliest date).
+ * This operation does not need lock, since only READY_PICTUREs
+ * are handled. */
+ for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
{
if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
&& ( (p_picture == NULL) ||
}
}
- if( p_picture != NULL )
+ if( p_picture )
{
+ /* If we met the last picture, parse again to see whether there is
+ * a more appropriate one. */
+ if( p_picture == p_last_picture )
+ {
+ for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
+ {
+ if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
+ && (PP_RENDERPICTURE[i_index] != p_last_picture)
+ && ((p_picture == p_last_picture) ||
+ (PP_RENDERPICTURE[i_index]->date < display_date)) )
+ {
+ p_picture = PP_RENDERPICTURE[i_index];
+ display_date = p_picture->date;
+ }
+ }
+ }
+
+ /* If we found better than the last picture, destroy it */
+ if( p_last_picture && p_picture != p_last_picture )
+ {
+ vlc_mutex_lock( &p_vout->picture_lock );
+ if( p_last_picture->i_refcount )
+ {
+ p_last_picture->i_status = DISPLAYED_PICTURE;
+ }
+ else
+ {
+ p_last_picture->i_status = DESTROYED_PICTURE;
+ p_vout->i_heap_size--;
+ }
+ vlc_mutex_unlock( &p_vout->picture_lock );
+ p_last_picture = NULL;
+ }
+
/* Compute FPS rate */
p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ]
= display_date;
- if( display_date < current_date + p_vout->render_time )
+ if( !p_picture->b_force &&
+ p_picture != p_last_picture &&
+ display_date < current_date + p_vout->render_time )
{
/* Picture is late: it will be destroyed and the thread
* will directly choose the next picture */
p_picture->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
}
- intf_WarnMsg( 1, "vout warning: late picture skipped (%lld)",
- current_date - display_date );
+ msg_Warn( p_vout, "late picture skipped ("I64Fd")",
+ current_date - display_date );
vlc_mutex_unlock( &p_vout->picture_lock );
continue;
}
- else if( display_date > current_date + VOUT_BOGUS_DELAY )
+#if 0
+ /* Removed because it causes problems for some people --Meuuh */
+ if( display_date > current_date + VOUT_BOGUS_DELAY )
{
/* Picture is waaay too early: it will be destroyed */
vlc_mutex_lock( &p_vout->picture_lock );
p_picture->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
}
- intf_WarnMsg( 1, "vout warning: early picture skipped (%lld)",
- display_date - current_date );
+ intf_WarnMsg( 1, "vout warning: early picture skipped "
+ "("I64Fd")", display_date - current_date );
vlc_mutex_unlock( &p_vout->picture_lock );
continue;
}
- else if( display_date > current_date + VOUT_DISPLAY_DELAY )
+#endif
+ 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_picture = NULL;
display_date = 0;
}
+ else if( p_picture == p_last_picture )
+ {
+ /* We are asked to repeat the previous picture, but we first
+ * wait for a couple of idle loops */
+ if( i_idle_loops < 4 )
+ {
+ p_picture = NULL;
+ display_date = 0;
+ }
+ else
+ {
+ /* We set the display date to something high, otherwise
+ * we'll have lots of problems with late pictures */
+ display_date = current_date + p_vout->render_time;
+ }
+ }
+ }
+
+ if( p_picture == NULL )
+ {
+ i_idle_loops++;
}
/*
p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );
/*
- * Call the plugin-specific rendering method
+ * Call the plugin-specific rendering method if there is one
*/
- if( p_picture != NULL )
+ if( p_picture != NULL && p_vout->pf_render )
{
/* Render the direct buffer returned by vout_RenderPicture */
p_vout->pf_render( p_vout, p_directbuffer );
*/
if( display_date != 0 )
{
- /* Store render time using Bresenham algorithm */
+ /* Store render time using a sliding mean */
p_vout->render_time += mdate() - current_date;
p_vout->render_time >>= 1;
}
if( p_picture != NULL )
{
/* Display the direct buffer returned by vout_RenderPicture */
- p_vout->pf_display( p_vout, p_directbuffer );
-
- /* Remove picture from heap */
- vlc_mutex_lock( &p_vout->picture_lock );
- if( p_picture->i_refcount )
- {
- p_picture->i_status = DISPLAYED_PICTURE;
- }
- else
+ if( p_vout->pf_display )
{
- p_picture->i_status = DESTROYED_PICTURE;
- p_vout->i_heap_size--;
+ p_vout->pf_display( p_vout, p_directbuffer );
}
- vlc_mutex_unlock( &p_vout->picture_lock );
+
+ /* Reinitialize idle loop count */
+ i_idle_loops = 0;
+
+ /* Tell the vout this was the last picture and that it does not
+ * need to be forced anymore. */
+ p_last_picture = p_picture;
+ p_last_picture->b_force = 0;
}
/*
* Check events and manage thread
*/
- if( p_vout->pf_manage( p_vout ) )
+ if( p_vout->pf_manage && p_vout->pf_manage( p_vout ) )
{
/* A fatal error occured, and the thread must terminate
* immediately, without displaying anything - setting b_error to 1
I_OUTPUTPICTURES = 0;
if( p_vout->pf_init( p_vout ) )
{
- intf_ErrMsg( "vout error: cannot resize display" );
- /* FixMe: p_vout->pf_end will be called again in EndThread() */
+ msg_Err( p_vout, "cannot resize display" );
+ /* FIXME: pf_end will be called again in EndThread() */
p_vout->b_error = 1;
}
/* Need to reinitialise the chroma plugin */
- p_vout->chroma.pf_end( p_vout );
- p_vout->chroma.pf_init( p_vout );
+ p_vout->chroma.p_module->pf_deactivate( VLC_OBJECT(p_vout) );
+ p_vout->chroma.p_module->pf_activate( VLC_OBJECT(p_vout) );
}
-
}
/*
/* End of thread */
EndThread( p_vout );
- /* Destroy method-dependant resources */
- p_vout->pf_destroy( p_vout );
-
/* Destroy thread structures allocated by CreateThread */
- DestroyThread( p_vout, THREAD_OVER );
+ DestroyThread( p_vout );
}
/*****************************************************************************
{
int i_index; /* index in heap */
- /* Store status */
- *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 );
+ msg_Dbg( p_vout, "cpu usage (user: %d, system: %d)",
+ cpu_usage.tms_utime, cpu_usage.tms_stime );
}
#endif
if( !p_vout->b_direct )
{
- p_vout->chroma.pf_end( p_vout );
- module_Unneed( p_vout->chroma.p_module );
+ module_Unneed( p_vout, p_vout->chroma.p_module );
}
/* Destroy all remaining pictures */
* This function is called when the thread ends. It frees all ressources
* allocated by CreateThread. Status is available at this stage.
*****************************************************************************/
-static void DestroyThread( vout_thread_t *p_vout, int i_status )
+static void DestroyThread( vout_thread_t *p_vout )
{
- int *pi_status; /* status adress */
-
- /* Store status adress */
- pi_status = p_vout->pi_status;
-
/* 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_vout->p_module );
-
- /* Free structure */
- free( p_vout );
- *pi_status = i_status;
+ module_Unneed( p_vout, p_vout->p_module );
}
/* following functions are local */
* This functions is used by MaskToShift, to get a bit index from a binary
* value.
*****************************************************************************/
-static int BinaryLog(u32 i)
+static int BinaryLog( uint32_t i )
{
int 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 += 1;
+ if( i == 0 ) return -31337;
- if (i != ((u32)1 << i_log))
- {
- intf_ErrMsg( "vout error: binary log overflow for %i", i );
- }
+ if( i & 0xffff0000 ) i_log += 16;
+ if( i & 0xff00ff00 ) i_log += 8;
+ if( i & 0xf0f0f0f0 ) i_log += 4;
+ if( i & 0xcccccccc ) i_log += 2;
+ if( i & 0xaaaaaaaa ) i_log += 1;
- return( i_log );
+ return i_log;
}
/*****************************************************************************
*****************************************************************************
* This function is used for obtaining color shifts from masks.
*****************************************************************************/
-static void MaskToShift( int *pi_left, int *pi_right, u32 i_mask )
+static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask )
{
- u32 i_low, i_high; /* lower hand higher bits of the mask */
+ uint32_t i_low, i_high; /* lower hand higher bits of the mask */
if( !i_mask )
{
}
/* Get bits */
- i_low = i_mask & (- i_mask); /* lower bit of the mask */
+ i_low = i_mask & (- (int32_t)i_mask); /* lower bit of the mask */
i_high = i_mask + i_low; /* higher bit of the mask */
/* Transform bits into an index */
int *pi_height )
{
int i_width, i_height;
- double f_zoom;
+ uint64_t ll_zoom;
+
+#define FP_FACTOR 1000 /* our fixed point factor */
- i_width = config_GetIntVariable( "width" );
- i_height = config_GetIntVariable( "height" );
- f_zoom = config_GetFloatVariable( "zoom" );
+ i_width = config_GetInt( p_vout, "width" );
+ i_height = config_GetInt( p_vout, "height" );
+ ll_zoom = (uint64_t)( FP_FACTOR * config_GetFloat( p_vout, "zoom" ) );
if( (i_width >= 0) && (i_height >= 0))
{
- *pi_width = i_width * f_zoom;
- *pi_height = i_height * f_zoom;
+ *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
+ *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
return;
}
else if( i_width >= 0 )
{
- *pi_width = i_width * f_zoom;
- *pi_height = i_width * f_zoom * VOUT_ASPECT_FACTOR /
- p_vout->render.i_aspect;
+ *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
+ *pi_height = (int)( i_width * ll_zoom * VOUT_ASPECT_FACTOR /
+ p_vout->render.i_aspect / FP_FACTOR );
return;
}
else if( i_height >= 0 )
{
- *pi_height = i_height * f_zoom;
- *pi_width = i_height * f_zoom * p_vout->render.i_aspect /
- VOUT_ASPECT_FACTOR;
+ *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
+ *pi_width = (int)( i_height * ll_zoom * p_vout->render.i_aspect /
+ VOUT_ASPECT_FACTOR / FP_FACTOR );
return;
}
if( p_vout->render.i_height * p_vout->render.i_aspect
>= p_vout->render.i_width * VOUT_ASPECT_FACTOR )
{
- *pi_width = p_vout->render.i_height * f_zoom
- * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR;
- *pi_height = p_vout->render.i_height * f_zoom;
+ *pi_width = (int)( p_vout->render.i_height * ll_zoom
+ * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR / FP_FACTOR );
+ *pi_height = (int)( p_vout->render.i_height * ll_zoom / FP_FACTOR );
}
else
{
- *pi_width = p_vout->render.i_width * f_zoom;
- *pi_height = p_vout->render.i_width * f_zoom
- * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect;
+ *pi_width = (int)( p_vout->render.i_width * ll_zoom / FP_FACTOR );
+ *pi_height = (int)( p_vout->render.i_width * ll_zoom
+ * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect / FP_FACTOR );
}
+
+#undef FP_FACTOR
+}
+
+/*****************************************************************************
+ * vout_VarCallback: generic callback for intf variables
+ *****************************************************************************/
+int vout_VarCallback( vlc_object_t * p_this, const char * psz_variable,
+ vlc_value_t old_value, vlc_value_t new_value,
+ void * unused )
+{
+ vout_thread_t * p_vout = (vout_thread_t *)p_this;
+ vlc_value_t val;
+ val.b_bool = 1;
+ var_Set( p_vout, "intf-change", val );
+ return 0;
}
projects / vlc / blobdiff