X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=bb1eeb0fabe0f3a1bda597577fc20cb365b3e37d;hb=4bfd8cb7103f6776d4463de001edee8e30f9e9b9;hp=c68b5d3a7ed24855a897db5ea0fd2f4d29a5e9ec;hpb=776b826403cda061217ede59b2d89b26e3dca166;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index c68b5d3a7e..bb1eeb0fab 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -43,11 +43,9 @@ #include #include -#include +#include #include -#include -#include "vout_pictures.h" #include "vout_internal.h" #include "interlacing.h" #include "postprocessing.h" @@ -56,17 +54,8 @@ /***************************************************************************** * Local prototypes *****************************************************************************/ -static void *Thread(void *); -static void vout_Destructor(vlc_object_t *); - -/* Object variables callbacks */ -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 * ); - -/* */ -static void PrintVideoFormat(vout_thread_t *, const char *, const video_format_t *); +static void *Thread(void *); +static void VoutDestructor(vlc_object_t *); /* Maximum delay between 2 displayed pictures. * XXX it is needed for now but should be removed in the long term. @@ -81,406 +70,193 @@ static void PrintVideoFormat(vout_thread_t *, const char *, const video_format_t /* Better be in advance when awakening than late... */ #define VOUT_MWAIT_TOLERANCE (INT64_C(1000)) -/***************************************************************************** - * 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; - return picture_pool_Get(p_vout->p->private_pool); -} - -static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic ) -{ - VLC_UNUSED(p_filter); - picture_Release(p_pic); -} - -static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data ) -{ - p_filter->pf_video_buffer_new = video_new_buffer_filter; - p_filter->pf_video_buffer_del = video_del_buffer_filter; - p_filter->p_owner = p_data; /* p_vout */ - return VLC_SUCCESS; -} - -#undef vout_Request -/***************************************************************************** - * 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 ) - { - vlc_mutex_lock( &p_vout->p->change_lock ); - - /* We don't directly check for the "vout-filter" variable for obvious - * performance reasons. */ - if( p_vout->p->b_filter_change ) - { - char *psz_filter_chain = var_GetString( p_vout, "vout-filter" ); - - 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 ); - } - -#warning "FIXME: Check RGB masks in vout_Request" - /* FIXME: check RGB masks */ - if( p_vout->p->fmt_render.i_chroma != vlc_fourcc_GetCodec( VIDEO_ES, p_fmt->i_chroma ) || - p_vout->p->fmt_render.i_width != p_fmt->i_width || - p_vout->p->fmt_render.i_height != p_fmt->i_height || - p_vout->p->b_filter_change ) - { - vlc_mutex_unlock( &p_vout->p->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. */ - /* 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; - 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 */ - 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; - } -#endif - - if( i_sar_num > 0 && i_sar_den > 0 && - ( i_sar_num != p_vout->p->fmt_render.i_sar_num || - i_sar_den != p_vout->p->fmt_render.i_sar_den ) ) - { - p_vout->p->fmt_in.i_sar_num = i_sar_num; - p_vout->p->fmt_in.i_sar_den = i_sar_den; - - p_vout->p->fmt_render.i_sar_num = i_sar_num; - p_vout->p->fmt_render.i_sar_den = i_sar_den; - p_vout->p->i_changes |= VOUT_ASPECT_CHANGE; - } - vlc_mutex_unlock( &p_vout->p->change_lock ); - - vlc_object_release( p_vout ); - } - - if( p_vout ) - { - msg_Dbg( p_this, "reusing provided vout" ); - - spu_Attach( p_vout->p->p_spu, VLC_OBJECT(p_vout), false ); - vlc_object_detach( p_vout ); - - vlc_object_attach( p_vout, p_this ); - spu_Attach( p_vout->p->p_spu, VLC_OBJECT(p_vout), true ); - } - } - - 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 */ - vlc_value_t text; - - - config_chain_t *p_cfg; - char *psz_parser; - char *psz_name; - - if( p_fmt->i_width <= 0 || p_fmt->i_height <= 0 ) - return NULL; - const vlc_fourcc_t i_chroma = vlc_fourcc_GetCodec( VIDEO_ES, p_fmt->i_chroma ); - - 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 ) - return NULL; - - /* */ - p_vout->p = calloc( 1, sizeof(*p_vout->p) ); - if( !p_vout->p ) - { - vlc_object_release( p_vout ); + 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->fmt_render = *p_fmt; /* FIXME palette */ - p_vout->p->fmt_in = *p_fmt; /* FIXME palette */ - - p_vout->p->fmt_render.i_chroma = - p_vout->p->fmt_in.i_chroma = i_chroma; - video_format_FixRgb( &p_vout->p->fmt_render ); - video_format_FixRgb( &p_vout->p->fmt_in ); - - /* Initialize misc stuff */ - vout_control_Init( &p_vout->p->control ); - p_vout->p->i_changes = 0; - vout_chrono_Init( &p_vout->p->render, 5, 10000 ); /* Arbitrary initial time */ - vout_statistic_Init( &p_vout->p->statistic ); - p_vout->p->b_filter_change = 0; - p_vout->p->i_par_num = - p_vout->p->i_par_den = 1; - p_vout->p->displayed.date = VLC_TS_INVALID; - p_vout->p->displayed.decoded = NULL; - p_vout->p->displayed.timestamp = VLC_TS_INVALID; - p_vout->p->displayed.qtype = QTYPE_NONE; - p_vout->p->displayed.is_interlaced = false; + vout->p = (vout_thread_sys_t*)&vout[1]; - p_vout->p->step.last = VLC_TS_INVALID; - p_vout->p->step.timestamp = VLC_TS_INVALID; + vout->p->original = original; + vout->p->dpb_size = cfg->dpb_size; - p_vout->p->pause.is_on = false; - p_vout->p->pause.date = VLC_TS_INVALID; + vout_control_Init(&vout->p->control); + vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_INIT); - p_vout->p->decoder_fifo = picture_fifo_New(); - p_vout->p->decoder_pool = NULL; + vout_statistic_Init(&vout->p->statistic); + vout->p->i_par_num = + vout->p->i_par_den = 1; - vlc_mouse_Init( &p_vout->p->mouse ); - - vout_snapshot_Init( &p_vout->p->snapshot ); - - p_vout->p->p_vf2_chain = filter_chain_New( p_vout, "video filter2", - false, video_filter_buffer_allocation_init, NULL, p_vout ); + vout_snapshot_Init(&vout->p->snapshot); /* Initialize locks */ - vlc_mutex_init( &p_vout->p->picture_lock ); - vlc_mutex_init( &p_vout->p->change_lock ); - vlc_mutex_init( &p_vout->p->vfilter_lock ); - - /* Mouse coordinates */ - var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER ); - var_Create( p_vout, "mouse-moved", VLC_VAR_COORDS ); - var_Create( p_vout, "mouse-clicked", VLC_VAR_COORDS ); - /* Mouse object (area of interest in a video filter) */ - var_Create( p_vout, "mouse-object", VLC_VAR_BOOL ); + vlc_mutex_init(&vout->p->picture_lock); + vlc_mutex_init(&vout->p->vfilter_lock); + vlc_mutex_init(&vout->p->spu_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); /* Initialize subpicture unit */ - p_vout->p->p_spu = spu_Create( p_vout ); - - /* */ - spu_Init( p_vout->p->p_spu ); - - spu_Attach( p_vout->p->p_spu, VLC_OBJECT(p_vout), true ); - - p_vout->p->is_late_dropped = var_InheritBool( p_vout, "drop-late-frames" ); + vout->p->p_spu = spu_Create(vout); /* Take care of some "interface/control" related initialisations */ - vout_IntfInit( p_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 */ - var_Create( p_vout, "video-filter", - VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND ); - var_AddCallback( p_vout, "video-filter", VideoFilter2Callback, NULL ); - var_TriggerCallback( p_vout, "video-filter" ); - - /* Choose the video output module */ - if( !p_vout->p->psz_filter_chain || !*p_vout->p->psz_filter_chain ) - { - psz_parser = NULL; - } - else - { - psz_parser = strdup( p_vout->p->psz_filter_chain ); - p_vout->p->title.show = false; + 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; } - /* Create the vout thread */ - char *psz_tmp = config_ChainCreate( &psz_name, &p_cfg, psz_parser ); - free( psz_parser ); - free( psz_tmp ); - p_vout->p->p_cfg = p_cfg; - - /* Create a few object variables for interface interaction */ - 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 ); - /* */ - vout_InitInterlacingSupport( p_vout, p_vout->p->displayed.is_interlaced ); - - if( p_vout->p->psz_filter_chain && *p_vout->p->psz_filter_chain ) - { - char *psz_tmp; - if( asprintf( &psz_tmp, "%s,none", psz_name ) < 0 ) - psz_tmp = strdup( "" ); - free( psz_name ); - psz_name = psz_tmp; - } - p_vout->p->psz_module_name = psz_name; + vout_InitInterlacingSupport(vout, vout->p->displayed.is_interlaced); /* */ - vlc_object_set_destructor( p_vout, vout_Destructor ); + vlc_object_set_destructor(vout, VoutDestructor); /* */ - vlc_cond_init( &p_vout->p->change_wait ); - if( vlc_clone( &p_vout->p->thread, Thread, p_vout, - VLC_THREAD_PRIORITY_OUTPUT ) ) - { - spu_Attach( p_vout->p->p_spu, VLC_OBJECT(p_vout), false ); - spu_Destroy( p_vout->p->p_spu ); - p_vout->p->p_spu = NULL; - vlc_object_release( p_vout ); + if (vlc_clone(&vout->p->thread, Thread, vout, + VLC_THREAD_PRIORITY_OUTPUT)) { + spu_Destroy(vout->p->p_spu); + vlc_object_release(vout); return NULL; } - vlc_mutex_lock( &p_vout->p->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->p->change_lock ); - } - vlc_mutex_unlock( &p_vout->p->change_lock ); + vout_control_WaitEmpty(&vout->p->control); - if( p_vout->p->b_error ) - { - msg_Err( p_vout, "video output creation failed" ); - vout_CloseAndRelease( p_vout ); + if (vout->p->dead) { + msg_Err(vout, "video output creation failed"); + vout_CloseAndRelease(vout); return NULL; } - return p_vout; + vout->p->input = cfg->input; + if (vout->p->input) + spu_Attach(vout->p->p_spu, vout->p->input, true); + + return vout; } -/***************************************************************************** - * vout_Close: Close a vout created by vout_Create. - ***************************************************************************** - * 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 - * (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 ) +vout_thread_t *(vout_Request)(vlc_object_t *object, + const vout_configuration_t *cfg) { - assert( p_vout ); + vout_thread_t *vout = cfg->vout; + if (cfg->change_fmt && !cfg->fmt) { + if (vout) + vout_CloseAndRelease(vout); + return NULL; + } + + /* If a vout is provided, try reusing it */ + if (vout) { + if (vout->p->input != cfg->input) { + if (vout->p->input) + spu_Attach(vout->p->p_spu, vout->p->input, false); + vout->p->input = cfg->input; + if (vout->p->input) + spu_Attach(vout->p->p_spu, vout->p->input, true); + } - vlc_mutex_lock( &p_vout->p->change_lock ); - p_vout->p->b_done = true; - vlc_cond_signal( &p_vout->p->change_wait ); - vlc_mutex_unlock( &p_vout->p->change_lock ); + if (cfg->change_fmt) { + vout_control_cmd_t cmd; + vout_control_cmd_Init(&cmd, VOUT_CONTROL_REINIT); + cmd.u.cfg = cfg; - vout_snapshot_End( &p_vout->p->snapshot ); + 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); - vlc_join( p_vout->p->thread, NULL ); + msg_Warn(object, "cannot reuse provided vout"); + } + return VoutCreate(object, cfg); } -/* */ -static void vout_Destructor( vlc_object_t * p_this ) +void vout_Close(vout_thread_t *vout) { - vout_thread_t *p_vout = (vout_thread_t *)p_this; + assert(vout); - /* Make sure the vout was stopped first */ - //assert( !p_vout->p_module ); + if (vout->p->input) + spu_Attach(vout->p->p_spu, vout->p->input, false); - free( p_vout->p->psz_module_name ); + vout_snapshot_End(&vout->p->snapshot); - /* */ - if( p_vout->p->p_spu ) - spu_Destroy( p_vout->p->p_spu ); + vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_CLEAN); + vlc_join(vout->p->thread, NULL); - vout_chrono_Clean( &p_vout->p->render ); + vlc_mutex_lock(&vout->p->spu_lock); + spu_Destroy(vout->p->p_spu); + vout->p->p_spu = NULL; + vlc_mutex_unlock(&vout->p->spu_lock); +} - if( p_vout->p->decoder_fifo ) - picture_fifo_Delete( p_vout->p->decoder_fifo ); - assert( !p_vout->p->decoder_pool ); +/* */ +static void VoutDestructor(vlc_object_t *object) +{ + vout_thread_t *vout = (vout_thread_t *)object; - /* Destroy the locks */ - vlc_cond_destroy( &p_vout->p->change_wait ); - vlc_mutex_destroy( &p_vout->p->picture_lock ); - vlc_mutex_destroy( &p_vout->p->change_lock ); - vlc_mutex_destroy( &p_vout->p->vfilter_lock ); - vout_control_Clean( &p_vout->p->control ); + /* Make sure the vout was stopped first */ + //assert(!vout->p_module); - /* */ - vout_statistic_Clean( &p_vout->p->statistic ); + free(vout->p->splitter_name); - /* */ - vout_snapshot_Clean( &p_vout->p->snapshot ); + /* Destroy the locks */ + vlc_mutex_destroy(&vout->p->spu_lock); + vlc_mutex_destroy(&vout->p->picture_lock); + vlc_mutex_destroy(&vout->p->vfilter_lock); + vout_control_Clean(&vout->p->control); /* */ - free( p_vout->p->psz_filter_chain ); - - config_ChainDestroy( p_vout->p->p_cfg ); + vout_statistic_Clean(&vout->p->statistic); - free( p_vout->p ); + /* */ + vout_snapshot_Clean(&vout->p->snapshot); + video_format_Clean(&vout->p->original); } /* */ @@ -495,10 +271,9 @@ void vout_ChangePause(vout_thread_t *vout, bool is_paused, mtime_t date) vout_control_WaitEmpty(&vout->p->control); } -void vout_GetResetStatistic( vout_thread_t *p_vout, int *pi_displayed, int *pi_lost ) +void vout_GetResetStatistic(vout_thread_t *vout, int *displayed, int *lost) { - vout_statistic_GetReset( &p_vout->p->statistic, - pi_displayed, pi_lost ); + vout_statistic_GetReset( &vout->p->statistic, displayed, lost ); } void vout_Flush(vout_thread_t *vout, mtime_t date) @@ -568,9 +343,29 @@ void vout_DisplayTitle(vout_thread_t *vout, const char *title) vout_control_PushString(&vout->p->control, VOUT_CONTROL_OSD_TITLE, title); } -spu_t *vout_GetSpu( vout_thread_t *p_vout ) +void vout_PutSubpicture( vout_thread_t *vout, subpicture_t *subpic ) { - return p_vout->p->p_spu; + vout_control_cmd_t cmd; + vout_control_cmd_Init(&cmd, VOUT_CONTROL_SUBPICTURE); + cmd.u.subpicture = subpic; + + vout_control_Push(&vout->p->control, &cmd); +} +int vout_RegisterSubpictureChannel( vout_thread_t *vout ) +{ + int channel = SPU_DEFAULT_CHANNEL; + + vlc_mutex_lock(&vout->p->spu_lock); + if (vout->p->p_spu) + channel = spu_RegisterChannel(vout->p->p_spu); + vlc_mutex_unlock(&vout->p->spu_lock); + + return channel; +} +void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel ) +{ + vout_control_PushInteger(&vout->p->control, VOUT_CONTROL_FLUSH_SUBPICTURE, + channel); } /* vout_Control* are usable by anyone at anytime */ @@ -594,133 +389,269 @@ void vout_ControlChangeZoom(vout_thread_t *vout, int num, int den) vout_control_PushPair(&vout->p->control, VOUT_CONTROL_ZOOM, num, den); } - -/***************************************************************************** - * InitThread: initialize video output thread - ***************************************************************************** - * This function is called from Thread 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 ThreadInit(vout_thread_t *vout) +void vout_ControlChangeSampleAspectRatio(vout_thread_t *vout, + unsigned num, unsigned den) { - /* Initialize output method, it allocates direct buffers for us */ - if (vout_InitWrapper(vout)) - return VLC_EGENERIC; - assert(vout->p->decoder_pool); + 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->p->displayed.decoded = NULL; + 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; - /* print some usefull debug info about different vout formats - */ - PrintVideoFormat(vout, "pic render", &vout->p->fmt_render); - PrintVideoFormat(vout, "pic in", &vout->p->fmt_in); - PrintVideoFormat(vout, "pic out", &vout->p->fmt_out); + 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); +} +void vout_ControlChangeSubMargin(vout_thread_t *vout, int margin) +{ + vout_control_PushInteger(&vout->p->control, VOUT_CONTROL_CHANGE_SUB_MARGIN, + margin); +} - assert(vout->p->fmt_out.i_width == vout->p->fmt_render.i_width && - vout->p->fmt_out.i_height == vout->p->fmt_render.i_height && - vout->p->fmt_out.i_chroma == vout->p->fmt_render.i_chroma); - return VLC_SUCCESS; +/* */ +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.vertical = VOUT_DISPLAY_ALIGN_TOP; + else if (align_mask & 0x8) + cfg->align.vertical = VOUT_DISPLAY_ALIGN_BOTTOM; } -/***************************************************************************** - * 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 ThreadClean(vout_thread_t *vout) +vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd, + const vout_window_cfg_t *cfg) { - /* Destroy translation tables */ - if (!vout->p->b_error) { - picture_fifo_Flush(vout->p->decoder_fifo, INT64_MAX, false); - vout_EndWrapper(vout); + 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; + } + + vout_window_Delete(vout->p->window.object); + vout->p->window.is_unused = true; + vout->p->window.object = NULL; } + + vout_window_t *window = vout_window_New(VLC_OBJECT(vout), "$window", + &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; } -static int ThreadDisplayPicture(vout_thread_t *vout, - bool now, mtime_t *deadline) +void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_display_t *vd, + vout_window_t *window) { - int displayed_count = 0; - int lost_count = 0; + 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); + } +} - 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; +/* */ +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; +} - /* 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; - } +/* */ +static picture_t *ThreadDisplayGetDecodedPicture(vout_thread_t *vout, + int *lost_count, bool *is_forced, + bool now, mtime_t *deadline) +{ + vout_display_t *vd = vout->p->display.vd; + + const mtime_t date = mdate(); + const bool is_paused = vout->p->pause.is_on; + bool redisplay = is_paused && !now && vout->p->displayed.decoded; + + mtime_t vfilter_delay = 0; + for (int i = 0; i < VOUT_FILTER_DELAYS; i++) + vfilter_delay = __MAX(vfilter_delay, vout->p->vfilter_delay[i]); + + /* 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) - + vfilter_delay; + picture_Release(peek); + } else { + redisplay = true; } - 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 (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; + return NULL; } - if (*deadline > VOUT_MWAIT_TOLERANCE) - *deadline -= VOUT_MWAIT_TOLERANCE; + /* */ + *is_forced = true; + *deadline = date - vout_chrono_GetHigh(&vout->p->render) - vfilter_delay; + } + if (*deadline > VOUT_MWAIT_TOLERANCE) + *deadline -= VOUT_MWAIT_TOLERANCE; - /* If we are too early and can wait, do it */ - if (date < *deadline && !now) - break; + /* If we are too early and can wait, do it */ + if (date < *deadline && !now) + return NULL; - 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; - } + 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)++; + return 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->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; + + return decoded; +} + +static int ThreadDisplayPicture(vout_thread_t *vout, + bool now, mtime_t *deadline) +{ + vout_display_t *vd = vout->p->display.vd; + int displayed_count = 0; + int lost_count = 0; + + for (;;) { + bool is_forced; + picture_t *decoded = ThreadDisplayGetDecodedPicture(vout, + &lost_count, &is_forced, + now, deadline); + if (!decoded) + break; /* */ vout_chrono_Start(&vout->p->render); @@ -728,11 +659,13 @@ static int ThreadDisplayPicture(vout_thread_t *vout, picture_t *filtered = NULL; if (decoded) { vlc_mutex_lock(&vout->p->vfilter_lock); - filtered = filter_chain_VideoFilter(vout->p->p_vf2_chain, decoded); + filtered = filter_chain_VideoFilter(vout->p->vfilter_chain, decoded); //assert(filtered == decoded); // TODO implement vlc_mutex_unlock(&vout->p->vfilter_lock); if (!filtered) continue; + vout->p->vfilter_delay[vout->p->vfilter_delay_index] = decoded->date - filtered->date; + vout->p->vfilter_delay_index = (vout->p->vfilter_delay_index + 1) % VOUT_FILTER_DELAYS; } /* @@ -760,7 +693,7 @@ static int ThreadDisplayPicture(vout_thread_t *vout, (vout->p->decoder_pool != vout->p->display_pool || subpic)) { picture_t *render; if (vout->p->is_decoder_pool_slow) - render = picture_NewFromFormat(&vout->p->fmt_out); + render = picture_NewFromFormat(&vd->source); else if (vout->p->decoder_pool != vout->p->display_pool) render = picture_pool_Get(vout->p->display_pool); else @@ -770,8 +703,8 @@ static int ThreadDisplayPicture(vout_thread_t *vout, picture_Copy(render, filtered); spu_RenderSubpictures(vout->p->p_spu, - render, &vout->p->fmt_out, - subpic, &vout->p->fmt_in, spu_render_time); + render, &vd->source, + subpic, &vd->source, spu_render_time); } if (vout->p->is_decoder_pool_slow) { direct = picture_pool_Get(vout->p->display_pool); @@ -792,7 +725,7 @@ static int ThreadDisplayPicture(vout_thread_t *vout, * Take a snapshot if requested */ if (direct && do_snapshot) - vout_snapshot_Set(&vout->p->snapshot, &vout->p->fmt_out, direct); + vout_snapshot_Set(&vout->p->snapshot, &vd->source, direct); /* Render the direct buffer returned by vout_RenderPicture */ if (direct) { @@ -811,7 +744,7 @@ static int ThreadDisplayPicture(vout_thread_t *vout, /* Wait the real date (for rendering jitter) */ if (!is_forced) - mwait(decoded->date); + mwait(direct->date); /* Display the direct buffer returned by vout_RenderPicture */ vout->p->displayed.date = mdate(); @@ -828,10 +761,10 @@ static int ThreadDisplayPicture(vout_thread_t *vout, return VLC_SUCCESS; } -static int ThreadManage(vout_thread_t *vout, - mtime_t *deadline, - vout_interlacing_support_t *interlacing, - vout_postprocessing_support_t *postprocessing) +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); @@ -849,59 +782,68 @@ static int ThreadManage(vout_thread_t *vout, /* Deinterlacing */ vout_SetInterlacingState(vout, interlacing, picture_interlaced); - if (vout_ManageWrapper(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 - return VLC_EGENERIC; - } - return VLC_SUCCESS; + vout_ManageWrapper(vout); +} + +static void ThreadDisplaySubpicture(vout_thread_t *vout, + subpicture_t *subpicture) +{ + spu_DisplaySubpicture(vout->p->p_spu, subpicture); +} + +static void ThreadFlushSubpicture(vout_thread_t *vout, int channel) +{ + spu_ClearChannel(vout->p->p_spu, channel); } static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string) { - if( !var_InheritBool(vout, "osd")) - return; if (!vout->p->title.show) return; - vlc_assert_locked(&vout->p->change_lock); - - const mtime_t start = mdate(); - const mtime_t stop = start + - INT64_C(1000) * vout->p->title.timeout; - - if (stop > start) - vout_ShowTextAbsolute(vout, SPU_DEFAULT_CHANNEL, - string, NULL, - vout->p->title.position, - 30 + vout->p->fmt_in.i_width - - vout->p->fmt_in.i_visible_width - - vout->p->fmt_in.i_x_offset, - 20 + vout->p->fmt_in.i_y_offset, - start, stop); + vout_OSDText(vout, SPU_DEFAULT_CHANNEL, + vout->p->title.position, INT64_C(1000) * vout->p->title.timeout, + string); } static void ThreadChangeFilters(vout_thread_t *vout, const char *filters) { es_format_t fmt; - es_format_Init(&fmt, VIDEO_ES, vout->p->fmt_render.i_chroma); - fmt.video = vout->p->fmt_render; + es_format_Init(&fmt, VIDEO_ES, vout->p->original.i_chroma); + fmt.video = vout->p->original; vlc_mutex_lock(&vout->p->vfilter_lock); - filter_chain_Reset(vout->p->p_vf2_chain, &fmt, &fmt); - if (filter_chain_AppendFromString(vout->p->p_vf2_chain, + 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"); vlc_mutex_unlock(&vout->p->vfilter_lock); + + vout->p->vfilter_delay_index = 0; + for (int i = 0; i < VOUT_FILTER_DELAYS; i++) + vout->p->vfilter_delay[i] = 0; +} + +static void ThreadChangeSubFilters(vout_thread_t *vout, const char *filters) +{ + spu_ChangeFilters(vout->p->p_spu, filters); +} +static void ThreadChangeSubMargin(vout_thread_t *vout, int margin) +{ + spu_ChangeMargin(vout->p->p_spu, margin); +} + +static void ThreadFilterFlush(vout_thread_t *vout) +{ + vlc_mutex_lock(&vout->p->vfilter_lock); + filter_chain_VideoFlush(vout->p->vfilter_chain); + vlc_mutex_unlock(&vout->p->vfilter_lock); } static void ThreadChangePause(vout_thread_t *vout, bool is_paused, mtime_t date) { - vlc_assert_locked(&vout->p->change_lock); assert(!vout->p->pause.is_on || !is_paused); if (vout->p->pause.is_on) { @@ -916,6 +858,8 @@ static void ThreadChangePause(vout_thread_t *vout, bool is_paused, mtime_t date) vout->p->displayed.decoded->date += duration; spu_OffsetSubtitleDate(vout->p->p_spu, duration); + + ThreadFilterFlush(vout); } else { vout->p->step.timestamp = VLC_TS_INVALID; vout->p->step.last = VLC_TS_INVALID; @@ -940,6 +884,8 @@ static void ThreadFlush(vout_thread_t *vout, bool below, mtime_t date) vout->p->displayed.timestamp = VLC_TS_INVALID; } } + ThreadFilterFlush(vout); + picture_fifo_Flush(vout->p->decoder_fifo, date, below); } @@ -1004,6 +950,182 @@ static void ThreadChangeZoom(vout_thread_t *vout, int num, int den) vout_SetDisplayZoom(vout->p->display.vd, num, den); } +static void ThreadChangeAspectRatio(vout_thread_t *vout, + unsigned num, unsigned den) +{ + const video_format_t *source = &vout->p->original; + + if (num > 0 && den > 0) { + num *= source->i_visible_height; + den *= source->i_visible_width; + vlc_ureduce(&num, &den, num, den, 0); + } + vout_SetDisplayAspect(vout->p->display.vd, num, den); +} + + +static void ThreadExecuteCropWindow(vout_thread_t *vout, + unsigned crop_num, unsigned crop_den, + unsigned x, unsigned y, + unsigned width, unsigned height) +{ + const video_format_t *source = &vout->p->original; + + 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) +{ + 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)); +} + +static void ThreadExecuteCropRatio(vout_thread_t *vout, + unsigned num, unsigned den) +{ + const video_format_t *source = &vout->p->original; + ThreadExecuteCropWindow(vout, num, den, + 0, 0, + source->i_visible_width, + source->i_visible_height); +} + +static int ThreadStart(vout_thread_t *vout, const vout_display_state_t *state) +{ + 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->p->vfilter_delay_index = 0; + for (int i = 0; i < VOUT_FILTER_DELAYS; i++) + vout->p->vfilter_delay[i] = 0; + + 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; + } + + if (vout_OpenWrapper(vout, vout->p->splitter_name, state)) + return VLC_EGENERIC; + if (vout_InitWrapper(vout)) + return VLC_EGENERIC; + assert(vout->p->decoder_pool); + + 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; + + 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 void ThreadStop(vout_thread_t *vout, vout_display_state_t *state) +{ + /* Destroy the video filters2 */ + filter_chain_Delete(vout->p->vfilter_chain); + + /* 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); + } + + if (vout->p->decoder_fifo) + picture_fifo_Delete(vout->p->decoder_fifo); + assert(!vout->p->decoder_pool); +} + +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 */ +} + +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); +} + +static int ThreadReinit(vout_thread_t *vout, + const vout_configuration_t *cfg) +{ + 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)) { + if (cfg->dpb_size <= vout->p->dpb_size) + return VLC_SUCCESS; + msg_Warn(vout, "DPB need to be increased"); + } + + vout_display_state_t state; + memset(&state, 0, sizeof(state)); + + 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; + vout->p->dpb_size = cfg->dpb_size; + if (ThreadStart(vout, &state)) { + ThreadClean(vout); + return VLC_EGENERIC; + } + return VLC_SUCCESS; +} + /***************************************************************************** * Thread: video output thread ***************************************************************************** @@ -1014,28 +1136,7 @@ static void ThreadChangeZoom(vout_thread_t *vout, int num, int den) static void *Thread(void *object) { vout_thread_t *vout = object; - bool has_wrapper; - - /* - * Initialize thread - */ - has_wrapper = !vout_OpenWrapper(vout, vout->p->psz_module_name); - - vlc_mutex_lock(&vout->p->change_lock); - if (has_wrapper) - vout->p->b_error = ThreadInit(vout); - else - vout->p->b_error = true; - - /* signal the creation of the vout */ - vout->p->b_ready = true; - vlc_cond_signal(&vout->p->change_wait); - - if (vout->p->b_error) - goto exit_thread; - - /* */ vout_interlacing_support_t interlacing = { .is_interlaced = false, .date = mdate(), @@ -1044,28 +1145,49 @@ static void *Thread(void *object) .qtype = QTYPE_NONE, }; - /* - * Main loop - it is not executed if an error occurred during - * initialization - */ mtime_t deadline = VLC_TS_INVALID; - while (!vout->p->b_done && !vout->p->b_error) { + for (;;) { vout_control_cmd_t cmd; - vlc_mutex_unlock(&vout->p->change_lock); /* FIXME remove thoses ugly timeouts */ while (!vout_control_Pop(&vout->p->control, &cmd, deadline, 100000)) { - /* TODO remove the lock when possible (ie when - * vout->p->fmt_* are not protected by it anymore) */ - vlc_mutex_lock(&vout->p->change_lock); 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_SUBPICTURE: + ThreadDisplaySubpicture(vout, cmd.u.subpicture); + cmd.u.subpicture = NULL; + break; + case VOUT_CONTROL_FLUSH_SUBPICTURE: + ThreadFlushSubpicture(vout, cmd.u.integer); + 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_CHANGE_SUB_MARGIN: + ThreadChangeSubMargin(vout, cmd.u.integer); + break; case VOUT_CONTROL_PAUSE: ThreadChangePause(vout, cmd.u.pause.is_on, cmd.u.pause.date); break; @@ -1090,107 +1212,29 @@ static void *Thread(void *object) 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; } - vlc_mutex_unlock(&vout->p->change_lock); vout_control_cmd_Clean(&cmd); } - vlc_mutex_lock(&vout->p->change_lock); - - /* */ - if (ThreadManage(vout, &deadline, - &interlacing, &postprocessing)) { - vout->p->b_error = true; - break; - } - } - - /* - * Error loop - wait until the thread destruction is requested - * - * XXX I wonder if we should periodically clean the decoder_fifo - * or have a way to prevent it filling up. - */ - while (vout->p->b_error && !vout->p->b_done) - vlc_cond_wait(&vout->p->change_wait, &vout->p->change_lock); - - /* Clean thread */ - ThreadClean(vout); - -exit_thread: - /* Detach subpicture unit from both input and vout */ - spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), false); - vlc_object_detach(vout->p->p_spu); - - vlc_mutex_unlock(&vout->p->change_lock); - - if (has_wrapper) - vout_CloseWrapper(vout); - vout_control_Dead(&vout->p->control); - - /* Destroy the video filters2 */ - filter_chain_Delete(vout->p->p_vf2_chain); - - return NULL; -} -/***************************************************************************** - * object variables callbacks: a bunch of object variables are used by the - * interfaces to interact with the vout. - *****************************************************************************/ -static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - vout_thread_t *p_vout = (vout_thread_t *)p_this; - input_thread_t *p_input; - (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; + ThreadManage(vout, &deadline, &interlacing, &postprocessing); } - - /* Modify input as well because the vout might have to be restarted */ - var_Create( p_input, "vout-filter", VLC_VAR_STRING ); - var_SetString( p_input, "vout-filter", newval.psz_string ); - - /* Now restart current video stream */ - input_Control( p_input, INPUT_RESTART_ES, -VIDEO_ES ); - vlc_object_release( p_input ); - - return VLC_SUCCESS; -} - -/***************************************************************************** - * Video Filter2 stuff - *****************************************************************************/ -static int VideoFilter2Callback(vlc_object_t *object, char const *cmd, - vlc_value_t oldval, vlc_value_t newval, - void *data) -{ - vout_thread_t *vout = (vout_thread_t *)object; - (void)cmd; (void)oldval; (void)data; - - vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_FILTERS, - newval.psz_string); - return VLC_SUCCESS; -} - -/* */ -static void PrintVideoFormat(vout_thread_t *vout, - const char *description, - const video_format_t *fmt) -{ - msg_Dbg(vout, "%s sz %ix%i, of (%i,%i), vsz %ix%i, 4cc %4.4s, sar %i:%i, msk r0x%x g0x%x b0x%x", - description, - fmt->i_width, fmt->i_height, fmt->i_x_offset, fmt->i_y_offset, - fmt->i_visible_width, fmt->i_visible_height, - (char*)&fmt->i_chroma, - fmt->i_sar_num, fmt->i_sar_den, - fmt->i_rmask, fmt->i_gmask, fmt->i_bmask); }