* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: video_output.c,v 1.192 2002/10/17 08:24:12 sam 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 <vlc/vlc.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 * );
/*****************************************************************************
- * vout_CreateThread: creates a new video output thread
+ * 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.
+ *****************************************************************************/
+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 )
+{
+ 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 );
+ }
+
+ return NULL;
+ }
+
+ /* If a video output was provided, lock it, otherwise look for one. */
+ if( p_vout )
+ {
+ 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 );
+ }
+ }
+
+ /* 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_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_CreateThread ( vlc_object_t *p_parent,
- int i_width, int i_height,
- vlc_fourcc_t 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_index; /* loop variable */
char * psz_plugin;
+ vlc_value_t val;
/* Allocate descriptor */
p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
return NULL;
}
+ 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 )
{
- /* look for the default filter configuration */
+ 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
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;
- p_vout->i_mouse_x = 0;
- p_vout->i_mouse_y = 0;
- p_vout->i_mouse_button = 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_GetInt( p_vout, "fullscreen" ) )
}
/*****************************************************************************
- * 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 )
{
/* 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" );
+
/* Free structure */
vlc_object_destroy( p_vout );
}
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 );
+#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 );
msg_Dbg( p_vout,
"picture in %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i",
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
{
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;
}
}
p_picture->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
}
- msg_Warn( p_vout, "late picture skipped (%lld)",
+ msg_Warn( p_vout, "late picture skipped ("I64Fd")",
current_date - display_date );
vlc_mutex_unlock( &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;
* 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 */
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_GetInt( p_vout, "width" );
i_height = config_GetInt( p_vout, "height" );
- f_zoom = config_GetFloat( p_vout, "zoom" );
+ 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