X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=7e77af015a728f6d9b181509108b013ef56d5813;hb=c4fef7e0c05f6e406186630b1b3566e951b805ce;hp=cf4e1d74db7eee33836a23e03c26e0cbedf94a8d;hpb=922a7a8e9352415eb576e0623cbf89092b178d1e;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index cf4e1d74db..7e77af015a 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1,13 +1,15 @@ /***************************************************************************** * 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.217 2003/03/28 17:02:25 gbazin Exp $ + * Copyright (C) 2000-2004 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin + * Gildas Bazin * * 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 @@ -21,7 +23,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -35,11 +37,13 @@ # 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 */ +#include "vlc_playlist.h" -#if defined( SYS_DARWIN ) +#if defined( __APPLE__ ) #include "darwin_specific.h" #endif @@ -52,10 +56,18 @@ 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. @@ -63,35 +75,34 @@ static void InitWindowSize ( vout_thread_t *, int *, int * ); * 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 ) { - vlc_object_t *p_input; - char *psz_sout = config_GetPsz( p_this, "sout" ); + vlc_object_t *p_playlist; - p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT ); + p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); - if( p_input && (!psz_sout || !*psz_sout) ) + if( p_playlist ) { + spu_Attach( p_vout->p_spu, p_this, VLC_FALSE ); vlc_object_detach( p_vout ); - vlc_object_attach( p_vout, p_input ); + 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 ); - vlc_object_release( p_vout ); vout_Destroy( p_vout ); } - if( psz_sout ) free( psz_sout ); - if( p_input ) vlc_object_release( p_input ); } - return NULL; } @@ -106,14 +117,23 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, if( !p_vout ) { - vlc_object_t *p_input; + playlist_t *p_playlist; - p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT ); - if( p_input ) + p_playlist = vlc_object_find( p_this, + VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + if( p_playlist ) { - p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, - FIND_CHILD ); - vlc_object_release( p_input ); + 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 */ + if( p_vout && p_vout->p_parent != (vlc_object_t *)p_playlist ) + { + vlc_object_release( p_vout ); + p_vout = NULL; + } + vlc_mutex_unlock( &p_playlist->gc_lock ); + vlc_object_release( p_playlist ); } } } @@ -122,12 +142,14 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, 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 ) { @@ -140,9 +162,7 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, 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; } @@ -150,11 +170,10 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, 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 ) || + 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_filter_change ) { /* We are not interested in this format, close this vout */ @@ -167,6 +186,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 ); } @@ -176,7 +196,7 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *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; @@ -188,15 +208,18 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *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; int i_index; /* loop variable */ char * psz_plugin; - vlc_value_t val; + 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 ); @@ -206,98 +229,19 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, return NULL; } - var_Create( p_vout, "intf-change", VLC_VAR_BOOL ); - val.b_bool = VLC_TRUE; - var_Set( p_vout, "intf-change", val ); - - 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" ); - - /* 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; - - p_vout->b_override_aspect = VLC_TRUE; - } - } - - /* Look for the default filter configuration */ - p_vout->psz_filter_chain = config_GetPsz( p_parent, "filter" ); - } - else - { - /* continue the parent's filter chain */ - char *psz_end; - - psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' ); - if( psz_end && *(psz_end+1) ) - p_vout->psz_filter_chain = strdup( psz_end+1 ); - else p_vout->psz_filter_chain = NULL; - } - - /* Choose the video output module */ - if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain ) - { - psz_plugin = config_GetPsz( p_parent, "vout" ); - } - else - { - /* the filter chain is a string list of filters separated by double - * colons */ - char *psz_end; - - psz_end = strchr( p_vout->psz_filter_chain, ':' ); - if( psz_end ) - psz_plugin = strndup( p_vout->psz_filter_chain, - psz_end - p_vout->psz_filter_chain ); - else psz_plugin = strdup( p_vout->psz_filter_chain ); - } + stats_Create( p_vout, "displayed_pictures", VLC_VAR_INTEGER, + STATS_COUNTER ); + stats_Create( p_vout, "lost_pictures", VLC_VAR_INTEGER, STATS_COUNTER ); - /* Initialize pictures and subpictures - translation tables and functions + /* Initialize pictures - translation tables and functions * will be initialized later in InitThread */ - 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++) { 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; - } - - 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; + p_vout->p_picture[i_index].b_slow = 0; } /* No images in the heap */ @@ -305,6 +249,12 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, /* Initialize the rendering heap */ I_RENDERPICTURES = 0; + + vlc_ureduce( &p_fmt->i_sar_num, &p_fmt->i_sar_den, + p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 ); + 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; @@ -336,9 +286,17 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, 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; + p_vout->i_par_num = p_vout->i_par_den = 1; + + /* 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 ); @@ -346,33 +304,105 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, 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 ); - var_Create( p_vout, "key-pressed", VLC_VAR_STRING ); - /* user requested fullscreen? */ - if( config_GetInt( p_vout, "fullscreen" ) ) + /* 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 ); + + /* 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 */ + 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; + } + else { - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; + /* continue the parent's filter chain */ + char *psz_end; + + psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' ); + if( psz_end && *(psz_end+1) ) + p_vout->psz_filter_chain = strdup( psz_end+1 ); + else p_vout->psz_filter_chain = NULL; } - /* Initialize the dimensions of the video window */ - InitWindowSize( p_vout, &p_vout->i_window_width, - &p_vout->i_window_height ); + /* 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 + { + /* 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 ); + } + /* Create the vout thread */ p_vout->p_module = module_Need( p_vout, - ( p_vout->psz_filter_chain && - *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 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 ); + val.psz_string = "x"; text.psz_string = "X"; + 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 ); + + + var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + text.psz_string = _("Filters"); + 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, VLC_OBJECT_INPUT, FIND_ANYWHERE ); @@ -386,18 +416,26 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, p_vout->i_pts_delay = DEFAULT_PTS_DELAY; } - /* 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 ); - - vlc_object_attach( p_vout, p_parent ); - 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; } @@ -415,14 +453,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 ); + } } /***************************************************************************** @@ -434,7 +497,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 ); @@ -469,42 +532,63 @@ 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 ) + 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 ) - { - 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; - } - } + 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 - 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->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 ); + vlc_ureduce( &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 ); - i_pgcd = ReduceHeight( p_vout->output.i_aspect ); - 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 ); + AspectRatio( p_vout->fmt_out.i_aspect, &i_aspect_x, &i_aspect_y ); + + msg_Dbg( p_vout, "picture out %ix%i (%i,%i,%ix%i), " + "chroma %4.4s, ar %i:%i, sar %i:%i", + p_vout->fmt_out.i_width, p_vout->fmt_out.i_height, + p_vout->fmt_out.i_x_offset, p_vout->fmt_out.i_y_offset, + p_vout->fmt_out.i_visible_width, + p_vout->fmt_out.i_visible_height, + (char*)&p_vout->fmt_out.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, @@ -552,7 +636,7 @@ 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 ) { @@ -614,12 +698,16 @@ static void RunThread( vout_thread_t *p_vout) picture_t * p_last_picture = NULL; /* last picture */ picture_t * p_directbuffer; /* direct buffer to display */ - subpicture_t * p_subpic; /* subpicture pointer */ + subpicture_t * p_subpic = NULL; /* subpicture pointer */ /* * 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 */ @@ -628,7 +716,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) ) @@ -638,7 +726,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) ) { @@ -702,9 +790,12 @@ static void RunThread( vout_thread_t *p_vout) p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date; + /* XXX: config_GetInt is slow, but this kind of frame dropping + * should not happen that often. */ if( !p_picture->b_force && p_picture != p_last_picture && - display_date < current_date + p_vout->render_time ) + display_date < current_date + p_vout->render_time && + config_GetInt( p_vout, "skip-frames" ) ) { /* Picture is late: it will be destroyed and the thread * will directly choose the next picture */ @@ -723,13 +814,14 @@ static void RunThread( vout_thread_t *p_vout) } msg_Warn( p_vout, "late picture skipped ("I64Fd")", current_date - display_date ); + stats_UpdateInteger( p_vout, "lost_pictures", 1 ); vlc_mutex_unlock( &p_vout->picture_lock ); continue; } if( display_date > - current_date + p_vout->i_pts_delay + VOUT_BOGUS_DELAY ) + 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 ); @@ -745,6 +837,7 @@ static void RunThread( vout_thread_t *p_vout) p_picture->i_status = DESTROYED_PICTURE; p_vout->i_heap_size--; } + stats_UpdateInteger( p_vout, "lost_pictures", 1 ); msg_Warn( p_vout, "vout warning: early picture skipped " "("I64Fd")", display_date - current_date - p_vout->i_pts_delay ); @@ -785,14 +878,24 @@ 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 ); + if( display_date > 0 ) + { + p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date ); + } /* * Perform rendering */ + stats_UpdateInteger( p_vout, "displayed_pictures", 1 ); p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic ); /* @@ -809,9 +912,17 @@ static void RunThread( vout_thread_t *p_vout) */ 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 */ @@ -820,7 +931,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 { @@ -842,21 +958,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; @@ -885,8 +1004,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 ); } } @@ -908,9 +1056,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 ) { @@ -926,7 +1074,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 ) { @@ -948,7 +1096,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 ) { @@ -956,15 +1104,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 ) - { - vout_DestroySubPicture( p_vout, - &p_vout->p_subpicture[i_index] ); - } - } + /* 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 ); @@ -983,11 +1125,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 */ @@ -996,7 +1140,7 @@ static int ReduceHeight( int i_ratio ) { int i_dummy = VOUT_ASPECT_FACTOR; int i_pgcd = 1; - + if( !i_ratio ) { return i_pgcd; @@ -1027,6 +1171,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 ***************************************************************************** @@ -1077,71 +1228,151 @@ static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask ) } /***************************************************************************** - * InitWindowSize: find the initial dimensions the video window should have. - ***************************************************************************** - * This function will check the "width", "height" and "zoom" config options and - * will calculate the size that the video window should have. + * vout_VarCallback: generic callback for intf variables *****************************************************************************/ -static void InitWindowSize( vout_thread_t *p_vout, int *pi_width, - int *pi_height ) +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 { - int i_width, i_height; - uint64_t ll_zoom; + VLC_COMMON_MEMBERS + input_thread_t *p_input; + +} suxor_thread_t; -#define FP_FACTOR 1000 /* our fixed point factor */ +static void SuxorRestartVideoES( suxor_thread_t *p_this ) +{ + vlc_value_t val; - 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" ) ); + vlc_thread_ready( p_this ); - if( (i_width >= 0) && (i_height >= 0)) + /* Now restart current video stream */ + var_Get( p_this->p_input, "video-es", &val ); + if( val.i_int >= 0 ) { - *pi_width = (int)( i_width * ll_zoom / FP_FACTOR ); - *pi_height = (int)( i_height * ll_zoom / FP_FACTOR ); - return; + 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 ); } - else if( i_width >= 0 ) + + 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, "vout-filter", &val ); + psz_filter = val.psz_string; + if( psz_filter ) psz_deinterlace = strstr( psz_filter, "deinterlace" ); + + if( !psz_mode || !*psz_mode ) { - *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; + 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( i_height >= 0 ) + else if( !psz_deinterlace ) { - *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; + psz_filter = realloc( psz_filter, strlen( psz_filter ) + + sizeof(":deinterlace") ); + if( psz_filter && *psz_filter ) strcat( psz_filter, ":" ); + strcat( psz_filter, "deinterlace" ); } - if( p_vout->render.i_height * p_vout->render.i_aspect - >= p_vout->render.i_width * VOUT_ASPECT_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 + 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 ) { - *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 ); + /* 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, "vout-filter", val ); + if( psz_filter ) free( psz_filter ); -#undef FP_FACTOR + return VLC_SUCCESS; } -/***************************************************************************** - * 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 ) +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; + vout_thread_t *p_vout = (vout_thread_t *)p_this; + input_thread_t *p_input; vlc_value_t val; - val.b_bool = 1; + + 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 ); - return 0; + + /* 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; + 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; }