X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=a47cb8be9174027d2b6049434383da10ba92f807;hb=89885149e814b2d287dd7166a92eb69f3221f0af;hp=8c9e33395ee17cc7424fb3813c695d76508b8a78;hpb=e2da42f9737f1197cd7e8d768266b5e0c6ec87e7;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 8c9e33395e..a47cb8be91 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1,11 +1,12 @@ /***************************************************************************** * 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. ***************************************************************************** - * Copyright (C) 2000-2001 VideoLAN - * $Id: video_output.c,v 1.202 2002/11/28 17:35:00 sam Exp $ + * Copyright (C) 2000-2004 VideoLAN + * $Id$ * * Authors: Vincent Seguin * @@ -35,8 +36,10 @@ # include #endif -#include "video.h" +#include "vlc_video.h" #include "video_output.h" +#include "vlc_spu.h" +#include /* for input_thread_t and i_pts_delay */ #if defined( SYS_DARWIN ) #include "darwin_specific.h" @@ -51,11 +54,20 @@ static void ErrorThread ( vout_thread_t * ); 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 * ); +/* 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 * ); + +/* From vout_intf.c */ +int vout_Snapshot( vout_thread_t *, picture_t * ); + /***************************************************************************** * vout_Request: find a video output thread, create one, or destroy one. ***************************************************************************** @@ -68,13 +80,29 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, { if( !i_width || !i_height || !i_chroma ) { - /* Reattach video output to p_vlc before bailing out */ + /* Reattach video output to input before bailing out */ if( p_vout ) { - vlc_object_detach( p_vout ); - vlc_object_attach( p_vout, p_this->p_vlc ); - } + vlc_object_t *p_playlist; + p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + + if( p_playlist ) + { + spu_Attach( p_vout->p_spu, p_this, VLC_FALSE ); + 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; } @@ -89,16 +117,63 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, if( !p_vout ) { - p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_ANYWHERE ); + 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 ); + } } } /* If we now have a video output, check it has the right properties */ if( p_vout ) { + char *psz_filter_chain; + vlc_value_t val; + + /* We don't directly check for the "filter" variable for obvious + * performance reasons. */ + if( p_vout->b_filter_change ) + { + var_Get( p_vout, "filter", &val ); + psz_filter_chain = val.psz_string; + + 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 ) + { + 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_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 ); @@ -110,6 +185,7 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, { /* This video output is cool! Hijack it. */ vlc_object_detach( p_vout ); + spu_Attach( p_vout->p_spu, p_this, VLC_TRUE ); vlc_object_attach( p_vout, p_this ); vlc_object_release( p_vout ); } @@ -135,9 +211,11 @@ 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; + 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 ); @@ -147,62 +225,149 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, return NULL; } + /* 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_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; + + /* Initialize the rendering heap */ + I_RENDERPICTURES = 0; + 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->render.i_rmask = 0; + 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->output.i_height = 0; + p_vout->output.i_chroma = 0; + p_vout->output.i_aspect = 0; + + p_vout->output.i_rmask = 0; + p_vout->output.i_gmask = 0; + p_vout->output.i_bmask = 0; + + /* Initialize misc stuff */ + p_vout->i_changes = 0; + p_vout->f_gamma = 0; + p_vout->b_grayscale = 0; + p_vout->b_info = 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->b_filter_change = 0; + p_vout->pf_control = 0; + p_vout->p_parent_intf = 0; + + /* Initialize locks */ + vlc_mutex_init( p_vout, &p_vout->picture_lock ); + vlc_mutex_init( p_vout, &p_vout->change_lock ); + + /* 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 ); + + /* Initialize subpicture unit */ + 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 ); + + 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 ) { - char *psz_aspect = config_GetPsz( p_parent, "aspect-ratio" ); + var_Get( p_vout, "aspect-ratio", &val ); /* Check whether the user tried to override aspect ratio */ - if( psz_aspect ) + if( val.psz_string ) { unsigned int i_new_aspect = i_aspect; - char *psz_parser = strchr( psz_aspect, ':' ); + char *psz_parser = strchr( val.psz_string, ':' ); if( psz_parser ) { *psz_parser++ = '\0'; - i_new_aspect = atoi( psz_aspect ) * VOUT_ASPECT_FACTOR - / atoi( psz_parser ); + i_new_aspect = atoi( val.psz_string ) * VOUT_ASPECT_FACTOR + / atoi( psz_parser ); } else { i_new_aspect = i_width * VOUT_ASPECT_FACTOR - * atof( psz_aspect ) + * atof( val.psz_string ) / i_height; } - free( psz_aspect ); + free( val.psz_string ); if( i_new_aspect && i_new_aspect != i_aspect ) { - int i_pgcd = ReduceHeight( i_new_aspect ); + int 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_new_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd ); + i_aspect_x, i_aspect_y ); - i_aspect = i_new_aspect; + p_vout->render.i_aspect = i_new_aspect; + + p_vout->b_override_aspect = VLC_TRUE; } } /* Look for the default filter configuration */ - p_vout->psz_filter_chain = config_GetPsz( p_parent, "filter" ); + 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, ':' ); + 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 ) + if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain ) { - psz_plugin = config_GetPsz( p_parent, "vout" ); + var_Create( p_vout, "vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_vout, "vout", &val ); + psz_plugin = val.psz_string; } else { @@ -210,108 +375,93 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, * colons */ char *psz_end; - psz_end = strchr( p_vout->psz_filter_chain, ':' ); + 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 */ - for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES; i_index++) - { - p_vout->p_picture[i_index].i_status = FREE_PICTURE; - p_vout->p_picture[i_index].i_type = EMPTY_PICTURE; - } - - for( i_index = 0; i_index < VOUT_MAX_SUBPICTURES; i_index++) - { - p_vout->p_subpicture[i_index].i_status = FREE_SUBPICTURE; - p_vout->p_subpicture[i_index].i_type = EMPTY_SUBPICTURE; - } - - /* No images in the heap */ - p_vout->i_heap_size = 0; - - /* Initialize the rendering heap */ - I_RENDERPICTURES = 0; - 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->render.i_rmask = 0; - 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->output.i_height = 0; - p_vout->output.i_chroma = 0; - p_vout->output.i_aspect = 0; - - p_vout->output.i_rmask = 0; - p_vout->output.i_gmask = 0; - p_vout->output.i_bmask = 0; - - /* Initialize misc stuff */ - p_vout->i_changes = 0; - p_vout->f_gamma = 0; - p_vout->b_grayscale = 0; - p_vout->b_info = 0; - p_vout->b_interface = 0; - p_vout->b_scale = 1; - p_vout->b_fullscreen = 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_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 ); - + /* 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 ); + /* 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 | VLC_VAR_DOINHERIT ); + text.psz_string = _("Filters"); + var_Change( p_vout, "filter", VLC_VAR_SETTEXT, &text, NULL ); + 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; } @@ -329,12 +479,39 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, *****************************************************************************/ void vout_Destroy( vout_thread_t *p_vout ) { + vlc_object_t *p_playlist; + /* Request thread destruction */ 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 ); + } } /***************************************************************************** @@ -346,7 +523,7 @@ void vout_Destroy( vout_thread_t *p_vout ) *****************************************************************************/ static int InitThread( vout_thread_t *p_vout ) { - int i, i_pgcd; + int i, i_aspect_x, i_aspect_y; vlc_mutex_lock( &p_vout->change_lock ); @@ -381,42 +558,19 @@ static int InitThread( vout_thread_t *p_vout ) 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 ); + 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 ); + 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, @@ -464,12 +618,13 @@ static int InitThread( vout_thread_t *p_vout ) 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; @@ -531,6 +686,10 @@ static void RunThread( vout_thread_t *p_vout) * 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 */ @@ -539,7 +698,7 @@ static void RunThread( vout_thread_t *p_vout) } /* - * Main loop - it is not executed if an error occured during + * Main loop - it is not executed if an error occurred during * initialization */ while( (!p_vout->b_die) && (!p_vout->b_error) ) @@ -549,7 +708,7 @@ static void RunThread( vout_thread_t *p_vout) display_date = 0; current_date = mdate(); -#ifdef STATS +#if 0 p_vout->c_loops++; if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) ) { @@ -591,7 +750,7 @@ static void RunThread( vout_thread_t *p_vout) } } } - + /* If we found better than the last picture, destroy it */ if( p_last_picture && p_picture != p_last_picture ) { @@ -638,9 +797,9 @@ static void RunThread( vout_thread_t *p_vout) 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 ); @@ -656,13 +815,14 @@ static void RunThread( vout_thread_t *p_vout) 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 @@ -695,10 +855,16 @@ static void RunThread( vout_thread_t *p_vout) 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 @@ -708,7 +874,7 @@ static void RunThread( vout_thread_t *p_vout) /* * 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 ); @@ -717,11 +883,19 @@ static void RunThread( vout_thread_t *p_vout) /* * 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 */ @@ -730,7 +904,12 @@ static void RunThread( vout_thread_t *p_vout) /* 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 { @@ -744,7 +923,7 @@ static void RunThread( vout_thread_t *p_vout) /* * 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 ) @@ -752,21 +931,24 @@ static void RunThread( vout_thread_t *p_vout) 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 */ if( p_vout->pf_manage && p_vout->pf_manage( p_vout ) ) { - /* A fatal error occured, and the thread must terminate + /* A fatal error occurred, and the thread must terminate * immediately, without displaying anything - setting b_error to 1 * causes the immediate end of the main while() loop. */ p_vout->b_error = 1; @@ -795,8 +977,37 @@ static void RunThread( vout_thread_t *p_vout) } /* 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 ); } } @@ -818,9 +1029,9 @@ static void RunThread( vout_thread_t *p_vout) /***************************************************************************** * ErrorThread: RunThread() error loop ***************************************************************************** - * This function is called when an error occured during thread main's loop. The - * thread can still receive feed, but must be ready to terminate as soon as - * possible. + * This function is called when an error occurred during thread main's loop. + * The thread can still receive feed, but must be ready to terminate as soon + * as possible. *****************************************************************************/ static void ErrorThread( vout_thread_t *p_vout ) { @@ -836,7 +1047,7 @@ static void ErrorThread( vout_thread_t *p_vout ) * 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 ) { @@ -858,7 +1069,7 @@ 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 ) { @@ -866,14 +1077,9 @@ static void EndThread( vout_thread_t *p_vout ) } } - /* 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 */ + 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 ); @@ -892,11 +1098,13 @@ static void DestroyThread( vout_thread_t *p_vout ) { /* Destroy the locks */ vlc_mutex_destroy( &p_vout->picture_lock ); - vlc_mutex_destroy( &p_vout->subpicture_lock ); vlc_mutex_destroy( &p_vout->change_lock ); /* Release the module */ - module_Unneed( p_vout, p_vout->p_module ); + if( p_vout && p_vout->p_module ) + { + module_Unneed( p_vout, p_vout->p_module ); + } } /* following functions are local */ @@ -905,7 +1113,7 @@ static int ReduceHeight( int i_ratio ) { int i_dummy = VOUT_ASPECT_FACTOR; int i_pgcd = 1; - + if( !i_ratio ) { return i_pgcd; @@ -936,6 +1144,13 @@ static int ReduceHeight( int i_ratio ) 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 ***************************************************************************** @@ -994,29 +1209,36 @@ static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask ) 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 = (uint64_t)( FP_FACTOR * config_GetFloat( p_vout, "zoom" ) ); + var_Get( p_vout, "align", &val ); + p_vout->i_alignment = val.i_int; - if( (i_width >= 0) && (i_height >= 0)) + 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) { *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 = (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 = (int)( i_height * ll_zoom / FP_FACTOR ); *pi_width = (int)( i_height * ll_zoom * p_vout->render.i_aspect / @@ -1040,3 +1262,150 @@ static void InitWindowSize( vout_thread_t *p_vout, int *pi_width, #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; +} + +/***************************************************************************** + * 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; + + /* 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. + *****************************************************************************/ +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, *psz_deinterlace = NULL; + + var_Get( p_vout, "filter", &val ); + psz_filter = val.psz_string; + if( psz_filter ) psz_deinterlace = strstr( psz_filter, "deinterlace" ); + + if( !psz_mode || !*psz_mode ) + { + if( psz_deinterlace ) + { + char *psz_src = psz_deinterlace + sizeof("deinterlace") - 1; + if( psz_src[0] == ',' ) psz_src++; + memmove( psz_deinterlace, psz_src, strlen(psz_src) + 1 ); + } + } + 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( !p_input ) return VLC_EGENERIC; + + if( psz_mode && *psz_mode ) + { + /* 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 ); + } + 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, "filter", val ); + if( psz_filter ) free( psz_filter ); + + 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; + + 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, "filter", VLC_VAR_STRING ); + var_Set( p_input, "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; + vlc_object_yield( p_input ); + vlc_thread_create( p_suxor, "suxor", SuxorRestartVideoES, + VLC_THREAD_PRIORITY_LOW, VLC_FALSE ); + } + + vlc_object_release( p_input ); + + return VLC_SUCCESS; +}