* It includes functions allowing to open a new thread, send pictures to a
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
- * $Id: video_output.c,v 1.196 2002/11/10 18:04:24 sam Exp $
+ * Copyright (C) 2000-2004 VideoLAN
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
# include <sys/times.h>
#endif
-#include "video.h"
+#include "vlc_video.h"
#include "video_output.h"
+#include <vlc/input.h> /* for input_thread_t and i_pts_delay */
#if defined( SYS_DARWIN )
#include "darwin_specific.h"
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 * );
+/* Object variables callbacks */
+static int DeinterlaceCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+static int FilterCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
+/**
+ * vout_AspectRatio
+ *
+ * Set the i_aspect_x and i_aspect_y from i_aspect.
+ */
+void vout_AspectRatio( unsigned int i_aspect,
+ /*out*/ unsigned int *i_aspect_x,
+ /*out*/ unsigned int *i_aspect_y )
+{
+ unsigned int i_pgcd = ReduceHeight( i_aspect );
+ *i_aspect_x = i_aspect / i_pgcd;
+ *i_aspect_y = VOUT_ASPECT_FACTOR / i_pgcd;
+}
+
/*****************************************************************************
- * vout_CreateThread: creates a new video output thread
+ * vout_Request: find a video output thread, create one, or destroy one.
*****************************************************************************
- * This function creates a new video output thread, and returns a pointer
- * to its description. On error, it returns NULL.
+ * This function looks for a video output thread matching the current
+ * properties. If not found, it spawns a new one.
*****************************************************************************/
-vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent,
- int i_width, int i_height,
- vlc_fourcc_t i_chroma, int i_aspect )
+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 )
{
- vout_thread_t * p_vout; /* thread descriptor */
- int i_index; /* loop variable */
- char * psz_plugin;
-
- /* Allocate descriptor */
- p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
- if( p_vout == NULL )
+ if( !i_width || !i_height || !i_chroma )
{
- msg_Err( p_parent, "out of memory" );
+ /* Reattach video output to input before bailing out */
+ if( p_vout )
+ {
+ vlc_object_t *p_playlist;
+
+ p_playlist = vlc_object_find( p_this,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+
+ if( p_playlist )
+ {
+ vlc_object_detach( p_vout );
+ vlc_object_attach( p_vout, p_playlist );
+
+ vlc_object_release( p_playlist );
+ }
+ else
+ {
+ msg_Dbg( p_this, "cannot find playlist, destroying vout" );
+ vlc_object_detach( p_vout );
+ vout_Destroy( p_vout );
+ }
+ }
return NULL;
}
- /* 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 )
+ /* If a video output was provided, lock it, otherwise look for one. */
+ if( p_vout )
{
- /* look for the default filter configuration */
- p_vout->psz_filter_chain = config_GetPsz( p_parent, "filter" );
+ vlc_object_yield( p_vout );
}
else
{
- /* continue the parent's filter chain */
- char *psz_end;
+ p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_CHILD );
- 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;
+ if( !p_vout )
+ {
+ vlc_object_t *p_playlist;
+
+ p_playlist = vlc_object_find( p_this,
+ VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( p_playlist )
+ {
+ p_vout = vlc_object_find( p_playlist,
+ VLC_OBJECT_VOUT, FIND_CHILD );
+ /* only first children of p_input for unused vout */
+ if( p_vout && p_vout->p_parent != p_playlist )
+ {
+ vlc_object_release( p_vout );
+ p_vout = NULL;
+ }
+ vlc_object_release( p_playlist );
+ }
+ }
}
- /* Choose the video output module */
- if( !p_vout->psz_filter_chain )
+ /* If we now have a video output, check it has the right properties */
+ if( p_vout )
{
- psz_plugin = config_GetPsz( p_parent, "vout" );
+ char *psz_filter_chain;
+
+ /* We don't directly check for the "filter" variable for obvious
+ * performance reasons. */
+ if( p_vout->b_filter_change )
+ {
+ psz_filter_chain = config_GetPsz( p_this, "filter" );
+
+ if( psz_filter_chain && !*psz_filter_chain )
+ {
+ free( psz_filter_chain );
+ psz_filter_chain = NULL;
+ }
+ if( p_vout->psz_filter_chain && !*p_vout->psz_filter_chain )
+ {
+ free( p_vout->psz_filter_chain );
+ p_vout->psz_filter_chain = NULL;
+ }
+
+ if( ( !psz_filter_chain && !p_vout->psz_filter_chain ) ||
+ ( psz_filter_chain && p_vout->psz_filter_chain &&
+ !strcmp( psz_filter_chain, p_vout->psz_filter_chain ) ) )
+ {
+ p_vout->b_filter_change = VLC_FALSE;
+ }
+
+ if( psz_filter_chain ) free( psz_filter_chain );
+ }
+
+ 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
+ && !p_vout->b_override_aspect ) ||
+ p_vout->b_filter_change )
+ {
+ /* 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 );
+ }
}
- else
+
+ if( !p_vout )
{
- /* the filter chain is a string list of filters separated by double
- * colons */
- char *psz_end;
+ msg_Dbg( p_this, "no usable vout present, spawning one" );
- 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 );
+ p_vout = vout_Create( p_this, i_width, i_height, i_chroma, i_aspect );
}
- /* Initialize pictures and subpictures - translation tables and functions
- * will be initialized later in InitThread */
- for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES; i_index++)
+ return p_vout;
+}
+
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+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 */
+ input_thread_t * p_input_thread;
+ int i_index; /* loop variable */
+ char * psz_plugin;
+ vlc_value_t val, text;
+
+ /* Allocate descriptor */
+ p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
+ if( p_vout == NULL )
{
- p_vout->p_picture[i_index].i_status = FREE_PICTURE;
- p_vout->p_picture[i_index].i_type = EMPTY_PICTURE;
+ msg_Err( p_parent, "out of memory" );
+ return NULL;
}
- for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++)
+ /* Initialize pictures - translation tables and functions
+ * will be initialized later in InitThread */
+ for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++)
{
- p_vout->p_subpicture[i_index].i_status = FREE_SUBPICTURE;
- p_vout->p_subpicture[i_index].i_type = EMPTY_SUBPICTURE;
+ p_vout->p_picture[i_index].pf_lock = NULL;
+ p_vout->p_picture[i_index].pf_unlock = NULL;
+ p_vout->p_picture[i_index].i_status = FREE_PICTURE;
+ p_vout->p_picture[i_index].i_type = EMPTY_PICTURE;
+ p_vout->p_picture[i_index].b_slow = 0;
}
/* No images in the heap */
p_vout->i_heap_size = 0;
+ /* Register the default subpicture channel */
+ p_vout->p_default_channel = NULL;
+ p_vout->i_channel_count = 1;
+
/* Initialize the rendering heap */
I_RENDERPICTURES = 0;
p_vout->render.i_width = i_width;
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->b_interface = 0;
p_vout->b_scale = 1;
p_vout->b_fullscreen = 0;
+ p_vout->i_alignment = 0;
p_vout->render_time = 10;
- p_vout->c_fps_samples= 0;
+ p_vout->c_fps_samples = 0;
+ p_vout->b_filter_change = 0;
+ p_vout->pf_control = 0;
+ p_vout->p_parent_intf = 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-button-down", 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_GetInt( p_vout, "fullscreen" ) )
+ var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
+ val.b_bool = VLC_TRUE;
+ var_Set( p_vout, "intf-change", val );
+
+ /* Initialize locks */
+ 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 );
+
+ /* Attach the new object now so we can use var inheritance below */
+ vlc_object_attach( p_vout, p_parent );
+
+ /* Take care of some "interface/control" related initialisations */
+ vout_IntfInit( p_vout );
+
+ p_vout->b_override_aspect = VLC_FALSE;
+
+ /* 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 )
+ {
+ var_Get( p_vout, "aspect-ratio", &val );
+
+ /* Check whether the user tried to override aspect ratio */
+ if( val.psz_string )
+ {
+ unsigned int i_new_aspect = i_aspect;
+ char *psz_parser = strchr( val.psz_string, ':' );
+
+ if( psz_parser )
+ {
+ *psz_parser++ = '\0';
+ i_new_aspect = atoi( val.psz_string ) * VOUT_ASPECT_FACTOR
+ / atoi( psz_parser );
+ }
+ else
+ {
+ i_new_aspect = i_width * VOUT_ASPECT_FACTOR
+ * atof( val.psz_string )
+ / i_height;
+ }
+
+ free( val.psz_string );
+
+ if( i_new_aspect && i_new_aspect != i_aspect )
+ {
+ unsigned int i_aspect_x, i_aspect_y;
+
+ vout_AspectRatio( i_new_aspect, &i_aspect_x, &i_aspect_y );
+
+ msg_Dbg( p_vout, "overriding source aspect ratio to %i:%i",
+ i_aspect_x, i_aspect_y );
+
+ p_vout->render.i_aspect = i_new_aspect;
+
+ p_vout->b_override_aspect = VLC_TRUE;
+ }
+ }
+
+ /* Look for the default filter configuration */
+ var_Create( p_vout, "filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Get( p_vout, "filter", &val );
+ p_vout->psz_filter_chain = val.psz_string;
+ }
+ else
+ {
+ /* continue the parent's filter chain */
+ char *psz_end;
+
+ psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' );
+ if( psz_end && *(psz_end+1) )
+ p_vout->psz_filter_chain = strdup( psz_end+1 );
+ else p_vout->psz_filter_chain = NULL;
+ }
+
+ /* Choose the video output module */
+ if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain )
+ {
+ var_Create( p_vout, "vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Get( p_vout, "vout", &val );
+ psz_plugin = val.psz_string;
+ }
+ else
{
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
+ /* 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 the dimensions of the video window */
InitWindowSize( p_vout, &p_vout->i_window_width,
&p_vout->i_window_height );
-
+ /* Create the vout thread */
p_vout->p_module = module_Need( p_vout,
- ( p_vout->psz_filter_chain ) ?
- "video filter" : "video output",
- psz_plugin );
+ ( p_vout->psz_filter_chain && *p_vout->psz_filter_chain ) ?
+ "video filter" : "video output", psz_plugin, 0 );
if( psz_plugin ) free( psz_plugin );
if( p_vout->p_module == NULL )
{
msg_Err( p_vout, "no suitable vout module" );
+ vlc_object_detach( p_vout );
vlc_object_destroy( p_vout );
return NULL;
}
- /* Create thread and set locks */
- 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 );
+ /* Initialize subpicture unit */
+ vout_InitSPU( p_vout );
+
+ /* Create a few object variables for interface interaction */
+ var_Create( p_vout, "deinterlace", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
+ text.psz_string = _("Deinterlace");
+ var_Change( p_vout, "deinterlace", VLC_VAR_SETTEXT, &text, NULL );
+ val.psz_string = ""; text.psz_string = _("Disable");
+ var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "discard"; text.psz_string = _("Discard");
+ var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "blend"; text.psz_string = _("Blend");
+ var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "mean"; text.psz_string = _("Mean");
+ var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "bob"; text.psz_string = _("Bob");
+ var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = "linear"; text.psz_string = _("Linear");
+ var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
+ if( var_Get( p_vout, "deinterlace-mode", &val ) == VLC_SUCCESS )
+ {
+ var_Set( p_vout, "deinterlace", val );
+ if( val.psz_string ) free( val.psz_string );
+ }
+ var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );
- vlc_object_attach( p_vout, p_parent );
+
+ var_Create( p_vout, "filter", VLC_VAR_STRING );
+ text.psz_string = _("Filters");
+ var_Change( p_vout, "filter", VLC_VAR_SETTEXT, &text, NULL );
+ var_Change( p_vout, "filter", VLC_VAR_INHERITVALUE, &val, NULL );
+ if( val.psz_string )
+ {
+ var_Set( p_vout, "filter", val );
+ free( val.psz_string );
+ }
+ var_AddCallback( p_vout, "filter", FilterCallback, NULL );
+
+ /* Calculate delay created by internal caching */
+ p_input_thread = (input_thread_t *)vlc_object_find( p_vout,
+ VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( p_input_thread )
+ {
+ p_vout->i_pts_delay = p_input_thread->i_pts_delay;
+ vlc_object_release( p_input_thread );
+ }
+ else
+ {
+ p_vout->i_pts_delay = DEFAULT_PTS_DELAY;
+ }
if( vlc_thread_create( p_vout, "video output", RunThread,
- VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) )
+ VLC_THREAD_PRIORITY_OUTPUT, VLC_TRUE ) )
{
msg_Err( p_vout, "out of memory" );
module_Unneed( p_vout, p_vout->p_module );
+ vlc_object_detach( p_vout );
+ vlc_object_destroy( p_vout );
+ return NULL;
+ }
+
+ if( p_vout->b_error )
+ {
+ msg_Err( p_vout, "video output creation failed" );
+
+ /* Make sure the thread is destroyed */
+ p_vout->b_die = VLC_TRUE;
+
+ vlc_thread_join( p_vout );
+
+ vlc_object_detach( p_vout );
vlc_object_destroy( p_vout );
return NULL;
}
}
/*****************************************************************************
- * 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 )
+void vout_Destroy( vout_thread_t *p_vout )
{
+ vlc_object_t *p_playlist;
+
/* Request thread destruction */
- p_vout->b_die = 1;
+ p_vout->b_die = VLC_TRUE;
vlc_thread_join( p_vout );
+ var_Destroy( p_vout, "intf-change" );
+
+ p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_vout->psz_filter_chain ) free( p_vout->psz_filter_chain );
+
/* Free structure */
vlc_object_destroy( p_vout );
+
+ /* If it was the last vout, tell the interface to show up */
+ if( p_playlist != NULL )
+ {
+ vout_thread_t *p_another_vout = vlc_object_find( p_playlist,
+ VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_another_vout == NULL )
+ {
+ vlc_value_t val;
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-show", val );
+ }
+ else
+ {
+ vlc_object_release( p_another_vout );
+ }
+ vlc_object_release( p_playlist );
+ }
}
/*****************************************************************************
*****************************************************************************/
static int InitThread( vout_thread_t *p_vout )
{
- int i, i_pgcd;
+ int i;
+ unsigned int i_aspect_x, i_aspect_y;
vlc_mutex_lock( &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 VLC_EGENERIC;
+ }
+
msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
- i_pgcd = ReduceHeight( p_vout->render.i_aspect );
+#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 )
+ {
+ vout_AspectRatio( i_new_aspect, &i_aspect_x, &i_aspect_y );
+
+ msg_Dbg( p_vout, "output ratio forced to %i:%i\n",
+ i_aspect_x, i_aspect_y );
+ p_vout->output.i_aspect = i_new_aspect;
+ }
+ }
+ }
+#endif
+
+ vout_AspectRatio( p_vout->render.i_aspect, &i_aspect_x, &i_aspect_y );
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_aspect_x, i_aspect_y );
- i_pgcd = ReduceHeight( p_vout->output.i_aspect );
+ vout_AspectRatio( p_vout->output.i_aspect, &i_aspect_x, &i_aspect_y );
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 );
+ i_aspect_x, i_aspect_y );
/* 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;
- msg_Dbg( p_vout, "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( p_vout, "chroma", NULL );
+ p_vout->chroma.p_module = module_Need( p_vout, "chroma", NULL, 0 );
if( p_vout->chroma.p_module == NULL )
{
msg_Err( p_vout, "no chroma module for %4.4s to %4.4s",
- &p_vout->render.i_chroma, &p_vout->output.i_chroma );
+ (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 VLC_EGENERIC;
}
- if( I_OUTPUTPICTURES < 2 * VOUT_MAX_PICTURES )
- {
- msg_Dbg( p_vout, "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 pictures left */
- msg_Dbg( p_vout, "indirect render, no system pictures needed,"
- " we have %i directbuffers", I_OUTPUTPICTURES );
- msg_Err( p_vout, "this is a bug!" );
- }
+ 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;
}
}
* Initialize thread
*/
p_vout->b_error = InitThread( p_vout );
+
+ /* signal the creation of the vout */
+ vlc_thread_ready( p_vout );
+
if( p_vout->b_error )
{
/* Destroy thread structures allocated by Create and InitThread */
display_date = 0;
current_date = mdate();
-#ifdef STATS
+#if 0
p_vout->c_loops++;
if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
{
}
}
}
-
+
/* If we found better than the last picture, destroy it */
if( p_last_picture && p_picture != p_last_picture )
{
continue;
}
-#if 0
- /* Removed because it causes problems for some people --Meuuh */
- if( display_date > current_date + VOUT_BOGUS_DELAY )
+
+ if( display_date >
+ current_date + p_vout->i_pts_delay + 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 "
- "("I64Fd")", display_date - current_date );
+ msg_Warn( p_vout, "vout warning: early picture skipped "
+ "("I64Fd")", display_date - current_date
+ - p_vout->i_pts_delay );
vlc_mutex_unlock( &p_vout->picture_lock );
continue;
}
-#endif
+
if( display_date > current_date + VOUT_DISPLAY_DELAY )
{
/* A picture is ready to be rendered, but its rendering date
/*
* Call the plugin-specific rendering method if there is one
*/
- if( p_picture != NULL && p_vout->pf_render )
+ if( p_picture != NULL && p_directbuffer != NULL && p_vout->pf_render )
{
/* Render the direct buffer returned by vout_RenderPicture */
p_vout->pf_render( p_vout, p_directbuffer );
/*
* Sleep, wake up
*/
- if( display_date != 0 )
+ if( display_date != 0 && p_directbuffer != NULL )
{
- /* Store render time using a sliding mean */
- p_vout->render_time += mdate() - current_date;
- p_vout->render_time >>= 1;
+ mtime_t current_render_time = mdate() - current_date;
+ /* if render time is very large we don't include it in the mean */
+ if( current_render_time < p_vout->render_time +
+ VOUT_DISPLAY_DELAY )
+ {
+ /* Store render time using a sliding mean weighting to
+ * current value in a 3 to 1 ratio*/
+ p_vout->render_time *= 3;
+ p_vout->render_time += current_render_time;
+ p_vout->render_time >>= 2;
+ }
}
/* Give back change lock */
/* Sleep a while or until a given date */
if( display_date != 0 )
{
- mwait( display_date - VOUT_MWAIT_TOLERANCE );
+ /* If there are filters in the chain, better give them the picture
+ * in advance */
+ if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain )
+ {
+ mwait( display_date - VOUT_MWAIT_TOLERANCE );
+ }
}
else
{
/*
* Display the previously rendered picture
*/
- if( p_picture != NULL )
+ if( p_picture != NULL && p_directbuffer != NULL )
{
/* Display the direct buffer returned by vout_RenderPicture */
if( p_vout->pf_display )
}
/* Need to reinitialise the chroma plugin */
- p_vout->chroma.p_module->pf_deactivate( VLC_OBJECT(p_vout) );
- p_vout->chroma.p_module->pf_activate( VLC_OBJECT(p_vout) );
+ if( p_vout->chroma.p_module )
+ {
+ if( p_vout->chroma.p_module->pf_deactivate )
+ p_vout->chroma.p_module->pf_deactivate( VLC_OBJECT(p_vout) );
+ p_vout->chroma.p_module->pf_activate( VLC_OBJECT(p_vout) );
+ }
+ }
+
+ if( p_vout->i_changes & VOUT_PICTURE_BUFFERS_CHANGE )
+ {
+ /* This happens when the picture buffers need to be recreated.
+ * This is useful on multimonitor displays for instance.
+ *
+ * Warning: This only works when the vout creates only 1 picture
+ * buffer!! */
+ p_vout->i_changes &= ~VOUT_PICTURE_BUFFERS_CHANGE;
+
+ if( !p_vout->b_direct )
+ {
+ module_Unneed( p_vout, p_vout->chroma.p_module );
+ }
+
+ vlc_mutex_lock( &p_vout->picture_lock );
+
+ p_vout->pf_end( p_vout );
+
+ I_OUTPUTPICTURES = I_RENDERPICTURES = 0;
+
+ p_vout->b_error = InitThread( p_vout );
+
+ vlc_mutex_unlock( &p_vout->picture_lock );
}
}
* EndThread: thread destruction
*****************************************************************************
* This function is called when the thread ends after a sucessful
- * initialization. It frees all ressources allocated by InitThread.
+ * initialization. It frees all resources allocated by InitThread.
*****************************************************************************/
static void EndThread( vout_thread_t *p_vout )
{
}
/* Destroy all remaining pictures */
- for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES; i_index++ )
+ for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++ )
{
if ( p_vout->p_picture[i_index].i_type == MEMORY_PICTURE )
{
}
}
- /* Destroy all remaining subpictures */
- for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++ )
- {
- if( p_vout->p_subpicture[i_index].i_status != FREE_SUBPICTURE )
- {
- free( p_vout->p_subpicture[i_index].p_sys );
- }
- }
+ /* Destroy subpicture unit */
+ vout_DestroySPU( p_vout );
/* Destroy translation tables */
p_vout->pf_end( p_vout );
vlc_mutex_destroy( &p_vout->change_lock );
/* Release the module */
- module_Unneed( p_vout, p_vout->p_module );
+ if( p_vout && p_vout->p_module )
+ {
+ module_Unneed( p_vout, p_vout->p_module );
+ }
}
/* following functions are local */
{
int i_dummy = VOUT_ASPECT_FACTOR;
int i_pgcd = 1;
-
+
if( !i_ratio )
{
return i_pgcd;
* 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;
*****************************************************************************
* 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 */
static void InitWindowSize( vout_thread_t *p_vout, int *pi_width,
int *pi_height )
{
+ vlc_value_t val;
int i_width, i_height;
uint64_t ll_zoom;
#define FP_FACTOR 1000 /* our fixed point factor */
- i_width = config_GetInt( p_vout, "width" );
- i_height = config_GetInt( p_vout, "height" );
- ll_zoom = FP_FACTOR * config_GetFloat( p_vout, "zoom" );
+ var_Get( p_vout, "align", &val );
+ p_vout->i_alignment = val.i_int;
+
+ var_Get( p_vout, "width", &val );
+ i_width = val.i_int;
+ var_Get( p_vout, "height", &val );
+ i_height = val.i_int;
+ var_Get( p_vout, "zoom", &val );
+ ll_zoom = (uint64_t)( FP_FACTOR * val.f_float );
- if( (i_width >= 0) && (i_height >= 0))
+ if( i_width > 0 && i_height > 0)
{
- *pi_width = i_width * ll_zoom / FP_FACTOR;
- *pi_height = i_height * ll_zoom / FP_FACTOR;
+ *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
+ *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
return;
}
- else if( i_width >= 0 )
+ else if( i_width > 0 )
{
- *pi_width = i_width * ll_zoom / FP_FACTOR;
- *pi_height = i_width * ll_zoom * VOUT_ASPECT_FACTOR /
- p_vout->render.i_aspect / FP_FACTOR;
+ *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 )
+ else if( i_height > 0 )
{
- *pi_height = i_height * ll_zoom / FP_FACTOR;
- *pi_width = i_height * ll_zoom * p_vout->render.i_aspect /
- VOUT_ASPECT_FACTOR / FP_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 * ll_zoom
- * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR / FP_FACTOR;
- *pi_height = p_vout->render.i_height * ll_zoom / FP_FACTOR;
+ *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 * ll_zoom / FP_FACTOR;
- *pi_height = p_vout->render.i_width * ll_zoom
- * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect / FP_FACTOR;
+ *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 = VLC_TRUE;
+ var_Set( p_vout, "intf-change", val );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * object variables callbacks: a bunch of object variables are used by the
+ * interfaces to interact with the vout.
+ *****************************************************************************/
+static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ input_thread_t *p_input;
+ vlc_value_t val;
+
+ char *psz_mode = newval.psz_string;
+ char *psz_filter;
+ unsigned int i;
+
+ psz_filter = config_GetPsz( p_vout, "filter" );
+
+ if( !psz_mode || !*psz_mode )
+ {
+ config_PutPsz( p_vout, "filter", "" );
+ }
+ else
+ {
+ if( !psz_filter || !*psz_filter )
+ {
+ config_PutPsz( p_vout, "filter", "deinterlace" );
+ }
+ else
+ {
+ if( strstr( psz_filter, "deinterlace" ) == NULL )
+ {
+ psz_filter = realloc( psz_filter, strlen( psz_filter ) + 20 );
+ strcat( psz_filter, ",deinterlace" );
+ }
+ config_PutPsz( p_vout, "filter", psz_filter );
+ }
+ }
+
+ if( psz_filter ) free( psz_filter );
+
+
+ p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT,
+ FIND_PARENT );
+ if( !p_input ) return VLC_EGENERIC;
+
+ if( psz_mode && *psz_mode )
+ {
+ val.psz_string = psz_mode;
+ var_Set( p_vout, "deinterlace-mode", val );
+ /* Modify input as well because the vout might have to be restarted */
+ var_Create( p_input, "deinterlace-mode", VLC_VAR_STRING );
+ var_Set( p_input, "deinterlace-mode", val );
+ }
+
+ /* FIXME FIXME input2 --fenrir */
+#if 0
+ /* now restart all video streams */
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ p_vout->b_filter_change = VLC_TRUE;
+
+#define ES p_input->stream.pp_es[i]
+
+ for( i = 0 ; i < p_input->stream.i_es_number ; i++ )
+ {
+ if( ( ES->i_cat == VIDEO_ES ) && ES->p_dec != NULL )
+ {
+ input_UnselectES( p_input, ES );
+ input_SelectES( p_input, ES );
+ }
+#undef ES
+ }
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ vlc_object_release( p_input );
+#endif
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_vout, "intf-change", val );
+ return VLC_SUCCESS;
+}
+
+static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ input_thread_t *p_input;
+ vlc_value_t val;
+ unsigned int i;
+
+ p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT,
+ FIND_PARENT );
+
+ if (!p_input)
+ {
+ msg_Err( p_vout, "Input not found" );
+ return( VLC_EGENERIC );
+ }
+
+ /* FIXME FIXME input2 --fenrir */
+#if 0
+ /* Restart the video stream */
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ p_vout->b_filter_change = VLC_TRUE;
+
+#define ES p_input->stream.pp_es[i]
+
+ for( i = 0 ; i < p_input->stream.i_es_number ; i++ )
+ {
+ if( ( ES->i_cat == VIDEO_ES ) && ES->p_dec != NULL )
+ {
+ input_UnselectES( p_input, ES );
+ input_SelectES( p_input, ES );
+ }
+#undef ES
+ }
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ vlc_object_release( p_input );
+#endif
+
+ val.b_bool = VLC_TRUE;
+ var_Set( p_vout, "intf-change", val );
+ return VLC_SUCCESS;
+}
+
projects / vlc / blobdiff