/*****************************************************************************
* video_output.c : video output thread
+ *
* This module describes the programming interface for video output threads.
* It includes functions allowing to open a new thread, send pictures to a
* thread, and destroy a previously oppened video output thread.
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
+ * Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "vlc_video.h"
#include "video_output.h"
+#include "vlc_spu.h"
#include <vlc/input.h> /* for input_thread_t and i_pts_delay */
+#include "vlc_playlist.h"
#if defined( SYS_DARWIN )
#include "darwin_specific.h"
static void EndThread ( vout_thread_t * );
static void DestroyThread ( vout_thread_t * );
-static int ReduceHeight ( int );
+static void AspectRatio ( int, int *, int * );
static int BinaryLog ( uint32_t );
static void MaskToShift ( int *, int *, uint32_t );
static void InitWindowSize ( vout_thread_t *, int *, int * );
static int FilterCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+/* From vout_intf.c */
+int vout_Snapshot( vout_thread_t *, picture_t * );
+
/*****************************************************************************
* 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 )
+vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
+ video_format_t *p_fmt )
{
- if( !i_width || !i_height || !i_chroma )
+ if( !p_fmt )
{
/* Reattach video output to input before bailing out */
if( p_vout )
if( p_playlist )
{
- vout_AttachSPU( p_vout, p_this, VLC_FALSE );
+ spu_Attach( p_vout->p_spu, p_this, VLC_FALSE );
vlc_object_detach( p_vout );
vlc_object_attach( p_vout, p_playlist );
if( !p_vout )
{
- vlc_object_t *p_playlist;
+ playlist_t *p_playlist;
p_playlist = vlc_object_find( p_this,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist )
{
+ vlc_mutex_lock( &p_playlist->gc_lock );
p_vout = vlc_object_find( p_playlist,
VLC_OBJECT_VOUT, FIND_CHILD );
/* only first children of p_input for unused vout */
vlc_object_release( p_vout );
p_vout = NULL;
}
+ vlc_mutex_unlock( &p_playlist->gc_lock );
vlc_object_release( p_playlist );
}
}
if( p_vout )
{
char *psz_filter_chain;
+ vlc_value_t val;
- /* We don't directly check for the "filter" variable for obvious
+ /* We don't directly check for the "vout-filter" variable for obvious
* performance reasons. */
if( p_vout->b_filter_change )
{
- psz_filter_chain = config_GetPsz( p_this, "filter" );
+ var_Get( p_vout, "vout-filter", &val );
+ psz_filter_chain = val.psz_string;
if( psz_filter_chain && !*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 ) ) )
+ if( !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
+ if( ( p_vout->fmt_render.i_width != p_fmt->i_width ) ||
+ ( p_vout->fmt_render.i_height != p_fmt->i_height ) ||
+ ( p_vout->fmt_render.i_chroma != p_fmt->i_chroma ) ||
+ ( p_vout->fmt_render.i_aspect != p_fmt->i_aspect
&& !p_vout->b_override_aspect ) ||
p_vout->b_filter_change )
{
{
/* This video output is cool! Hijack it. */
vlc_object_detach( p_vout );
- vout_AttachSPU( p_vout, p_this, VLC_TRUE );
+ spu_Attach( p_vout->p_spu, p_this, VLC_TRUE );
vlc_object_attach( p_vout, p_this );
vlc_object_release( 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 );
+ p_vout = vout_Create( p_this, p_fmt );
}
return p_vout;
* 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 * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
{
vout_thread_t * p_vout; /* thread descriptor */
input_thread_t * p_input_thread;
char * psz_plugin;
vlc_value_t val, text;
+ unsigned int i_width = p_fmt->i_width;
+ unsigned int i_height = p_fmt->i_height;
+ vlc_fourcc_t i_chroma = p_fmt->i_chroma;
+ unsigned int i_aspect = p_fmt->i_aspect;
+
/* Allocate descriptor */
p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
if( p_vout == NULL )
/* 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->fmt_render = *p_fmt; /* FIXME palette */
+ p_vout->fmt_in = *p_fmt; /* FIXME palette */
p_vout->render.i_width = i_width;
p_vout->render.i_height = i_height;
p_vout->render.i_chroma = i_chroma;
/* 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 );
/* Mouse coordinates */
var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
/* Initialize subpicture unit */
- vout_InitSPU( p_vout );
- vout_AttachSPU( p_vout, p_parent, VLC_TRUE );
+ p_vout->p_spu = spu_Create( p_vout );
+ spu_Attach( p_vout->p_spu, p_parent, VLC_TRUE );
/* Attach the new object now so we can use var inheritance below */
vlc_object_attach( p_vout, p_parent );
+ spu_Init( p_vout->p_spu );
+
/* Take care of some "interface/control" related initialisations */
vout_IntfInit( p_vout );
}
else
{
- i_new_aspect = i_width * VOUT_ASPECT_FACTOR
- * atof( val.psz_string )
- / i_height;
+ i_new_aspect = VOUT_ASPECT_FACTOR
+ * atof( val.psz_string );
}
free( val.psz_string );
if( i_new_aspect && i_new_aspect != i_aspect )
{
- unsigned int i_aspect_x, i_aspect_y;
+ int i_aspect_x, i_aspect_y;
- vout_AspectRatio( i_new_aspect, &i_aspect_x, &i_aspect_y );
+ 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 );
}
/* Look for the default filter configuration */
- var_Create( p_vout, "filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_vout, "filter", &val );
+ var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Get( p_vout, "vout-filter", &val );
p_vout->psz_filter_chain = val.psz_string;
+
+ if( p_vout->psz_filter_chain && *p_vout->psz_filter_chain &&
+ strchr( p_vout->psz_filter_chain, ',' ) &&
+ !strchr( p_vout->psz_filter_chain, ':') )
+ {
+ msg_Info( p_vout, "Warning: you are using a deprecated syntax for "
+ "vout-filter." );
+ msg_Info( p_vout, "You must now use ':' as separator instead of "
+ "','." );
+ }
}
else
{
char *psz_end;
psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' );
+ if( !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;
char *psz_end;
psz_end = strchr( p_vout->psz_filter_chain, ':' );
+ if( !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 );
var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );
- var_Create( p_vout, "filter", VLC_VAR_STRING );
+ var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
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 );
+ var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL );
+ var_AddCallback( p_vout, "vout-filter", FilterCallback, NULL );
/* Calculate delay created by internal caching */
p_input_thread = (input_thread_t *)vlc_object_find( p_vout,
*****************************************************************************/
static int InitThread( vout_thread_t *p_vout )
{
- int i;
- unsigned int i_aspect_x, i_aspect_y;
+ int i, i_aspect_x, i_aspect_y;
vlc_mutex_lock( &p_vout->change_lock );
msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
-#if 0
- if( !p_vout->psz_filter_chain )
+ AspectRatio( p_vout->fmt_render.i_aspect, &i_aspect_x, &i_aspect_y );
+
+ msg_Dbg( p_vout, "picture in %ix%i (%i,%i,%ix%i), "
+ "chroma %4.4s, ar %i:%i, sar %i:%i",
+ p_vout->fmt_render.i_width, p_vout->fmt_render.i_height,
+ p_vout->fmt_render.i_x_offset, p_vout->fmt_render.i_y_offset,
+ p_vout->fmt_render.i_visible_width,
+ p_vout->fmt_render.i_visible_height,
+ (char*)&p_vout->fmt_render.i_chroma,
+ i_aspect_x, i_aspect_y,
+ p_vout->fmt_render.i_sar_num, p_vout->fmt_render.i_sar_den );
+
+ AspectRatio( p_vout->fmt_in.i_aspect, &i_aspect_x, &i_aspect_y );
+
+ msg_Dbg( p_vout, "picture user %ix%i (%i,%i,%ix%i), "
+ "chroma %4.4s, ar %i:%i, sar %i:%i",
+ p_vout->fmt_in.i_width, p_vout->fmt_in.i_height,
+ p_vout->fmt_in.i_x_offset, p_vout->fmt_in.i_y_offset,
+ p_vout->fmt_in.i_visible_width,
+ p_vout->fmt_in.i_visible_height,
+ (char*)&p_vout->fmt_in.i_chroma,
+ i_aspect_x, i_aspect_y,
+ p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den );
+
+ if( !p_vout->fmt_out.i_width || !p_vout->fmt_out.i_height )
{
- 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;
- }
- }
+ p_vout->fmt_out.i_width = p_vout->fmt_out.i_visible_width =
+ p_vout->output.i_width;
+ p_vout->fmt_out.i_height = p_vout->fmt_out.i_visible_height =
+ p_vout->output.i_height;
+ p_vout->fmt_out.i_x_offset = p_vout->fmt_out.i_y_offset = 0;
+
+ p_vout->fmt_out.i_aspect = p_vout->output.i_aspect;
+ p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
+ }
+ if( !p_vout->fmt_out.i_sar_num || !p_vout->fmt_out.i_sar_num )
+ {
+ p_vout->fmt_out.i_sar_num = p_vout->fmt_out.i_aspect *
+ p_vout->fmt_out.i_height;
+ p_vout->fmt_out.i_sar_den = VOUT_ASPECT_FACTOR *
+ p_vout->fmt_out.i_width;
}
-#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,
- i_aspect_x, i_aspect_y );
+ vlc_reduce( &p_vout->fmt_out.i_sar_num, &p_vout->fmt_out.i_sar_den,
+ p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den, 0 );
- 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",
+ AspectRatio( p_vout->fmt_out.i_aspect, &i_aspect_x, &i_aspect_y );
+
+ msg_Dbg( p_vout, "picture out %ix%i, chroma %4.4s, ar %i:%i, sar %i:%i",
p_vout->output.i_width, p_vout->output.i_height,
- p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma,
- i_aspect_x, i_aspect_y );
+ (char*)&p_vout->output.i_chroma,
+ i_aspect_x, i_aspect_y,
+ p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den );
/* Calculate shifts from system-updated masks */
MaskToShift( &p_vout->output.i_lrshift, &p_vout->output.i_rrshift,
i_idle_loops++;
}
+ if( p_picture && p_vout->b_snapshot )
+ {
+ p_vout->b_snapshot = VLC_FALSE;
+ vout_Snapshot( p_vout, p_picture );
+ }
+
/*
* Check for subpictures to display
*/
- p_subpic = vout_SortSubPictures( p_vout, display_date );
+ p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date );
/*
* Perform rendering
p_vout->pf_display( p_vout, p_directbuffer );
}
- /* 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;
}
+ if( p_picture != NULL )
+ {
+ /* Reinitialize idle loop count */
+ i_idle_loops = 0;
+ }
+
/*
* Check events and manage thread
*/
}
/* Destroy subpicture unit */
- vout_DestroySPU( p_vout );
+ spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), VLC_FALSE );
+ spu_Destroy( p_vout->p_spu );
/* Destroy translation tables */
p_vout->pf_end( 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 */
return i_pgcd;
}
+static void AspectRatio( int i_aspect, int *i_aspect_x, 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;
+}
+
/*****************************************************************************
* BinaryLog: computes the base 2 log of a binary value
*****************************************************************************
return VLC_SUCCESS;
}
+/*****************************************************************************
+ * Helper thread for object variables callbacks.
+ * Only used to avoid deadlocks when using the video embedded mode.
+ *****************************************************************************/
+typedef struct suxor_thread_t
+{
+ VLC_COMMON_MEMBERS
+ input_thread_t *p_input;
+
+} suxor_thread_t;
+
+static void SuxorRestartVideoES( suxor_thread_t *p_this )
+{
+ vlc_value_t val;
+
+ vlc_thread_ready( p_this );
+
+ /* Now restart current video stream */
+ var_Get( p_this->p_input, "video-es", &val );
+ if( val.i_int >= 0 )
+ {
+ vlc_value_t val_es;
+ val_es.i_int = -VIDEO_ES;
+ var_Set( p_this->p_input, "video-es", val_es );
+ var_Set( p_this->p_input, "video-es", val );
+ }
+
+ vlc_object_release( p_this->p_input );
+
+#ifdef WIN32
+ CloseHandle( p_this->thread_id );
+#endif
+
+ vlc_object_destroy( p_this );
+}
+
/*****************************************************************************
* object variables callbacks: a bunch of object variables are used by the
* interfaces to interact with the vout.
vlc_value_t val;
char *psz_mode = newval.psz_string;
- char *psz_filter;
+ char *psz_filter, *psz_deinterlace = NULL;
- psz_filter = config_GetPsz( p_vout, "filter" );
+ var_Get( p_vout, "vout-filter", &val );
+ psz_filter = val.psz_string;
+ if( psz_filter ) psz_deinterlace = strstr( psz_filter, "deinterlace" );
if( !psz_mode || !*psz_mode )
{
- config_PutPsz( p_vout, "filter", "" );
- }
- else
- {
- if( !psz_filter || !*psz_filter )
+ if( psz_deinterlace )
{
- 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 );
+ char *psz_src = psz_deinterlace + sizeof("deinterlace") - 1;
+ if( psz_src[0] == ':' ) psz_src++;
+ memmove( psz_deinterlace, psz_src, strlen(psz_src) + 1 );
}
}
-
- if( psz_filter ) free( psz_filter );
-
+ else if( !psz_deinterlace )
+ {
+ psz_filter = realloc( psz_filter, strlen( psz_filter ) +
+ sizeof(":deinterlace") );
+ if( psz_filter && *psz_filter ) strcat( psz_filter, ":" );
+ strcat( psz_filter, "deinterlace" );
+ }
p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT,
FIND_PARENT );
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 */
+ val.psz_string = psz_mode;
var_Create( p_input, "deinterlace-mode", VLC_VAR_STRING );
var_Set( p_input, "deinterlace-mode", val );
}
-
- /* Now restart current video stream */
- var_Get( p_input, "video-es", &val );
- if( val.i_int >= 0 )
- {
- p_vout->b_filter_change = VLC_TRUE;
- var_Set( p_input, "video-es", (vlc_value_t)-VIDEO_ES );
- var_Set( p_input, "video-es", val );
- }
-
vlc_object_release( p_input );
val.b_bool = VLC_TRUE;
var_Set( p_vout, "intf-change", val );
+
+ val.psz_string = psz_filter;
+ var_Set( p_vout, "vout-filter", val );
+ if( psz_filter ) free( psz_filter );
+
return VLC_SUCCESS;
}
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 );
}
+ val.b_bool = VLC_TRUE;
+ var_Set( p_vout, "intf-change", val );
+
+ /* Modify input as well because the vout might have to be restarted */
+ val.psz_string = newval.psz_string;
+ var_Create( p_input, "vout-filter", VLC_VAR_STRING );
+
+ var_Set( p_input, "vout-filter", val );
+
/* Now restart current video stream */
var_Get( p_input, "video-es", &val );
if( val.i_int >= 0 )
{
+ suxor_thread_t *p_suxor =
+ vlc_object_create( p_vout, sizeof(suxor_thread_t) );
+ p_suxor->p_input = p_input;
p_vout->b_filter_change = VLC_TRUE;
- var_Set( p_input, "video-es", (vlc_value_t)-VIDEO_ES );
- var_Set( p_input, "video-es", val );
+ vlc_object_yield( p_input );
+ vlc_thread_create( p_suxor, "suxor", SuxorRestartVideoES,
+ VLC_THREAD_PRIORITY_LOW, VLC_FALSE );
}
vlc_object_release( p_input );
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "intf-change", val );
return VLC_SUCCESS;
}
projects / vlc / blobdiff