X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=c090c111fc1394d24c50f11260946a24204890d4;hb=7e7f8be16ba22cf63c5b45887dc690e5c4c0f340;hp=27de3886e668edbfc80c5461cd1c9d30ade52f98;hpb=67daaa16e0ce6cea8878f48b44fb9b19f5e66d12;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 27de3886e6..cb17af39d4 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -10,6 +10,7 @@ * * Authors: Vincent Seguin * Gildas Bazin + * Laurent Aimar * * 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 @@ -37,1699 +38,1109 @@ #include /* free() */ #include - - -#ifdef HAVE_SYS_TIMES_H -# include -#endif +#include #include #include -#include -#include - -#if defined( __APPLE__ ) -/* Include darwin_specific.h here if needed */ -#endif - -/** FIXME This is quite ugly but needed while we don't have counters - * helpers */ -//#include "input/input_internal.h" +#include #include -#include -#include "vout_pictures.h" #include "vout_internal.h" +#include "interlacing.h" +#include "postprocessing.h" +#include "display.h" /***************************************************************************** * Local prototypes *****************************************************************************/ -static int InitThread ( vout_thread_t * ); -static void* RunThread ( void * ); -static void ErrorThread ( vout_thread_t * ); -static void CleanThread ( vout_thread_t * ); -static void EndThread ( vout_thread_t * ); - -static void AspectRatio ( int, int *, int * ); - -static void VideoFormatImportRgb( video_format_t *, const picture_heap_t * ); -static void PictureHeapFixRgb( picture_heap_t * ); - -static void vout_Destructor ( vlc_object_t * p_this ); - -/* 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 * ); -static int VideoFilter2Callback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); - -/* From vout_intf.c */ -int vout_Snapshot( vout_thread_t *, picture_t * ); - -/* Display media title in OSD */ -static void DisplayTitleOnOSD( vout_thread_t *p_vout ); +static void *Thread(void *); +static void VoutDestructor(vlc_object_t *); -/* Time during which the thread will sleep if it has nothing to - * display (in micro-seconds) */ -#define VOUT_IDLE_SLEEP ((int)(0.020*CLOCK_FREQ)) +/* Maximum delay between 2 displayed pictures. + * XXX it is needed for now but should be removed in the long term. + */ +#define VOUT_REDISPLAY_DELAY (INT64_C(80000)) -/* Maximum lap of time allowed between the beginning of rendering and - * display. If, compared to the current date, the next image is too - * late, the thread will perform an idle loop. This time should be - * at least VOUT_IDLE_SLEEP plus the time required to render a few - * images, to avoid trashing of decoded images */ -#define VOUT_DISPLAY_DELAY ((int)(0.200*CLOCK_FREQ)) +/** + * Late pictures having a delay higher than this value are thrashed. + */ +#define VOUT_DISPLAY_LATE_THRESHOLD (INT64_C(20000)) /* Better be in advance when awakening than late... */ -#define VOUT_MWAIT_TOLERANCE ((mtime_t)(0.020*CLOCK_FREQ)) - -/* Minimum number of direct pictures the video output will accept without - * creating additional pictures in system memory */ -#ifdef OPTIMIZE_MEMORY -# define VOUT_MIN_DIRECT_PICTURES (VOUT_MAX_PICTURES/2) -#else -# define VOUT_MIN_DIRECT_PICTURES (3*VOUT_MAX_PICTURES/4) -#endif - -/***************************************************************************** - * Video Filter2 functions - *****************************************************************************/ -static picture_t *video_new_buffer_filter( filter_t *p_filter ) -{ - vout_thread_t *p_vout = (vout_thread_t*)p_filter->p_owner; - picture_t *p_picture = vout_CreatePicture( p_vout, 0, 0, 0 ); - - p_picture->i_status = READY_PICTURE; - - return p_picture; -} - -static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic ) -{ - vout_thread_t *p_vout = (vout_thread_t*)p_filter->p_owner; - - vlc_mutex_lock( &p_vout->picture_lock ); - vout_UsePictureLocked( p_vout, p_pic ); - vlc_mutex_unlock( &p_vout->picture_lock ); -} +#define VOUT_MWAIT_TOLERANCE (INT64_C(1000)) -static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data ) -{ - p_filter->pf_vout_buffer_new = video_new_buffer_filter; - p_filter->pf_vout_buffer_del = video_del_buffer_filter; - p_filter->p_owner = p_data; /* p_vout */ - return VLC_SUCCESS; -} - -/***************************************************************************** - * 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, - video_format_t *p_fmt ) +/* */ +static int VoutValidateFormat(video_format_t *dst, + const video_format_t *src) { - if( !p_fmt ) - { - /* Video output is no longer used. - * TODO: support for reusing video outputs with proper _thread-safe_ - * reference handling. */ - if( p_vout ) - vout_CloseAndRelease( p_vout ); - return NULL; - } - - /* If a video output was provided, lock it, otherwise look for one. */ - if( p_vout ) - { - vlc_object_hold( p_vout ); - } - - /* TODO: find a suitable unused video output */ - - /* If we now have a video output, check it has the right properties */ - if( p_vout ) - { - char *psz_filter_chain; - vlc_value_t val; - - vlc_mutex_lock( &p_vout->change_lock ); - - /* We don't directly check for the "vout-filter" variable for obvious - * performance reasons. */ - if( p_vout->p->b_filter_change ) - { - var_Get( p_vout, "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->p->psz_filter_chain && !*p_vout->p->psz_filter_chain ) - { - free( p_vout->p->psz_filter_chain ); - p_vout->p->psz_filter_chain = NULL; - } - - if( !psz_filter_chain && !p_vout->p->psz_filter_chain ) - { - p_vout->p->b_filter_change = false; - } - - free( psz_filter_chain ); - } - - if( p_vout->fmt_render.i_chroma != p_fmt->i_chroma || - p_vout->fmt_render.i_width != p_fmt->i_width || - p_vout->fmt_render.i_height != p_fmt->i_height || - p_vout->p->b_filter_change ) - { - vlc_mutex_unlock( &p_vout->change_lock ); - - /* We are not interested in this format, close this vout */ - vout_CloseAndRelease( p_vout ); - vlc_object_release( p_vout ); - p_vout = NULL; - } - else - { - /* This video output is cool! Hijack it. */ - if( p_vout->fmt_render.i_aspect != p_fmt->i_aspect ) - { - /* Correct aspect ratio on change - * FIXME factorize this code with other aspect ration related code */ - unsigned int i_sar_num; - unsigned int i_sar_den; - unsigned int i_aspect; - - i_aspect = p_fmt->i_aspect; - vlc_ureduce( &i_sar_num, &i_sar_den, - p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 ); -#if 0 - /* What's that, it does not seems to be used correcly everywhere - * beside the previous p_vout->fmt_render.i_aspect != p_fmt->i_aspect - * should be fixed to use it too then */ - if( p_vout->i_par_num > 0 && p_vout->i_par_den > 0 ) - { - i_sar_num *= p_vout->i_par_den; - i_sar_den *= p_vout->i_par_num; - i_aspect = i_aspect * p_vout->i_par_den / p_vout->i_par_num; - } -#endif - - if( i_sar_num > 0 && i_sar_den > 0 && i_aspect > 0 ) - { - p_vout->fmt_in.i_sar_num = i_sar_num; - p_vout->fmt_in.i_sar_den = i_sar_den; - p_vout->fmt_in.i_aspect = i_aspect; - - p_vout->fmt_render.i_sar_num = i_sar_num; - p_vout->fmt_render.i_sar_den = i_sar_den; - p_vout->fmt_render.i_aspect = i_aspect; - - p_vout->render.i_aspect = i_aspect; - - p_vout->i_changes |= VOUT_ASPECT_CHANGE; - - } - } - vlc_mutex_unlock( &p_vout->change_lock ); - - vlc_object_release( p_vout ); - } - - if( p_vout ) - { - msg_Dbg( p_this, "reusing provided vout" ); - - spu_Attach( p_vout->p_spu, p_this, true ); - - vlc_object_detach( p_vout ); - vlc_object_attach( p_vout, p_this ); - } - } - - if( !p_vout ) - { - msg_Dbg( p_this, "no usable vout present, spawning one" ); + if (src->i_width <= 0 || src->i_height <= 0) + return VLC_EGENERIC; + if (src->i_sar_num <= 0 || src->i_sar_den <= 0) + return VLC_EGENERIC; - p_vout = vout_Create( p_this, p_fmt ); + /* */ + video_format_Copy(dst, src); + dst->i_chroma = vlc_fourcc_GetCodec(VIDEO_ES, src->i_chroma); + vlc_ureduce( &dst->i_sar_num, &dst->i_sar_den, + src->i_sar_num, src->i_sar_den, 50000 ); + if (dst->i_sar_num <= 0 || dst->i_sar_den <= 0) { + dst->i_sar_num = 1; + dst->i_sar_den = 1; } - - return p_vout; + video_format_FixRgb(dst); + return VLC_SUCCESS; } -/***************************************************************************** - * 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_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) +static vout_thread_t *VoutCreate(vlc_object_t *object, + const vout_configuration_t *cfg) { - vout_thread_t * p_vout; /* thread descriptor */ - int i_index; /* loop variable */ - 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; - - config_chain_t *p_cfg; - char *psz_parser; - char *psz_name; - - if( i_width <= 0 || i_height <= 0 || i_aspect <= 0 ) - return NULL; - - vlc_ureduce( &p_fmt->i_sar_num, &p_fmt->i_sar_den, - p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 ); - if( p_fmt->i_sar_num <= 0 || p_fmt->i_sar_den <= 0 ) + video_format_t original; + if (VoutValidateFormat(&original, cfg->fmt)) return NULL; /* Allocate descriptor */ - static const char typename[] = "video output"; - p_vout = vlc_custom_create( p_parent, sizeof( *p_vout ), VLC_OBJECT_VOUT, - typename ); - if( p_vout == NULL ) + vout_thread_t *vout = vlc_custom_create(object, + sizeof(*vout) + sizeof(*vout->p), + VLC_OBJECT_VOUT, "video output"); + if (!vout) { + video_format_Clean(&original); return NULL; + } /* */ - p_vout->p = calloc( 1, sizeof(*p_vout->p) ); - if( !p_vout->p ) - { - vlc_object_release( p_vout ); - return NULL; - } + vout->p = (vout_thread_sys_t*)&vout[1]; - /* 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; - } + vout->p->original = original; - /* No images in the heap */ - p_vout->i_heap_size = 0; - - /* Initialize the rendering heap */ - I_RENDERPICTURES = 0; - - p_vout->fmt_render = *p_fmt; /* FIXME palette */ - p_vout->fmt_in = *p_fmt; /* FIXME palette */ - - p_vout->render.i_width = i_width; - p_vout->render.i_height = i_height; - p_vout->render.i_chroma = i_chroma; - p_vout->render.i_aspect = i_aspect; - - p_vout->render.i_rmask = p_fmt->i_rmask; - p_vout->render.i_gmask = p_fmt->i_gmask; - p_vout->render.i_bmask = p_fmt->i_bmask; - - 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->b_scale = 1; - p_vout->b_fullscreen = 0; - p_vout->i_alignment = 0; - p_vout->p->render_time = 10; - p_vout->p->c_fps_samples = 0; - p_vout->p->i_picture_lost = 0; - p_vout->p->i_picture_displayed = 0; - p_vout->p->b_filter_change = 0; - p_vout->p->b_paused = false; - p_vout->p->i_pause_date = 0; - p_vout->pf_control = NULL; - p_vout->p->i_par_num = - p_vout->p->i_par_den = 1; - p_vout->p->p_picture_displayed = NULL; - p_vout->p->i_picture_displayed_date = 0; - p_vout->p->b_picture_displayed = false; - p_vout->p->b_picture_empty = false; + vout_control_Init(&vout->p->control); + vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_INIT); - /* Initialize locks */ - vlc_mutex_init( &p_vout->picture_lock ); - vlc_cond_init( &p_vout->p->picture_wait ); - vlc_mutex_init( &p_vout->change_lock ); - vlc_mutex_init( &p_vout->p->vfilter_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_BOOL ); + vout_statistic_Init(&vout->p->statistic); + vout->p->i_par_num = + vout->p->i_par_den = 1; - /* Initialize subpicture unit */ - p_vout->p_spu = spu_Create( p_vout ); - spu_Attach( p_vout->p_spu, p_parent, true ); + vout_snapshot_Init(&vout->p->snapshot); + + /* Initialize locks */ + vlc_mutex_init(&vout->p->picture_lock); + vlc_mutex_init(&vout->p->vfilter_lock); /* Attach the new object now so we can use var inheritance below */ - vlc_object_attach( p_vout, p_parent ); + vlc_object_attach(vout, object); - spu_Init( p_vout->p_spu ); + /* Initialize subpicture unit */ + vout->p->p_spu = spu_Create(vout); /* 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( vlc_internals( p_parent )->i_object_type != VLC_OBJECT_VOUT ) - { - /* Look for the default filter configuration */ - p_vout->p->psz_filter_chain = - var_CreateGetStringCommand( p_vout, "vout-filter" ); - - /* Apply video filter2 objects on the first vout */ - p_vout->p->psz_vf2 = - var_CreateGetStringCommand( p_vout, "video-filter" ); - } - else - { - /* continue the parent's filter chain */ - char *psz_tmp; - - /* Ugly hack to jump to our configuration chain */ - p_vout->p->psz_filter_chain - = ((vout_thread_t *)p_parent)->p->psz_filter_chain; - p_vout->p->psz_filter_chain - = config_ChainCreate( &psz_tmp, &p_cfg, p_vout->p->psz_filter_chain ); - config_ChainDestroy( p_cfg ); - free( psz_tmp ); - - /* Create a video filter2 var ... but don't inherit values */ - var_Create( p_vout, "video-filter", - VLC_VAR_STRING | VLC_VAR_ISCOMMAND ); - p_vout->p->psz_vf2 = var_GetString( p_vout, "video-filter" ); + vout_IntfInit(vout); + + /* Get splitter name if present */ + char *splitter_name = var_GetNonEmptyString(vout, "vout-filter"); + if (splitter_name) { + if (asprintf(&vout->p->splitter_name, "%s,none", splitter_name) < 0) + vout->p->splitter_name = NULL; + free(splitter_name); + } else { + vout->p->splitter_name = NULL; } - var_AddCallback( p_vout, "video-filter", VideoFilter2Callback, NULL ); - p_vout->p->p_vf2_chain = filter_chain_New( p_vout, "video filter2", - false, video_filter_buffer_allocation_init, NULL, p_vout ); + /* */ + vout_InitInterlacingSupport(vout, vout->p->displayed.is_interlaced); - /* Choose the video output module */ - if( !p_vout->p->psz_filter_chain || !*p_vout->p->psz_filter_chain ) - { - var_Create( p_vout, "vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Get( p_vout, "vout", &val ); - psz_parser = val.psz_string; - } - else - { - psz_parser = strdup( p_vout->p->psz_filter_chain ); - p_vout->p->b_title_show = false; - } + /* */ + vlc_object_set_destructor(vout, VoutDestructor); - /* Create the vout thread */ - char* psz_tmp = config_ChainCreate( &psz_name, &p_cfg, psz_parser ); - free( psz_parser ); - free( psz_tmp ); - p_vout->p_cfg = p_cfg; - p_vout->p_module = module_need( p_vout, - ( p_vout->p->psz_filter_chain && *p_vout->p->psz_filter_chain ) ? - "video filter" : "video output", psz_name, p_vout->p->psz_filter_chain && *p_vout->p->psz_filter_chain ); - free( psz_name ); - - vlc_object_set_destructor( p_vout, vout_Destructor ); - - if( p_vout->p_module == NULL ) - { - msg_Err( p_vout, "no suitable vout module" ); - vlc_object_release( p_vout ); + /* */ + if (vlc_clone(&vout->p->thread, Thread, vout, + VLC_THREAD_PRIORITY_OUTPUT)) { + vlc_object_release(vout); return NULL; } + spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), true); - /* 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 = (char *)""; text.psz_string = _("Disable"); - var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = (char *)"discard"; text.psz_string = _("Discard"); - var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = (char *)"blend"; text.psz_string = _("Blend"); - var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = (char *)"mean"; text.psz_string = _("Mean"); - var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = (char *)"bob"; text.psz_string = _("Bob"); - var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = (char *)"linear"; text.psz_string = _("Linear"); - var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = (char *)"x"; text.psz_string = (char *)"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 ); - 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 ); - - vlc_cond_init( &p_vout->p->change_wait ); - if( vlc_clone( &p_vout->p->thread, RunThread, p_vout, - VLC_THREAD_PRIORITY_OUTPUT ) ) - { - module_unneed( p_vout, p_vout->p_module ); - p_vout->p_module = NULL; - vlc_object_release( p_vout ); + vout_control_WaitEmpty(&vout->p->control); + + if (vout->p->dead) { + msg_Err(vout, "video output creation failed"); + vout_CloseAndRelease(vout); return NULL; } - vlc_mutex_lock( &p_vout->change_lock ); - while( !p_vout->p->b_ready ) - { /* We are (ab)using the same condition in opposite directions for - * b_ready and b_done. This works because of the strict ordering. */ - assert( !p_vout->p->b_done ); - vlc_cond_wait( &p_vout->p->change_wait, &p_vout->change_lock ); - } - vlc_mutex_unlock( &p_vout->change_lock ); + return vout; +} - if( p_vout->b_error ) - { - msg_Err( p_vout, "video output creation failed" ); - vout_CloseAndRelease( p_vout ); +vout_thread_t *(vout_Request)(vlc_object_t *object, + const vout_configuration_t *cfg) +{ + vout_thread_t *vout = cfg->vout; + if (!cfg->fmt) { + if (vout) + vout_CloseAndRelease(vout); return NULL; } - return p_vout; + /* If a vout is provided, try reusing it */ + if (vout) { + spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), false); + vlc_object_detach(vout); + vlc_object_attach(vout, object); + spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), true); + + vout_control_cmd_t cmd; + vout_control_cmd_Init(&cmd, VOUT_CONTROL_REINIT); + cmd.u.cfg = cfg; + + vout_control_Push(&vout->p->control, &cmd); + vout_control_WaitEmpty(&vout->p->control); + if (!vout->p->dead) { + msg_Dbg(object, "reusing provided vout"); + return vout; + } + vout_CloseAndRelease(vout); + + msg_Warn(object, "cannot reuse provided vout"); + } + return VoutCreate(object, cfg); } /***************************************************************************** - * vout_Close: Close a vout created by vout_Create. + * vout_Close: Close a vout created by VoutCreate. ***************************************************************************** - * You HAVE to call it on vout created by vout_Create before vlc_object_release. - * You should NEVER call it on vout not obtained through vout_Create + * You HAVE to call it on vout created by VoutCreate before vlc_object_release. + * You should NEVER call it on vout not obtained through VoutCreate * (like with vout_Request or vlc_object_find.) * You can use vout_CloseAndRelease() as a convenience method. *****************************************************************************/ -void vout_Close( vout_thread_t *p_vout ) +void vout_Close(vout_thread_t *vout) { - assert( p_vout ); - - vlc_mutex_lock( &p_vout->change_lock ); - p_vout->p->b_done = true; - vlc_cond_signal( &p_vout->p->change_wait ); - vlc_mutex_unlock( &p_vout->change_lock ); - vlc_join( p_vout->p->thread, NULL ); - module_unneed( p_vout, p_vout->p_module ); - p_vout->p_module = NULL; -} + assert(vout); -/* */ -static void vout_Destructor( vlc_object_t * p_this ) -{ - vout_thread_t *p_vout = (vout_thread_t *)p_this; - - /* Make sure the vout was stopped first */ - assert( !p_vout->p_module ); + spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), false); + vlc_object_detach(vout->p->p_spu); - /* */ - spu_Destroy( p_vout->p_spu ); + vout_snapshot_End(&vout->p->snapshot); - /* Destroy the locks */ - vlc_cond_destroy( &p_vout->p->change_wait ); - vlc_cond_destroy( &p_vout->p->picture_wait ); - vlc_mutex_destroy( &p_vout->picture_lock ); - vlc_mutex_destroy( &p_vout->change_lock ); - vlc_mutex_destroy( &p_vout->p->vfilter_lock ); - - free( p_vout->p->psz_filter_chain ); - free( p_vout->p->psz_title ); - - config_ChainDestroy( p_vout->p_cfg ); - - free( p_vout->p ); - -#ifndef __APPLE__ - vout_thread_t *p_another_vout; - - /* This is a dirty hack mostly for Linux, where there is no way to get the - * GUI back if you closed it while playing video. This is solved in - * Mac OS X, where we have this novelty called menubar, that will always - * allow you access to the applications main functionality. They should try - * that on linux sometime. */ - p_another_vout = vlc_object_find( p_this->p_libvlc, - VLC_OBJECT_VOUT, FIND_ANYWHERE ); - if( p_another_vout == NULL ) - var_SetBool( p_this->p_libvlc, "intf-show", true ); - else - vlc_object_release( p_another_vout ); -#endif + vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_CLEAN); + vlc_join(vout->p->thread, NULL); } /* */ -void vout_ChangePause( vout_thread_t *p_vout, bool b_paused, mtime_t i_date ) +static void VoutDestructor(vlc_object_t *object) { - vlc_mutex_lock( &p_vout->change_lock ); - - assert( !p_vout->p->b_paused || !b_paused ); + vout_thread_t *vout = (vout_thread_t *)object; - vlc_mutex_lock( &p_vout->picture_lock ); + /* Make sure the vout was stopped first */ + //assert(!vout->p_module); - p_vout->p->i_picture_displayed_date = 0; + free(vout->p->splitter_name); - if( p_vout->p->b_paused ) - { - const mtime_t i_duration = i_date - p_vout->p->i_pause_date; + /* */ + spu_Destroy(vout->p->p_spu); - for( int i_index = 0; i_index < I_RENDERPICTURES; i_index++ ) - { - picture_t *p_pic = PP_RENDERPICTURE[i_index]; + /* Destroy the locks */ + vlc_mutex_destroy(&vout->p->picture_lock); + vlc_mutex_destroy(&vout->p->vfilter_lock); + vout_control_Clean(&vout->p->control); - if( p_pic->i_status == READY_PICTURE ) - p_pic->date += i_duration; - } - vlc_cond_signal( &p_vout->p->picture_wait ); - vlc_mutex_unlock( &p_vout->picture_lock ); + /* */ + vout_statistic_Clean(&vout->p->statistic); - spu_OffsetSubtitleDate( p_vout->p_spu, i_duration ); - } - else - { - vlc_mutex_unlock( &p_vout->picture_lock ); - } - p_vout->p->b_paused = b_paused; - p_vout->p->i_pause_date = i_date; + /* */ + vout_snapshot_Clean(&vout->p->snapshot); - vlc_mutex_unlock( &p_vout->change_lock ); + video_format_Clean(&vout->p->original); } -void vout_GetResetStatistic( vout_thread_t *p_vout, int *pi_displayed, int *pi_lost ) +/* */ +void vout_ChangePause(vout_thread_t *vout, bool is_paused, mtime_t date) { - vlc_mutex_lock( &p_vout->change_lock ); - - *pi_displayed = p_vout->p->i_picture_displayed; - *pi_lost = p_vout->p->i_picture_lost; + vout_control_cmd_t cmd; + vout_control_cmd_Init(&cmd, VOUT_CONTROL_PAUSE); + cmd.u.pause.is_on = is_paused; + cmd.u.pause.date = date; + vout_control_Push(&vout->p->control, &cmd); - p_vout->p->i_picture_displayed = 0; - p_vout->p->i_picture_lost = 0; - - vlc_mutex_unlock( &p_vout->change_lock ); + vout_control_WaitEmpty(&vout->p->control); } -void vout_Flush( vout_thread_t *p_vout, mtime_t i_date ) +void vout_GetResetStatistic(vout_thread_t *vout, int *displayed, int *lost) { - vlc_mutex_lock( &p_vout->picture_lock ); - p_vout->p->i_picture_displayed_date = 0; - for( int i = 0; i < p_vout->render.i_pictures; i++ ) - { - picture_t *p_pic = p_vout->render.pp_picture[i]; - - if( p_pic->i_status == READY_PICTURE || - p_pic->i_status == DISPLAYED_PICTURE ) - { - /* We cannot change picture status if it is in READY_PICTURE state, - * Just make sure they won't be displayed */ - if( p_pic->date > i_date ) - p_pic->date = i_date; - } - } - vlc_cond_signal( &p_vout->p->picture_wait ); - vlc_mutex_unlock( &p_vout->picture_lock ); + vout_statistic_GetReset( &vout->p->statistic, displayed, lost ); } -void vout_FixLeaks( vout_thread_t *p_vout, bool b_forced ) +void vout_Flush(vout_thread_t *vout, mtime_t date) { - int i_pic, i_ready_pic; - - vlc_mutex_lock( &p_vout->picture_lock ); + vout_control_PushTime(&vout->p->control, VOUT_CONTROL_FLUSH, date); + vout_control_WaitEmpty(&vout->p->control); +} - for( i_pic = 0, i_ready_pic = 0; i_pic < p_vout->render.i_pictures && !b_forced; i_pic++ ) - { - const picture_t *p_pic = p_vout->render.pp_picture[i_pic]; +void vout_Reset(vout_thread_t *vout) +{ + vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_RESET); + vout_control_WaitEmpty(&vout->p->control); +} - if( p_pic->i_status == READY_PICTURE ) - { - i_ready_pic++; - /* If we have at least 2 ready pictures, wait for the vout thread to - * process one */ - if( i_ready_pic >= 2 ) - break; +bool vout_IsEmpty(vout_thread_t *vout) +{ + vlc_mutex_lock(&vout->p->picture_lock); - continue; - } + picture_t *picture = picture_fifo_Peek(vout->p->decoder_fifo); + if (picture) + picture_Release(picture); - if( p_pic->i_status == DISPLAYED_PICTURE ) - { - /* If at least one displayed picture is not referenced - * let vout free it */ - if( p_pic->i_refcount == 0 ) - break; - } - } - if( i_pic < p_vout->render.i_pictures && !b_forced ) - { - vlc_mutex_unlock( &p_vout->picture_lock ); - return; - } + vlc_mutex_unlock(&vout->p->picture_lock); - /* Too many pictures are still referenced, there is probably a bug - * with the decoder */ - if( !b_forced ) - msg_Err( p_vout, "pictures leaked, resetting the heap" ); - - /* Just free all the pictures */ - for( i_pic = 0; i_pic < p_vout->render.i_pictures; i_pic++ ) - { - picture_t *p_pic = p_vout->render.pp_picture[i_pic]; - - msg_Dbg( p_vout, "[%d] %d %d", i_pic, p_pic->i_status, p_pic->i_refcount ); - p_pic->i_refcount = 0; - - switch( p_pic->i_status ) - { - case READY_PICTURE: - case DISPLAYED_PICTURE: - case RESERVED_PICTURE: - if( p_pic != p_vout->p->p_picture_displayed ) - vout_UsePictureLocked( p_vout, p_pic ); - break; - } - } - vlc_cond_signal( &p_vout->p->picture_wait ); - vlc_mutex_unlock( &p_vout->picture_lock ); + return !picture; } -void vout_NextPicture( vout_thread_t *p_vout, mtime_t *pi_duration ) -{ - vlc_mutex_lock( &p_vout->picture_lock ); - const mtime_t i_displayed_date = p_vout->p->i_picture_displayed_date; +void vout_FixLeaks( vout_thread_t *vout ) +{ + vlc_mutex_lock(&vout->p->picture_lock); - p_vout->p->b_picture_displayed = false; - p_vout->p->b_picture_empty = false; - if( p_vout->p->p_picture_displayed ) - { - p_vout->p->p_picture_displayed->date = 1; - vlc_cond_signal( &p_vout->p->picture_wait ); + picture_t *picture = picture_fifo_Peek(vout->p->decoder_fifo); + if (!picture) { + picture = picture_pool_Get(vout->p->decoder_pool); } - while( !p_vout->p->b_picture_displayed && !p_vout->p->b_picture_empty ) - vlc_cond_wait( &p_vout->p->picture_wait, &p_vout->picture_lock ); + if (picture) { + picture_Release(picture); + /* Not all pictures has been displayed yet or some are + * free */ + vlc_mutex_unlock(&vout->p->picture_lock); + return; + } - *pi_duration = __MAX( p_vout->p->i_picture_displayed_date - i_displayed_date, 0 ); + /* There is no reason that no pictures are available, force one + * from the pool, becarefull with it though */ + msg_Err(vout, "pictures leaked, trying to workaround"); - /* TODO advance subpicture by the duration ... */ + /* */ + picture_pool_NonEmpty(vout->p->decoder_pool, false); - vlc_mutex_unlock( &p_vout->picture_lock ); + vlc_mutex_unlock(&vout->p->picture_lock); } - -void vout_DisplayTitle( vout_thread_t *p_vout, const char *psz_title ) +void vout_NextPicture(vout_thread_t *vout, mtime_t *duration) { - assert( psz_title ); + vout_control_cmd_t cmd; + vout_control_cmd_Init(&cmd, VOUT_CONTROL_STEP); + cmd.u.time_ptr = duration; - if( !config_GetInt( p_vout, "osd" ) ) - return; - - vlc_mutex_lock( &p_vout->change_lock ); - free( p_vout->p->psz_title ); - p_vout->p->psz_title = strdup( psz_title ); - vlc_mutex_unlock( &p_vout->change_lock ); + vout_control_Push(&vout->p->control, &cmd); + vout_control_WaitEmpty(&vout->p->control); } -/***************************************************************************** - * InitThread: initialize video output thread - ***************************************************************************** - * This function is called from RunThread and performs the second step of the - * initialization. It returns 0 on success. Note that the thread's flag are not - * modified inside this function. - * XXX You have to enter it with change_lock taken. - *****************************************************************************/ -static int ChromaCreate( vout_thread_t *p_vout ); -static void ChromaDestroy( vout_thread_t *p_vout ); - -static bool ChromaIsEqual( const picture_heap_t *p_output, const picture_heap_t *p_render ) +void vout_DisplayTitle(vout_thread_t *vout, const char *title) { - if( !vout_ChromaCmp( p_output->i_chroma, p_render->i_chroma ) ) - return false; - - if( p_output->i_chroma != FOURCC_RV15 && - p_output->i_chroma != FOURCC_RV16 && - p_output->i_chroma != FOURCC_RV24 && - p_output->i_chroma != FOURCC_RV32 ) - return true; - - return p_output->i_rmask == p_render->i_rmask && - p_output->i_gmask == p_render->i_gmask && - p_output->i_bmask == p_render->i_bmask; + assert(title); + vout_control_PushString(&vout->p->control, VOUT_CONTROL_OSD_TITLE, title); } -static int InitThread( vout_thread_t *p_vout ) +void vout_PutSubpicture( vout_thread_t *vout, subpicture_t *subpic ) { - int i, i_aspect_x, i_aspect_y; - - /* Initialize output method, it allocates direct buffers for us */ - if( p_vout->pf_init( p_vout ) ) - return VLC_EGENERIC; - - p_vout->p->p_picture_displayed = NULL; - - if( !I_OUTPUTPICTURES ) - { - msg_Err( p_vout, "plugin was unable to allocate at least " - "one direct buffer" ); - p_vout->pf_end( p_vout ); - return VLC_EGENERIC; - } - - if( I_OUTPUTPICTURES > VOUT_MAX_PICTURES ) - { - msg_Err( p_vout, "plugin allocated too many direct buffers, " - "our internal buffers must have overflown." ); - p_vout->pf_end( p_vout ); - return VLC_EGENERIC; - } + spu_DisplaySubpicture(vout->p->p_spu, subpic); +} +int vout_RegisterSubpictureChannel( vout_thread_t *vout ) +{ + return spu_RegisterChannel(vout->p->p_spu); +} +void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel ) +{ + spu_ClearChannel(vout->p->p_spu, channel); +} - msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES ); - - 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 ) - { - 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; - } +/* vout_Control* are usable by anyone at anytime */ +void vout_ControlChangeFullscreen(vout_thread_t *vout, bool fullscreen) +{ + vout_control_PushBool(&vout->p->control, VOUT_CONTROL_FULLSCREEN, + fullscreen); +} +void vout_ControlChangeOnTop(vout_thread_t *vout, bool is_on_top) +{ + vout_control_PushBool(&vout->p->control, VOUT_CONTROL_ON_TOP, + is_on_top); +} +void vout_ControlChangeDisplayFilled(vout_thread_t *vout, bool is_filled) +{ + vout_control_PushBool(&vout->p->control, VOUT_CONTROL_DISPLAY_FILLED, + is_filled); +} +void vout_ControlChangeZoom(vout_thread_t *vout, int num, int den) +{ + vout_control_PushPair(&vout->p->control, VOUT_CONTROL_ZOOM, + num, den); +} +void vout_ControlChangeSampleAspectRatio(vout_thread_t *vout, + unsigned num, unsigned den) +{ + vout_control_PushPair(&vout->p->control, VOUT_CONTROL_ASPECT_RATIO, + num, den); +} +void vout_ControlChangeCropRatio(vout_thread_t *vout, + unsigned num, unsigned den) +{ + vout_control_PushPair(&vout->p->control, VOUT_CONTROL_CROP_RATIO, + num, den); +} +void vout_ControlChangeCropWindow(vout_thread_t *vout, + int x, int y, int width, int height) +{ + vout_control_cmd_t cmd; + vout_control_cmd_Init(&cmd, VOUT_CONTROL_CROP_WINDOW); + cmd.u.window.x = x; + cmd.u.window.y = y; + cmd.u.window.width = width; + cmd.u.window.height = height; + + vout_control_Push(&vout->p->control, &cmd); +} +void vout_ControlChangeCropBorder(vout_thread_t *vout, + int left, int top, int right, int bottom) +{ + vout_control_cmd_t cmd; + vout_control_cmd_Init(&cmd, VOUT_CONTROL_CROP_BORDER); + cmd.u.border.left = left; + cmd.u.border.top = top; + cmd.u.border.right = right; + cmd.u.border.bottom = bottom; + + vout_control_Push(&vout->p->control, &cmd); +} +void vout_ControlChangeFilters(vout_thread_t *vout, const char *filters) +{ + vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_FILTERS, + filters); +} +void vout_ControlChangeSubFilters(vout_thread_t *vout, const char *filters) +{ + vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_SUB_FILTERS, + filters); +} - 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 ); - - 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 ); - - /* FIXME removed the need of both fmt_* and heap infos */ - /* Calculate shifts from system-updated masks */ - PictureHeapFixRgb( &p_vout->render ); - VideoFormatImportRgb( &p_vout->fmt_render, &p_vout->render ); - - PictureHeapFixRgb( &p_vout->output ); - VideoFormatImportRgb( &p_vout->fmt_out, &p_vout->output ); - - /* Check whether we managed to create direct buffers similar to - * the render buffers, ie same size and chroma */ - if( ( p_vout->output.i_width == p_vout->render.i_width ) - && ( p_vout->output.i_height == p_vout->render.i_height ) - && ( ChromaIsEqual( &p_vout->output, &p_vout->render ) ) ) - { - /* Cool ! We have direct buffers, we can ask the decoder to - * directly decode into them ! Map the first render buffers to - * the first direct buffers, but keep the first direct buffer - * for memcpy operations */ - p_vout->p->b_direct = true; - - for( i = 1; i < VOUT_MAX_PICTURES; i++ ) - { - if( p_vout->p_picture[ i ].i_type != DIRECT_PICTURE && - I_RENDERPICTURES >= VOUT_MIN_DIRECT_PICTURES - 1 && - p_vout->p_picture[ i - 1 ].i_type == DIRECT_PICTURE ) - { - /* We have enough direct buffers so there's no need to - * try to use system memory buffers. */ - break; - } - PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ]; - I_RENDERPICTURES++; - } +/* */ +static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, const char *title) +{ + /* Load configuration */ + cfg->is_fullscreen = var_CreateGetBool(vout, "fullscreen"); + cfg->display.title = title; + const int display_width = var_CreateGetInteger(vout, "width"); + const int display_height = var_CreateGetInteger(vout, "height"); + cfg->display.width = display_width > 0 ? display_width : 0; + cfg->display.height = display_height > 0 ? display_height : 0; + cfg->is_display_filled = var_CreateGetBool(vout, "autoscale"); + cfg->display.sar.num = 1; /* TODO monitor AR */ + cfg->display.sar.den = 1; + unsigned zoom_den = 1000; + unsigned zoom_num = zoom_den * var_CreateGetFloat(vout, "scale"); + vlc_ureduce(&zoom_num, &zoom_den, zoom_num, zoom_den, 0); + cfg->zoom.num = zoom_num; + cfg->zoom.den = zoom_den; + cfg->align.vertical = VOUT_DISPLAY_ALIGN_CENTER; + cfg->align.horizontal = VOUT_DISPLAY_ALIGN_CENTER; + const int align_mask = var_CreateGetInteger(vout, "align"); + if (align_mask & 0x1) + cfg->align.horizontal = VOUT_DISPLAY_ALIGN_LEFT; + else if (align_mask & 0x2) + cfg->align.horizontal = VOUT_DISPLAY_ALIGN_RIGHT; + if (align_mask & 0x4) + cfg->align.horizontal = VOUT_DISPLAY_ALIGN_TOP; + else if (align_mask & 0x8) + cfg->align.horizontal = VOUT_DISPLAY_ALIGN_BOTTOM; +} - msg_Dbg( p_vout, "direct render, mapping " - "render pictures 0-%i to system pictures 1-%i", - VOUT_MAX_PICTURES - 2, VOUT_MAX_PICTURES - 1 ); - } - else - { - /* Rats... Something is wrong here, we could not find an output - * plugin able to directly render what we decode. See if we can - * find a chroma plugin to do the conversion */ - p_vout->p->b_direct = false; - - if( ChromaCreate( p_vout ) ) - { - p_vout->pf_end( p_vout ); - return VLC_EGENERIC; +vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd, + const vout_window_cfg_t *cfg) +{ + VLC_UNUSED(vd); + vout_window_cfg_t cfg_override = *cfg; + + if (!var_InheritBool( vout, "embedded-video")) + cfg_override.is_standalone = true; + + if (vout->p->window.is_unused && vout->p->window.object) { + assert(!vout->p->splitter_name); + if (!cfg_override.is_standalone == !vout->p->window.cfg.is_standalone && + cfg_override.type == vout->p->window.cfg.type) { + /* Reuse the stored window */ + msg_Dbg(vout, "Reusing previous vout window"); + vout_window_t *window = vout->p->window.object; + if (cfg_override.width != vout->p->window.cfg.width || + cfg_override.height != vout->p->window.cfg.height) + vout_window_SetSize(window, + cfg_override.width, cfg_override.height); + vout->p->window.is_unused = false; + vout->p->window.cfg = cfg_override; + return window; } - msg_Dbg( p_vout, "indirect render, mapping " - "render pictures 0-%i to system pictures %i-%i", - VOUT_MAX_PICTURES - 1, I_OUTPUTPICTURES, - I_OUTPUTPICTURES + VOUT_MAX_PICTURES - 1 ); - - /* Append render buffers after the direct buffers */ - for( i = I_OUTPUTPICTURES; i < 2 * VOUT_MAX_PICTURES; i++ ) - { - PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ]; - I_RENDERPICTURES++; - - /* Check if we have enough render pictures */ - if( I_RENDERPICTURES == VOUT_MAX_PICTURES ) - break; - } + vout_window_Delete(vout->p->window.object); + vout->p->window.is_unused = true; + vout->p->window.object = NULL; } - /* Link pictures back to their heap */ - for( i = 0 ; i < I_RENDERPICTURES ; i++ ) - { - PP_RENDERPICTURE[ i ]->p_heap = &p_vout->render; + vout_window_t *window = vout_window_New(VLC_OBJECT(vout), NULL, + &cfg_override); + if (!window) + return NULL; + if (!vout->p->splitter_name) { + vout->p->window.is_unused = false; + vout->p->window.cfg = cfg_override; + vout->p->window.object = window; } + return window; +} - for( i = 0 ; i < I_OUTPUTPICTURES ; i++ ) - { - PP_OUTPUTPICTURE[ i ]->p_heap = &p_vout->output; +void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_display_t *vd, + vout_window_t *window) +{ + VLC_UNUSED(vd); + if (!vout->p->window.is_unused && vout->p->window.object == window) { + vout->p->window.is_unused = true; + } else if (vout->p->window.is_unused && vout->p->window.object && !window) { + vout_window_Delete(vout->p->window.object); + vout->p->window.is_unused = true; + vout->p->window.object = NULL; + } else if (window) { + vout_window_Delete(window); } +} +/* */ +static picture_t *VoutVideoFilterNewPicture(filter_t *filter) +{ + vout_thread_t *vout = (vout_thread_t*)filter->p_owner; + return picture_pool_Get(vout->p->private_pool); +} +static void VoutVideoFilterDelPicture(filter_t *filter, picture_t *picture) +{ + VLC_UNUSED(filter); + picture_Release(picture); +} +static int VoutVideoFilterAllocationSetup(filter_t *filter, void *data) +{ + filter->pf_video_buffer_new = VoutVideoFilterNewPicture; + filter->pf_video_buffer_del = VoutVideoFilterDelPicture; + filter->p_owner = data; /* vout */ return VLC_SUCCESS; } -/***************************************************************************** - * RunThread: video output thread - ***************************************************************************** - * Video output thread. This function does only returns when the thread is - * terminated. It handles the pictures arriving in the video heap and the - * display device events. - *****************************************************************************/ -static void* RunThread( void *p_this ) +/* */ +static int ThreadDisplayPicture(vout_thread_t *vout, + bool now, mtime_t *deadline) { - vout_thread_t *p_vout = p_this; - int i_idle_loops = 0; /* loops without displaying a picture */ - - bool b_drop_late; - - /* - * Initialize thread - */ - vlc_mutex_lock( &p_vout->change_lock ); - p_vout->b_error = InitThread( p_vout ); - - b_drop_late = var_CreateGetBool( p_vout, "drop-late-frames" ); - - /* signal the creation of the vout */ - p_vout->p->b_ready = true; - vlc_cond_signal( &p_vout->p->change_wait ); - - if( p_vout->b_error ) - { - EndThread( p_vout ); - vlc_mutex_unlock( &p_vout->change_lock ); - return NULL; - } - - /* - * Main loop - it is not executed if an error occurred during - * initialization - */ - while( !p_vout->p->b_done && !p_vout->b_error ) - { - /* Initialize loop variables */ - const mtime_t current_date = mdate(); - picture_t *p_picture; - picture_t *p_filtered_picture; - mtime_t display_date; - picture_t *p_directbuffer; - int i_index; - - if( p_vout->p->b_title_show && p_vout->p->psz_title ) - DisplayTitleOnOSD( p_vout ); - - vlc_mutex_lock( &p_vout->picture_lock ); - - /* Look for the earliest picture but after the last displayed one */ - picture_t *p_last = p_vout->p->p_picture_displayed;; - - p_picture = NULL; - for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ ) - { - picture_t *p_pic = PP_RENDERPICTURE[i_index]; - - if( p_pic->i_status != READY_PICTURE ) - continue; - - if( p_vout->p->b_paused && p_last && p_last->date > 1 ) - continue; - - if( p_last && p_pic != p_last && p_pic->date <= p_last->date ) - { - /* Drop old picture */ - vout_UsePictureLocked( p_vout, p_pic ); - } - else if( !p_vout->p->b_paused && !p_pic->b_force && p_pic != p_last && - p_pic->date < current_date + p_vout->p->render_time && - b_drop_late ) - { - /* Picture is late: it will be destroyed and the thread - * will directly choose the next picture */ - vout_UsePictureLocked( p_vout, p_pic ); - p_vout->p->i_picture_lost++; - - msg_Warn( p_vout, "late picture skipped (%"PRId64")", - current_date - p_pic->date ); - } - else if( ( !p_last || p_last->date < p_pic->date ) && - ( p_picture == NULL || p_pic->date < p_picture->date ) ) - { - p_picture = p_pic; + vout_display_t *vd = vout->p->display.vd; + int displayed_count = 0; + int lost_count = 0; + + for (;;) { + const mtime_t date = mdate(); + const bool is_paused = vout->p->pause.is_on; + bool redisplay = is_paused && !now && vout->p->displayed.decoded; + bool is_forced; + + /* FIXME/XXX we must redisplay the last decoded picture (because + * of potential vout updated, or filters update or SPU update) + * For now a high update period is needed but it coulmd be removed + * if and only if: + * - vout module emits events from theselves. + * - *and* SPU is modified to emit an event or a deadline when needed. + * + * So it will be done latter. + */ + if (!redisplay) { + picture_t *peek = picture_fifo_Peek(vout->p->decoder_fifo); + if (peek) { + is_forced = peek->b_force || is_paused || now; + *deadline = (is_forced ? date : peek->date) - vout_chrono_GetHigh(&vout->p->render); + picture_Release(peek); + } else { + redisplay = true; } } - if( !p_picture ) - { - p_picture = p_last; - - if( !p_vout->p->b_picture_empty ) - { - p_vout->p->b_picture_empty = true; - vlc_cond_signal( &p_vout->p->picture_wait ); + if (redisplay) { + /* FIXME a better way for this delay is needed */ + const mtime_t date_update = vout->p->displayed.date + VOUT_REDISPLAY_DELAY; + if (date_update > date || !vout->p->displayed.decoded) { + *deadline = vout->p->displayed.decoded ? date_update : VLC_TS_INVALID; + break; } + /* */ + is_forced = true; + *deadline = date - vout_chrono_GetHigh(&vout->p->render); } + if (*deadline > VOUT_MWAIT_TOLERANCE) + *deadline -= VOUT_MWAIT_TOLERANCE; - display_date = 0; - if( p_picture ) - { - display_date = p_picture->date; - - /* If we found better than the last picture, destroy it */ - if( p_last && p_picture != p_last ) - { - vout_UsePictureLocked( p_vout, p_last ); - p_vout->p->p_picture_displayed = p_last = NULL; - } - - /* Compute FPS rate */ - p_vout->p->p_fps_sample[ p_vout->p->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date; - - if( !p_vout->p->b_paused && display_date > current_date + VOUT_DISPLAY_DELAY ) - { - /* A picture is ready to be rendered, but its rendering date - * is far from the current one so the thread will perform an - * empty loop as if no picture were found. The picture state - * is unchanged */ - p_picture = NULL; - display_date = 0; - } - else if( p_picture == p_last ) - { - /* We are asked to repeat the previous picture, but we first - * wait for a couple of idle loops */ - if( i_idle_loops < 4 ) - { - p_picture = NULL; - display_date = 0; - } - else - { - /* We set the display date to something high, otherwise - * we'll have lots of problems with late pictures */ - display_date = current_date + p_vout->p->render_time; - } - } - else if( p_vout->p->b_paused && display_date > current_date + VOUT_DISPLAY_DELAY ) - { - display_date = current_date + VOUT_DISPLAY_DELAY; - } + /* If we are too early and can wait, do it */ + if (date < *deadline && !now) + break; - if( p_picture ) - { - if( p_picture->date > 1 ) - { - p_vout->p->i_picture_displayed_date = p_picture->date; - if( p_picture != p_last && !p_vout->p->b_picture_displayed ) - { - p_vout->p->b_picture_displayed = true; - vlc_cond_signal( &p_vout->p->picture_wait ); + picture_t *decoded; + if (redisplay) { + decoded = vout->p->displayed.decoded; + vout->p->displayed.decoded = NULL; + } else { + decoded = picture_fifo_Pop(vout->p->decoder_fifo); + assert(decoded); + if (!is_forced && !vout->p->is_late_dropped) { + const mtime_t predicted = date + vout_chrono_GetLow(&vout->p->render); + const mtime_t late = predicted - decoded->date; + if (late > 0) { + msg_Dbg(vout, "picture might be displayed late (missing %d ms)", (int)(late/1000)); + if (late > VOUT_DISPLAY_LATE_THRESHOLD) { + msg_Warn(vout, "rejected picture because of render time"); + /* TODO */ + picture_Release(decoded); + lost_count++; + break; } } - p_vout->p->p_picture_displayed = p_picture; } - } - vlc_mutex_unlock( &p_vout->picture_lock ); - - if( p_picture == NULL ) - i_idle_loops++; - - p_filtered_picture = NULL; - if( p_picture ) - p_filtered_picture = filter_chain_VideoFilter( p_vout->p->p_vf2_chain, - p_picture ); - /* FIXME it is ugly that b_snapshot is not locked but I do not - * know which lock to use (here and in the snapshot callback) */ - const bool b_snapshot = p_vout->p->b_snapshot && p_picture != NULL; + vout->p->displayed.is_interlaced = !decoded->b_progressive; + vout->p->displayed.qtype = decoded->i_qtype; + } + vout->p->displayed.timestamp = decoded->date; + + /* */ + if (vout->p->displayed.decoded) + picture_Release(vout->p->displayed.decoded); + picture_Hold(decoded); + vout->p->displayed.decoded = decoded; + + /* */ + vout_chrono_Start(&vout->p->render); + + picture_t *filtered = NULL; + if (decoded) { + vlc_mutex_lock(&vout->p->vfilter_lock); + filtered = filter_chain_VideoFilter(vout->p->vfilter_chain, decoded); + //assert(filtered == decoded); // TODO implement + vlc_mutex_unlock(&vout->p->vfilter_lock); + if (!filtered) + continue; + } /* * Check for subpictures to display */ - subpicture_t *p_subpic = NULL; - if( display_date > 0 ) - p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date, - p_vout->p->b_paused, b_snapshot ); + const bool do_snapshot = vout_snapshot_IsRequested(&vout->p->snapshot); + mtime_t spu_render_time = is_forced ? mdate() : filtered->date; + if (vout->p->pause.is_on) + spu_render_time = vout->p->pause.date; + else + spu_render_time = filtered->date > 1 ? filtered->date : mdate(); + subpicture_t *subpic = spu_SortSubpictures(vout->p->p_spu, + spu_render_time, + do_snapshot); /* * Perform rendering + * + * We have to: + * - be sure to end up with a direct buffer. + * - blend subtitles, and in a fast access buffer */ - p_vout->p->i_picture_displayed++; - p_directbuffer = vout_RenderPicture( p_vout, p_filtered_picture, - p_subpic, p_vout->p->b_paused ); - - /* - * Take a snapshot if requested - */ - if( p_directbuffer && b_snapshot ) - { - /* FIXME lock (see b_snapshot) */ - p_vout->p->b_snapshot = false; - - vout_Snapshot( p_vout, p_directbuffer ); - } - - /* - * Call the plugin-specific rendering method if there is one - */ - if( p_filtered_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 ); - } - - /* - * Sleep, wake up - */ - if( display_date != 0 && p_directbuffer != NULL ) - { - 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->p->render_time + - VOUT_DISPLAY_DELAY ) - { - /* Store render time using a sliding mean weighting to - * current value in a 3 to 1 ratio*/ - p_vout->p->render_time *= 3; - p_vout->p->render_time += current_render_time; - p_vout->p->render_time >>= 2; + picture_t *direct = NULL; + if (filtered && + (vout->p->decoder_pool != vout->p->display_pool || subpic)) { + picture_t *render; + if (vout->p->is_decoder_pool_slow) + render = picture_NewFromFormat(&vd->source); + else if (vout->p->decoder_pool != vout->p->display_pool) + render = picture_pool_Get(vout->p->display_pool); + else + render = picture_pool_Get(vout->p->private_pool); + + if (render) { + picture_Copy(render, filtered); + + spu_RenderSubpictures(vout->p->p_spu, + render, &vd->source, + subpic, &vd->source, spu_render_time); } - } - - /* Give back change lock */ - vlc_mutex_unlock( &p_vout->change_lock ); - - /* Sleep a while or until a given date */ - if( display_date != 0 ) - { - /* If there are *vout* filters in the chain, better give them the picture - * in advance */ - if( !p_vout->p->psz_filter_chain || !*p_vout->p->psz_filter_chain ) - { - mwait( display_date - VOUT_MWAIT_TOLERANCE ); + if (vout->p->is_decoder_pool_slow) { + direct = picture_pool_Get(vout->p->display_pool); + if (direct) + picture_Copy(direct, render); + picture_Release(render); + + } else { + direct = render; } - } - else - { - /* Wait until a frame is being sent or a spurious wakeup (not a problem here) */ - vlc_mutex_lock( &p_vout->picture_lock ); - vlc_cond_timedwait( &p_vout->p->picture_wait, &p_vout->picture_lock, current_date + VOUT_IDLE_SLEEP ); - vlc_mutex_unlock( &p_vout->picture_lock ); - } - - /* On awakening, take back lock and send immediately picture - * to display. */ - /* Note: p_vout->p->b_done could be true here and now */ - vlc_mutex_lock( &p_vout->change_lock ); - - /* - * Display the previously rendered picture - */ - if( p_filtered_picture != NULL && p_directbuffer != NULL ) - { - /* Display the direct buffer returned by vout_RenderPicture */ - if( p_vout->pf_display ) - p_vout->pf_display( p_vout, p_directbuffer ); - - /* Tell the vout this was the last picture and that it does not - * need to be forced anymore. */ - p_picture->b_force = false; - } - - /* Drop the filtered picture if created by video filters */ - if( p_filtered_picture != NULL && p_filtered_picture != p_picture ) - { - vlc_mutex_lock( &p_vout->picture_lock ); - vout_UsePictureLocked( p_vout, p_filtered_picture ); - vlc_mutex_unlock( &p_vout->picture_lock ); - } - - if( p_picture != NULL ) - { - /* Reinitialize idle loop count */ - i_idle_loops = 0; + picture_Release(filtered); + filtered = NULL; + } else { + direct = filtered; } /* - * Check events and manage thread + * Take a snapshot if requested */ - if( p_vout->pf_manage && p_vout->pf_manage( p_vout ) ) - { - /* 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. */ - // FIXME pf_end - p_vout->b_error = 1; - break; - } - - if( p_vout->i_changes & VOUT_SIZE_CHANGE ) - { - /* this must only happen when the vout plugin is incapable of - * rescaling the picture itself. In this case we need to destroy - * the current picture buffers and recreate new ones with the right - * dimensions */ - int i; - - p_vout->i_changes &= ~VOUT_SIZE_CHANGE; + if (direct && do_snapshot) + vout_snapshot_Set(&vout->p->snapshot, &vd->source, direct); - assert( !p_vout->p->b_direct ); + /* Render the direct buffer returned by vout_RenderPicture */ + if (direct) { + vout_RenderWrapper(vout, direct); - ChromaDestroy( p_vout ); - - vlc_mutex_lock( &p_vout->picture_lock ); - - p_vout->pf_end( p_vout ); - - p_vout->p->p_picture_displayed = NULL; - for( i = 0; i < I_OUTPUTPICTURES; i++ ) - p_vout->p_picture[ i ].i_status = FREE_PICTURE; - vlc_cond_signal( &p_vout->p->picture_wait ); - - I_OUTPUTPICTURES = 0; - - if( p_vout->pf_init( p_vout ) ) + vout_chrono_Stop(&vout->p->render); +#if 0 { - msg_Err( p_vout, "cannot resize display" ); - /* FIXME: pf_end will be called again in EndThread() */ - p_vout->b_error = 1; + static int i = 0; + if (((i++)%10) == 0) + msg_Info(vout, "render: avg %d ms var %d ms", + (int)(vout->p->render.avg/1000), (int)(vout->p->render.var/1000)); } +#endif + } - vlc_mutex_unlock( &p_vout->picture_lock ); + /* Wait the real date (for rendering jitter) */ + if (!is_forced) + mwait(decoded->date); - /* Need to reinitialise the chroma plugin. Since we might need - * resizing too and it's not sure that we already had it, - * recreate the chroma plugin chain from scratch. */ - /* dionoea */ - if( ChromaCreate( p_vout ) ) - { - msg_Err( p_vout, "WOW THIS SUCKS BIG TIME!!!!!" ); - p_vout->b_error = 1; - } - if( p_vout->b_error ) - break; - } + /* Display the direct buffer returned by vout_RenderPicture */ + vout->p->displayed.date = mdate(); + if (direct) + vout_DisplayWrapper(vout, direct); - 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; + displayed_count++; + break; + } - if( !p_vout->p->b_direct ) - ChromaDestroy( p_vout ); + vout_statistic_Update(&vout->p->statistic, displayed_count, lost_count); + if (displayed_count <= 0) + return VLC_EGENERIC; + return VLC_SUCCESS; +} - vlc_mutex_lock( &p_vout->picture_lock ); +static void ThreadManage(vout_thread_t *vout, + mtime_t *deadline, + vout_interlacing_support_t *interlacing, + vout_postprocessing_support_t *postprocessing) +{ + vlc_mutex_lock(&vout->p->picture_lock); - p_vout->pf_end( p_vout ); + *deadline = VLC_TS_INVALID; + ThreadDisplayPicture(vout, false, deadline); - I_OUTPUTPICTURES = I_RENDERPICTURES = 0; + const int picture_qtype = vout->p->displayed.qtype; + const bool picture_interlaced = vout->p->displayed.is_interlaced; - p_vout->b_error = InitThread( p_vout ); - if( p_vout->b_error ) - msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed\n" ); + vlc_mutex_unlock(&vout->p->picture_lock); - vlc_cond_signal( &p_vout->p->picture_wait ); - vlc_mutex_unlock( &p_vout->picture_lock ); + /* Post processing */ + vout_SetPostProcessingState(vout, postprocessing, picture_qtype); - if( p_vout->b_error ) - break; - } + /* Deinterlacing */ + vout_SetInterlacingState(vout, interlacing, picture_interlaced); - /* Check for "video filter2" changes */ - vlc_mutex_lock( &p_vout->p->vfilter_lock ); - if( p_vout->p->psz_vf2 ) - { - es_format_t fmt; + vout_ManageWrapper(vout); +} - es_format_Init( &fmt, VIDEO_ES, p_vout->fmt_render.i_chroma ); - fmt.video = p_vout->fmt_render; - filter_chain_Reset( p_vout->p->p_vf2_chain, &fmt, &fmt ); +static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string) +{ + if (!vout->p->title.show) + return; - if( filter_chain_AppendFromString( p_vout->p->p_vf2_chain, - p_vout->p->psz_vf2 ) < 0 ) - msg_Err( p_vout, "Video filter chain creation failed" ); + vout_OSDText(vout, SPU_DEFAULT_CHANNEL, + vout->p->title.position, INT64_C(1000) * vout->p->title.timeout, + string); +} - free( p_vout->p->psz_vf2 ); - p_vout->p->psz_vf2 = NULL; - } - vlc_mutex_unlock( &p_vout->p->vfilter_lock ); - } +static void ThreadChangeFilters(vout_thread_t *vout, const char *filters) +{ + es_format_t fmt; + es_format_Init(&fmt, VIDEO_ES, vout->p->original.i_chroma); + fmt.video = vout->p->original; - /* - * Error loop - wait until the thread destruction is requested - */ - if( p_vout->b_error ) - ErrorThread( p_vout ); + vlc_mutex_lock(&vout->p->vfilter_lock); - /* End of thread */ - CleanThread( p_vout ); - EndThread( p_vout ); - vlc_mutex_unlock( &p_vout->change_lock ); + filter_chain_Reset(vout->p->vfilter_chain, &fmt, &fmt); + if (filter_chain_AppendFromString(vout->p->vfilter_chain, + filters) < 0) + msg_Err(vout, "Video filter chain creation failed"); - return NULL; + vlc_mutex_unlock(&vout->p->vfilter_lock); } -/***************************************************************************** - * ErrorThread: RunThread() error loop - ***************************************************************************** - * 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 ) +static void ThreadChangeSubFilters(vout_thread_t *vout, const char *filters) { - /* Wait until a `close' order */ - while( !p_vout->p->b_done ) - vlc_cond_wait( &p_vout->p->change_wait, &p_vout->change_lock ); + spu_ChangeFilters(vout->p->p_spu, filters); } -/***************************************************************************** - * CleanThread: clean up after InitThread - ***************************************************************************** - * This function is called after a sucessful - * initialization. It frees all resources allocated by InitThread. - * XXX You have to enter it with change_lock taken. - *****************************************************************************/ -static void CleanThread( vout_thread_t *p_vout ) +static void ThreadChangePause(vout_thread_t *vout, bool is_paused, mtime_t date) { - int i_index; /* index in heap */ - - if( !p_vout->p->b_direct ) - ChromaDestroy( p_vout ); - - /* Destroy all remaining pictures */ - for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++ ) - { - if ( p_vout->p_picture[i_index].i_type == MEMORY_PICTURE ) - { - free( p_vout->p_picture[i_index].p_data_orig ); - } + assert(!vout->p->pause.is_on || !is_paused); + + if (vout->p->pause.is_on) { + const mtime_t duration = date - vout->p->pause.date; + + if (vout->p->step.timestamp > VLC_TS_INVALID) + vout->p->step.timestamp += duration; + if (vout->p->step.last > VLC_TS_INVALID) + vout->p->step.last += duration; + picture_fifo_OffsetDate(vout->p->decoder_fifo, duration); + if (vout->p->displayed.decoded) + vout->p->displayed.decoded->date += duration; + + spu_OffsetSubtitleDate(vout->p->p_spu, duration); + } else { + vout->p->step.timestamp = VLC_TS_INVALID; + vout->p->step.last = VLC_TS_INVALID; } - - /* Destroy translation tables */ - if( !p_vout->b_error ) - p_vout->pf_end( p_vout ); + vout->p->pause.is_on = is_paused; + vout->p->pause.date = date; } -/***************************************************************************** - * EndThread: thread destruction - ***************************************************************************** - * This function is called when the thread ends. - * It frees all resources not allocated by InitThread. - * XXX You have to enter it with change_lock taken. - *****************************************************************************/ -static void EndThread( vout_thread_t *p_vout ) +static void ThreadFlush(vout_thread_t *vout, bool below, mtime_t date) { -#ifdef STATS - { - struct tms cpu_usage; - times( &cpu_usage ); - - msg_Dbg( p_vout, "cpu usage (user: %d, system: %d)", - cpu_usage.tms_utime, cpu_usage.tms_stime ); + vout->p->step.timestamp = VLC_TS_INVALID; + vout->p->step.last = VLC_TS_INVALID; + + picture_t *last = vout->p->displayed.decoded; + if (last) { + if (( below && last->date <= date) || + (!below && last->date >= date)) { + picture_Release(last); + + vout->p->displayed.decoded = NULL; + vout->p->displayed.date = VLC_TS_INVALID; + vout->p->displayed.timestamp = VLC_TS_INVALID; + } } -#endif - - /* FIXME does that function *really* need to be called inside the thread ? */ - - /* Detach subpicture unit from both input and vout */ - spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false ); - vlc_object_detach( p_vout->p_spu ); - - /* Destroy the video filters2 */ - filter_chain_Delete( p_vout->p->p_vf2_chain ); + picture_fifo_Flush(vout->p->decoder_fifo, date, below); } -/* Thread helpers */ -static picture_t *ChromaGetPicture( filter_t *p_filter ) +static void ThreadReset(vout_thread_t *vout) { - picture_t *p_pic = (picture_t *)p_filter->p_owner; - p_filter->p_owner = NULL; - return p_pic; + ThreadFlush(vout, true, INT64_MAX); + if (vout->p->decoder_pool) + picture_pool_NonEmpty(vout->p->decoder_pool, true); + vout->p->pause.is_on = false; + vout->p->pause.date = mdate(); } -static int ChromaCreate( vout_thread_t *p_vout ) +static void ThreadStep(vout_thread_t *vout, mtime_t *duration) { - static const char typename[] = "chroma"; - filter_t *p_chroma; - - /* Choose the best module */ - p_chroma = p_vout->p->p_chroma = - vlc_custom_create( p_vout, sizeof(filter_t), VLC_OBJECT_GENERIC, - typename ); + *duration = 0; - vlc_object_attach( p_chroma, p_vout ); + if (vout->p->step.last <= VLC_TS_INVALID) + vout->p->step.last = vout->p->displayed.timestamp; - /* TODO: Set the fmt_in and fmt_out stuff here */ - p_chroma->fmt_in.video = p_vout->fmt_render; - p_chroma->fmt_out.video = p_vout->fmt_out; - VideoFormatImportRgb( &p_chroma->fmt_in.video, &p_vout->render ); - VideoFormatImportRgb( &p_chroma->fmt_out.video, &p_vout->output ); - - p_chroma->p_module = module_need( p_chroma, "video filter2", NULL, false ); - - if( p_chroma->p_module == NULL ) - { - msg_Err( p_vout, "no chroma module for %4.4s to %4.4s i=%dx%d o=%dx%d", - (char*)&p_vout->render.i_chroma, - (char*)&p_vout->output.i_chroma, - p_chroma->fmt_in.video.i_width, p_chroma->fmt_in.video.i_height, - p_chroma->fmt_out.video.i_width, p_chroma->fmt_out.video.i_height - ); + mtime_t dummy; + if (ThreadDisplayPicture(vout, true, &dummy)) + return; - vlc_object_release( p_vout->p->p_chroma ); - p_vout->p->p_chroma = NULL; + vout->p->step.timestamp = vout->p->displayed.timestamp; - return VLC_EGENERIC; + if (vout->p->step.last > VLC_TS_INVALID && + vout->p->step.timestamp > vout->p->step.last) { + *duration = vout->p->step.timestamp - vout->p->step.last; + vout->p->step.last = vout->p->step.timestamp; + /* TODO advance subpicture by the duration ... */ } - p_chroma->pf_vout_buffer_new = ChromaGetPicture; - return VLC_SUCCESS; } -static void ChromaDestroy( vout_thread_t *p_vout ) +static void ThreadChangeFullscreen(vout_thread_t *vout, bool fullscreen) { - assert( !p_vout->p->b_direct ); - - if( !p_vout->p->p_chroma ) - return; + /* FIXME not sure setting "fullscreen" is good ... */ + var_SetBool(vout, "fullscreen", fullscreen); + vout_SetDisplayFullscreen(vout->p->display.vd, fullscreen); +} - module_unneed( p_vout->p->p_chroma, p_vout->p->p_chroma->p_module ); - vlc_object_release( p_vout->p->p_chroma ); - p_vout->p->p_chroma = NULL; +static void ThreadChangeOnTop(vout_thread_t *vout, bool is_on_top) +{ + vout_SetWindowState(vout->p->display.vd, + is_on_top ? VOUT_WINDOW_STATE_ABOVE : + VOUT_WINDOW_STATE_NORMAL); } -/* following functions are local */ -static int ReduceHeight( int i_ratio ) +static void ThreadChangeDisplayFilled(vout_thread_t *vout, bool is_filled) { - int i_dummy = VOUT_ASPECT_FACTOR; - int i_pgcd = 1; + vout_SetDisplayFilled(vout->p->display.vd, is_filled); +} - if( !i_ratio ) - { - return i_pgcd; +static void ThreadChangeZoom(vout_thread_t *vout, int num, int den) +{ + if (num * 10 < den) { + num = den; + den *= 10; + } else if (num > den * 10) { + num = den * 10; } - /* VOUT_ASPECT_FACTOR is (2^7 * 3^3 * 5^3), we just check for 2, 3 and 5 */ - while( !(i_ratio & 1) && !(i_dummy & 1) ) - { - i_ratio >>= 1; - i_dummy >>= 1; - i_pgcd <<= 1; - } + vout_SetDisplayZoom(vout->p->display.vd, num, den); +} - while( !(i_ratio % 3) && !(i_dummy % 3) ) - { - i_ratio /= 3; - i_dummy /= 3; - i_pgcd *= 3; - } +static void ThreadChangeAspectRatio(vout_thread_t *vout, + unsigned num, unsigned den) +{ + const video_format_t *source = &vout->p->original; - while( !(i_ratio % 5) && !(i_dummy % 5) ) - { - i_ratio /= 5; - i_dummy /= 5; - i_pgcd *= 5; + if (num > 0 && den > 0) { + num *= source->i_visible_height; + den *= source->i_visible_width; + vlc_ureduce(&num, &den, num, den, 0); } - - return i_pgcd; + vout_SetDisplayAspect(vout->p->display.vd, num, den); } -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; -} -/** - * This function copies all RGB informations from a picture_heap_t into - * a video_format_t - */ -static void VideoFormatImportRgb( video_format_t *p_fmt, const picture_heap_t *p_heap ) +static void ThreadExecuteCropWindow(vout_thread_t *vout, + unsigned crop_num, unsigned crop_den, + unsigned x, unsigned y, + unsigned width, unsigned height) { - p_fmt->i_rmask = p_heap->i_rmask; - p_fmt->i_gmask = p_heap->i_gmask; - p_fmt->i_bmask = p_heap->i_bmask; - p_fmt->i_rrshift = p_heap->i_rrshift; - p_fmt->i_lrshift = p_heap->i_lrshift; - p_fmt->i_rgshift = p_heap->i_rgshift; - p_fmt->i_lgshift = p_heap->i_lgshift; - p_fmt->i_rbshift = p_heap->i_rbshift; - p_fmt->i_lbshift = p_heap->i_lbshift; -} + const video_format_t *source = &vout->p->original; -/** - * This funtion copes all RGB informations from a video_format_t into - * a picture_heap_t - */ -static void VideoFormatExportRgb( const video_format_t *p_fmt, picture_heap_t *p_heap ) + vout_SetDisplayCrop(vout->p->display.vd, + crop_num, crop_den, + source->i_x_offset + x, + source->i_y_offset + y, + width, height); +} +static void ThreadExecuteCropBorder(vout_thread_t *vout, + unsigned left, unsigned top, + unsigned right, unsigned bottom) { - p_heap->i_rmask = p_fmt->i_rmask; - p_heap->i_gmask = p_fmt->i_gmask; - p_heap->i_bmask = p_fmt->i_bmask; - p_heap->i_rrshift = p_fmt->i_rrshift; - p_heap->i_lrshift = p_fmt->i_lrshift; - p_heap->i_rgshift = p_fmt->i_rgshift; - p_heap->i_lgshift = p_fmt->i_lgshift; - p_heap->i_rbshift = p_fmt->i_rbshift; - p_heap->i_lbshift = p_fmt->i_lbshift; + const video_format_t *source = &vout->p->original; + ThreadExecuteCropWindow(vout, 0, 0, + left, + top, + /* At worst, it becomes < 0 (but unsigned) and will be rejected */ + source->i_visible_width - (left + right), + source->i_visible_height - (top + bottom)); } -/** - * This function computes rgb shifts from masks - */ -static void PictureHeapFixRgb( picture_heap_t *p_heap ) +static void ThreadExecuteCropRatio(vout_thread_t *vout, + unsigned num, unsigned den) { - video_format_t fmt; - - /* */ - fmt.i_chroma = p_heap->i_chroma; - VideoFormatImportRgb( &fmt, p_heap ); - - /* */ - video_format_FixRgb( &fmt ); - - VideoFormatExportRgb( &fmt, p_heap ); + const video_format_t *source = &vout->p->original; + ThreadExecuteCropWindow(vout, num, den, + 0, 0, + source->i_visible_width, + source->i_visible_height); } -/***************************************************************************** - * 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 ) +static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state) { - 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; - (void)psz_cmd; (void)oldval; (void)p_data; - - 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 ) - { - 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 ) - { - if( *psz_filter ) - strcat( psz_filter, ":" ); - strcat( psz_filter, "deinterlace" ); - } + vlc_mouse_Init(&vout->p->mouse); + vout->p->decoder_fifo = picture_fifo_New(); + vout->p->decoder_pool = NULL; + vout->p->display_pool = NULL; + vout->p->private_pool = NULL; + + vout->p->vfilter_chain = + filter_chain_New( vout, "video filter2", false, + VoutVideoFilterAllocationSetup, NULL, vout); + + vout_display_state_t state_default; + if (!state) { + VoutGetDisplayCfg(vout, &state_default.cfg, vout->p->display.title); + state_default.wm_state = var_CreateGetBool(vout, "video-on-top") ? VOUT_WINDOW_STATE_ABOVE : + VOUT_WINDOW_STATE_NORMAL; + state_default.sar.num = 0; + state_default.sar.den = 0; + + state = &state_default; } - p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT, - FIND_PARENT ); - if( !p_input ) - { - free( psz_filter ); + if (vout_OpenWrapper(vout, vout->p->splitter_name, state)) 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 ); + if (vout_InitWrapper(vout)) + return VLC_EGENERIC; + assert(vout->p->decoder_pool); - val.b_bool = true; - var_Set( p_vout, "intf-change", val ); + vout->p->displayed.decoded = NULL; + vout->p->displayed.date = VLC_TS_INVALID; + vout->p->displayed.decoded = NULL; + vout->p->displayed.timestamp = VLC_TS_INVALID; + vout->p->displayed.qtype = QTYPE_NONE; + vout->p->displayed.is_interlaced = false; - val.psz_string = psz_filter; - var_Set( p_vout, "vout-filter", val ); - free( psz_filter ); + vout->p->step.last = VLC_TS_INVALID; + vout->p->step.timestamp = VLC_TS_INVALID; + video_format_Print(VLC_OBJECT(vout), "original format", &vout->p->original); 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 ) +static void ThreadStop(vout_thread_t *vout, vout_display_state_t *state) { - vout_thread_t *p_vout = (vout_thread_t *)p_this; - input_thread_t *p_input; - vlc_value_t val; - (void)psz_cmd; (void)oldval; (void)p_data; - - 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 = true; - var_Set( p_vout, "intf-change", val ); + /* Destroy the video filters2 */ + filter_chain_Delete(vout->p->vfilter_chain); - /* 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 ); + /* Destroy translation tables */ + if (vout->p->display.vd) { + if (vout->p->decoder_pool) { + ThreadFlush(vout, true, INT64_MAX); + vout_EndWrapper(vout); + } + vout_CloseWrapper(vout, state); + } - var_Set( p_input, "vout-filter", val ); + if (vout->p->decoder_fifo) + picture_fifo_Delete(vout->p->decoder_fifo); + assert(!vout->p->decoder_pool); +} - /* Now restart current video stream */ - input_Control( p_input, INPUT_RESTART_ES, -VIDEO_ES ); - vlc_object_release( p_input ); +static void ThreadInit(vout_thread_t *vout) +{ + vout->p->window.is_unused = true; + vout->p->window.object = NULL; + vout->p->dead = false; + vout->p->is_late_dropped = var_InheritBool(vout, "drop-late-frames"); + vout->p->pause.is_on = false; + vout->p->pause.date = VLC_TS_INVALID; + + vout_chrono_Init(&vout->p->render, 5, 10000); /* Arbitrary initial time */ +} - return VLC_SUCCESS; +static void ThreadClean(vout_thread_t *vout) +{ + if (vout->p->window.object) { + assert(vout->p->window.is_unused); + vout_window_Delete(vout->p->window.object); + } + vout_chrono_Clean(&vout->p->render); + vout->p->dead = true; + vout_control_Dead(&vout->p->control); } -/***************************************************************************** - * Video Filter2 stuff - *****************************************************************************/ -static int VideoFilter2Callback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int ThreadReinit(vout_thread_t *vout, + const vout_configuration_t *cfg) { - vout_thread_t *p_vout = (vout_thread_t *)p_this; - (void)psz_cmd; (void)oldval; (void)p_data; + video_format_t original; + if (VoutValidateFormat(&original, cfg->fmt)) { + ThreadStop(vout, NULL); + ThreadClean(vout); + return VLC_EGENERIC; + } + if (video_format_IsSimilar(&original, &vout->p->original)) + return VLC_SUCCESS; + + vout_display_state_t state; + memset(&state, 0, sizeof(state)); - vlc_mutex_lock( &p_vout->p->vfilter_lock ); - p_vout->p->psz_vf2 = strdup( newval.psz_string ); - vlc_mutex_unlock( &p_vout->p->vfilter_lock ); + ThreadStop(vout, &state); + if (!state.cfg.is_fullscreen) { + state.cfg.display.width = 0; + state.cfg.display.height = 0; + } + state.sar.num = 0; + state.sar.den = 0; + /* FIXME current vout "variables" are not in sync here anymore + * and I am not sure what to do */ + + vout->p->original = original; + if (ThreadStart(vout, &state)) { + ThreadClean(vout); + return VLC_EGENERIC; + } return VLC_SUCCESS; } -static void DisplayTitleOnOSD( vout_thread_t *p_vout ) +/***************************************************************************** + * Thread: video output thread + ***************************************************************************** + * Video output thread. This function does only returns when the thread is + * terminated. It handles the pictures arriving in the video heap and the + * display device events. + *****************************************************************************/ +static void *Thread(void *object) { - const mtime_t i_start = mdate(); - const mtime_t i_stop = i_start + INT64_C(1000) * p_vout->p->i_title_timeout; + vout_thread_t *vout = object; - vlc_assert_locked( &p_vout->change_lock ); + vout_interlacing_support_t interlacing = { + .is_interlaced = false, + .date = mdate(), + }; + vout_postprocessing_support_t postprocessing = { + .qtype = QTYPE_NONE, + }; - vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN, - p_vout->p->psz_title, NULL, - p_vout->p->i_title_position, - 30 + p_vout->fmt_in.i_width - - p_vout->fmt_in.i_visible_width - - p_vout->fmt_in.i_x_offset, - 20 + p_vout->fmt_in.i_y_offset, - i_start, i_stop ); + mtime_t deadline = VLC_TS_INVALID; + for (;;) { + vout_control_cmd_t cmd; - free( p_vout->p->psz_title ); + /* FIXME remove thoses ugly timeouts + */ + while (!vout_control_Pop(&vout->p->control, &cmd, deadline, 100000)) { + switch(cmd.type) { + case VOUT_CONTROL_INIT: + ThreadInit(vout); + if (ThreadStart(vout, NULL)) { + ThreadStop(vout, NULL); + ThreadClean(vout); + return NULL; + } + break; + case VOUT_CONTROL_CLEAN: + ThreadStop(vout, NULL); + ThreadClean(vout); + return NULL; + case VOUT_CONTROL_REINIT: + if (ThreadReinit(vout, cmd.u.cfg)) + return NULL; + break; + case VOUT_CONTROL_OSD_TITLE: + ThreadDisplayOsdTitle(vout, cmd.u.string); + break; + case VOUT_CONTROL_CHANGE_FILTERS: + ThreadChangeFilters(vout, cmd.u.string); + break; + case VOUT_CONTROL_CHANGE_SUB_FILTERS: + ThreadChangeSubFilters(vout, cmd.u.string); + break; + case VOUT_CONTROL_PAUSE: + ThreadChangePause(vout, cmd.u.pause.is_on, cmd.u.pause.date); + break; + case VOUT_CONTROL_FLUSH: + ThreadFlush(vout, false, cmd.u.time); + break; + case VOUT_CONTROL_RESET: + ThreadReset(vout); + break; + case VOUT_CONTROL_STEP: + ThreadStep(vout, cmd.u.time_ptr); + break; + case VOUT_CONTROL_FULLSCREEN: + ThreadChangeFullscreen(vout, cmd.u.boolean); + break; + case VOUT_CONTROL_ON_TOP: + ThreadChangeOnTop(vout, cmd.u.boolean); + break; + case VOUT_CONTROL_DISPLAY_FILLED: + ThreadChangeDisplayFilled(vout, cmd.u.boolean); + break; + case VOUT_CONTROL_ZOOM: + ThreadChangeZoom(vout, cmd.u.pair.a, cmd.u.pair.b); + break; + case VOUT_CONTROL_ASPECT_RATIO: + ThreadChangeAspectRatio(vout, cmd.u.pair.a, cmd.u.pair.b); + break; + case VOUT_CONTROL_CROP_RATIO: + ThreadExecuteCropRatio(vout, cmd.u.pair.a, cmd.u.pair.b); + break; + case VOUT_CONTROL_CROP_WINDOW: + ThreadExecuteCropWindow(vout, 0, 0, + cmd.u.window.x, cmd.u.window.y, + cmd.u.window.width, cmd.u.window.height); + break; + case VOUT_CONTROL_CROP_BORDER: + ThreadExecuteCropBorder(vout, + cmd.u.border.left, cmd.u.border.top, + cmd.u.border.right, cmd.u.border.bottom); + break; + default: + break; + } + vout_control_cmd_Clean(&cmd); + } - p_vout->p->psz_title = NULL; + ThreadManage(vout, &deadline, &interlacing, &postprocessing); + } }