X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=1301e03aa17459a2803df975955a76e6dd0549e1;hb=c4d9a444ff76374c7bf9487bdc95a9fa0a4a6868;hp=331a45571c5cb3cb520ceeebcb9692cdd0fcdcd9;hpb=fed3ab9a9ad64e7ddb069a6777dd7ab2c35faf5e;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 331a45571c..1301e03aa1 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -5,7 +5,7 @@ * thread, and destroy a previously oppened video output thread. ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: video_output.c,v 1.201 2002/11/28 14:34:39 sam Exp $ + * $Id: video_output.c,v 1.225 2003/05/25 11:31:54 gbazin Exp $ * * Authors: Vincent Seguin * @@ -37,6 +37,7 @@ #include "video.h" #include "video_output.h" +#include /* for input_thread_t and i_pts_delay */ #if defined( SYS_DARWIN ) #include "darwin_specific.h" @@ -56,21 +57,152 @@ 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 FullscreenCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int DeinterlaceCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + /***************************************************************************** - * 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 input before bailing out */ + if( p_vout ) + { + vlc_object_t *p_input; + char *psz_sout = config_GetPsz( p_this, "sout" ); + + p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT ); + + if( p_input && (!psz_sout || !*psz_sout) ) + { + vlc_object_detach( p_vout ); + vlc_object_attach( p_vout, p_input ); + } + else + { + 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; + } + + /* 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 ) + { + vlc_object_t *p_input; + + p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT ); + if( p_input ) + { + p_vout = vlc_object_find( p_input, VLC_OBJECT_VOUT, + FIND_CHILD ); + vlc_object_release( p_input ); + } + } + } + + /* If we now have a video output, check it has the right properties */ + if( p_vout ) + { + char *psz_filter_chain; + + /* We don't directly check for the "filter" variable for obvious + * performance reasons. */ + if( p_vout->b_filter_change ) + { + psz_filter_chain = config_GetPsz( p_this, "filter" ); + + if( psz_filter_chain && !*psz_filter_chain ) + { + free( psz_filter_chain ); + psz_filter_chain = NULL; + } + if( p_vout->psz_filter_chain && !*p_vout->psz_filter_chain ) + { + free( p_vout->psz_filter_chain ); + p_vout->psz_filter_chain = NULL; + } + + if( ( !psz_filter_chain && !p_vout->psz_filter_chain ) || + ( psz_filter_chain && p_vout->psz_filter_chain && + !strcmp( psz_filter_chain, p_vout->psz_filter_chain ) ) ) + { + p_vout->b_filter_change = VLC_FALSE; + } + + if( psz_filter_chain ) free( psz_filter_chain ); + } + + if( ( p_vout->render.i_width != i_width ) || + ( p_vout->render.i_height != i_height ) || + ( p_vout->render.i_chroma != i_chroma ) || + ( p_vout->render.i_aspect != i_aspect + && !p_vout->b_override_aspect ) || + p_vout->b_filter_change ) + { + /* We are not interested in this format, close this vout */ + vlc_object_detach( p_vout ); + vlc_object_release( p_vout ); + vout_Destroy( p_vout ); + p_vout = NULL; + } + else + { + /* This video output is cool! Hijack it. */ + vlc_object_detach( p_vout ); + vlc_object_attach( p_vout, p_this ); + vlc_object_release( p_vout ); + } + } + + 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, - 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, + 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 ); @@ -80,6 +212,12 @@ vout_thread_t * __vout_CreateThread ( 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 ) @@ -115,6 +253,8 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent, i_new_aspect / i_pgcd, VOUT_ASPECT_FACTOR / i_pgcd ); i_aspect = i_new_aspect; + + p_vout->b_override_aspect = VLC_TRUE; } } @@ -133,7 +273,7 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent, } /* 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" ); } @@ -154,6 +294,8 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent, * will be initialized later in InitThread */ for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES; 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; } @@ -201,27 +343,31 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent, p_vout->b_scale = 1; p_vout->b_fullscreen = 0; p_vout->render_time = 10; - p_vout->c_fps_samples= 0; + p_vout->c_fps_samples = 0; + p_vout->b_filter_change = 0; /* Mouse coordinates */ var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER ); var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER ); + var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER ); var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL ); var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER ); - - /* user requested fullscreen? */ - if( config_GetInt( p_vout, "fullscreen" ) ) - { - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; - } + var_Create( p_vout, "key-pressed", VLC_VAR_STRING ); /* Initialize the dimensions of the video window */ InitWindowSize( p_vout, &p_vout->i_window_width, &p_vout->i_window_height ); + /* 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 ); p_vout->p_module = module_Need( p_vout, - ( p_vout->psz_filter_chain ) ? + ( p_vout->psz_filter_chain && + *p_vout->psz_filter_chain ) ? "video filter" : "video output", psz_plugin ); @@ -233,15 +379,54 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent, 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, "fullscreen", VLC_VAR_BOOL ); + text.psz_string = _("Fullscreen"); + var_Change( p_vout, "fullscreen", VLC_VAR_SETTEXT, &text, NULL ); + var_Change( p_vout, "fullscreen", VLC_VAR_INHERITVALUE, &val, NULL ); + if( val.b_bool ) + { + /* user requested fullscreen */ + p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; + } + var_AddCallback( p_vout, "fullscreen", FullscreenCallback, NULL ); + + 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 ); + } + var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL ); - vlc_object_attach( p_vout, p_parent ); + /* 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 ); @@ -253,19 +438,21 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent, } /***************************************************************************** - * 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 ); } @@ -314,6 +501,7 @@ 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" ); @@ -334,6 +522,7 @@ static int InitThread( vout_thread_t *p_vout ) } } } +#endif i_pgcd = ReduceHeight( p_vout->render.i_aspect ); msg_Dbg( p_vout, @@ -400,7 +589,8 @@ static int InitThread( vout_thread_t *p_vout ) 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; @@ -462,6 +652,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 */ @@ -480,7 +674,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) ) { @@ -522,7 +716,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 ) { @@ -569,9 +763,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 ); @@ -587,13 +781,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 @@ -639,7 +834,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 ); @@ -648,7 +843,7 @@ 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; @@ -675,7 +870,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 ) @@ -726,7 +921,8 @@ 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) ); + 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) ); } } @@ -802,7 +998,8 @@ static void EndThread( vout_thread_t *p_vout ) { if( p_vout->p_subpicture[i_index].i_status != FREE_SUBPICTURE ) { - free( p_vout->p_subpicture[i_index].p_sys ); + vout_DestroySubPicture( p_vout, + &p_vout->p_subpicture[i_index] ); } } @@ -934,20 +1131,20 @@ static void InitWindowSize( vout_thread_t *p_vout, int *pi_width, i_height = config_GetInt( p_vout, "height" ); ll_zoom = (uint64_t)( FP_FACTOR * config_GetFloat( p_vout, "zoom" ) ); - if( (i_width >= 0) && (i_height >= 0)) + 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 / @@ -971,3 +1168,121 @@ 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; +} + +/***************************************************************************** + * object variables callbacks: a bunch of object variables are used by the + * interfaces to interact with the vout. + *****************************************************************************/ +static int FullscreenCallback( 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_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; + + p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT, + FIND_PARENT ); + if( p_input ) + { + /* Modify input as well because the vout might have to be restarted */ + var_Create( p_input, "fullscreen", VLC_VAR_BOOL ); + var_Set( p_input, "fullscreen", newval ); + + vlc_object_release( p_input ); + } + + val.b_bool = VLC_TRUE; + var_Set( p_vout, "intf-change", val ); + return VLC_SUCCESS; +} + +static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) +{ + vout_thread_t *p_vout = (vout_thread_t *)p_this; + input_thread_t *p_input; + vlc_value_t val; + + char *psz_mode = newval.psz_string; + char *psz_filter; + unsigned int i; + + psz_filter = config_GetPsz( p_vout, "filter" ); + + if( !psz_mode || !*psz_mode ) + { + config_PutPsz( p_vout, "filter", "" ); + } + else + { + if( !psz_filter || !*psz_filter ) + { + config_PutPsz( p_vout, "filter", "deinterlace" ); + } + else + { + if( strstr( psz_filter, "deinterlace" ) == NULL ) + { + psz_filter = realloc( psz_filter, strlen( psz_filter ) + 20 ); + strcat( psz_filter, ",deinterlace" ); + } + config_PutPsz( p_vout, "filter", psz_filter ); + } + } + + if( psz_filter ) free( psz_filter ); + + + p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT, + FIND_PARENT ); + if( !p_input ) return VLC_EGENERIC; + + if( psz_mode && *psz_mode ) + { + val.psz_string = psz_mode; + var_Set( p_vout, "deinterlace-mode", val ); + /* Modify input as well because the vout might have to be restarted */ + var_Create( p_input, "deinterlace-mode", VLC_VAR_STRING ); + var_Set( p_input, "deinterlace-mode", val ); + } + + /* now restart all video streams */ + vlc_mutex_lock( &p_input->stream.stream_lock ); + + p_vout->b_filter_change = VLC_TRUE; + +#define ES p_input->stream.pp_es[i] + + for( i = 0 ; i < p_input->stream.i_es_number ; i++ ) + { + if( ( ES->i_cat == VIDEO_ES ) && ES->p_decoder_fifo != NULL ) + { + input_UnselectES( p_input, ES ); + input_SelectES( p_input, ES ); + } +#undef ES + } + vlc_mutex_unlock( &p_input->stream.stream_lock ); + + vlc_object_release( p_input ); + + val.b_bool = VLC_TRUE; + var_Set( p_vout, "intf-change", val ); + return VLC_SUCCESS; +}