X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=9e1b73d5c6a892c4a3fdfca0942c0fd681780f50;hb=e5cd0b1fd117c683eca0c7f8874c26964bf244f9;hp=da9e2b87aa5fce594cec04c163f6e0eabf06f551;hpb=ed22ebd8f2ac249e7f1c841a0322cb86b7a4bdab;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index da9e2b87aa..9e1b73d5c6 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,25 +38,12 @@ #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 @@ -65,16 +53,8 @@ /***************************************************************************** * 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 VideoFormatImportRgb( video_format_t *, const picture_heap_t * ); -static void PictureHeapFixRgb( picture_heap_t * ); - -static void vout_Destructor ( vlc_object_t * p_this ); +static void *Thread(void *); +static void vout_Destructor(vlc_object_t *); /* Object variables callbacks */ static int FilterCallback( vlc_object_t *, char const *, @@ -92,33 +72,24 @@ static int PostProcessCallback( vlc_object_t *, char const *, static void DeinterlaceEnable( vout_thread_t * ); static void DeinterlaceNeeded( vout_thread_t *, bool ); -/* 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 ); -/* 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)) +/* */ +static void PrintVideoFormat(vout_thread_t *, const char *, const video_format_t *); -/* 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)) +/* 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)) + +/** + * 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 +#define VOUT_MWAIT_TOLERANCE (INT64_C(1000)) /***************************************************************************** * Video Filter2 functions @@ -126,38 +97,32 @@ static void DisplayTitleOnOSD( vout_thread_t *p_vout ); 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; + return picture_pool_Get(p_vout->p->private_pool); } 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 ); + 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_vout_buffer_new = video_new_buffer_filter; - p_filter->pf_vout_buffer_del = video_del_buffer_filter; + 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 ) +vout_thread_t *vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, + video_format_t *p_fmt ) { if( !p_fmt ) { @@ -180,7 +145,7 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, /* If we now have a video output, check it has the right properties */ if( p_vout ) { - vlc_mutex_lock( &p_vout->change_lock ); + vlc_mutex_lock( &p_vout->p->change_lock ); /* We don't directly check for the "vout-filter" variable for obvious * performance reasons. */ @@ -207,12 +172,14 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, free( psz_filter_chain ); } +#warning "FIXME: Check RGB masks in vout_Request" + /* FIXME: check RGB masks */ if( p_vout->fmt_render.i_chroma != vlc_fourcc_GetCodec( VIDEO_ES, 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 ); + vlc_mutex_unlock( &p_vout->p->change_lock ); /* We are not interested in this format, close this vout */ vout_CloseAndRelease( p_vout ); @@ -246,15 +213,9 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, p_vout->fmt_render.i_sar_num = i_sar_num; p_vout->fmt_render.i_sar_den = i_sar_den; - - p_vout->render.i_aspect = (int64_t)i_sar_num * - p_vout->fmt_render.i_width * - VOUT_ASPECT_FACTOR / - i_sar_den / - p_vout->fmt_render.i_height; - p_vout->i_changes |= VOUT_ASPECT_CHANGE; + p_vout->p->i_changes |= VOUT_ASPECT_CHANGE; } - vlc_mutex_unlock( &p_vout->change_lock ); + vlc_mutex_unlock( &p_vout->p->change_lock ); vlc_object_release( p_vout ); } @@ -263,11 +224,11 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, { msg_Dbg( p_this, "reusing provided vout" ); - spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false ); + 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_spu, VLC_OBJECT(p_vout), true ); + spu_Attach( p_vout->p->p_spu, VLC_OBJECT(p_vout), true ); } } @@ -287,32 +248,24 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, * This function creates a new video output thread, and returns a pointer * to its description. On error, it returns NULL. *****************************************************************************/ -vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) +vout_thread_t * (vout_Create)( vlc_object_t *p_parent, video_format_t *p_fmt ) { - vout_thread_t * p_vout; /* thread descriptor */ - int i_index; /* loop variable */ - vlc_value_t text; + vout_thread_t *p_vout; /* thread descriptor */ + vlc_value_t text; - unsigned int i_width = p_fmt->i_width; - unsigned int i_height = p_fmt->i_height; - vlc_fourcc_t i_chroma = vlc_fourcc_GetCodec( VIDEO_ES, p_fmt->i_chroma ); config_chain_t *p_cfg; char *psz_parser; char *psz_name; - if( i_width <= 0 || i_height <= 0 ) + 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 ) return NULL; - unsigned int i_aspect = (int64_t)p_fmt->i_sar_num * - i_width * - VOUT_ASPECT_FACTOR / - p_fmt->i_sar_den / - i_height; /* Allocate descriptor */ static const char typename[] = "video output"; @@ -329,98 +282,69 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) return NULL; } - /* Initialize pictures - translation tables and functions - * will be initialized later in InitThread */ - for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++) - { - p_vout->p_picture[i_index].pf_lock = NULL; - p_vout->p_picture[i_index].pf_unlock = NULL; - p_vout->p_picture[i_index].i_status = FREE_PICTURE; - p_vout->p_picture[i_index].i_type = EMPTY_PICTURE; - p_vout->p_picture[i_index].b_slow = 0; - } - - /* No images in the heap */ - p_vout->i_heap_size = 0; - - /* Initialize the rendering heap */ - I_RENDERPICTURES = 0; - + /* */ p_vout->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; + p_vout->fmt_render.i_chroma = + p_vout->fmt_in.i_chroma = i_chroma; + video_format_FixRgb( &p_vout->fmt_render ); + video_format_FixRgb( &p_vout->fmt_in ); /* Initialize misc stuff */ - p_vout->i_changes = 0; - p_vout->b_autoscale = 1; - p_vout->i_zoom = ZOOM_FP_FACTOR; - 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_changes = 0; + p_vout->p->b_fullscreen = 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->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; - p_vout->p->i_picture_qtype = QTYPE_NONE; - p_vout->p->b_picture_interlaced = false; + 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; + + p_vout->p->step.is_requested = false; + p_vout->p->step.last = VLC_TS_INVALID; + p_vout->p->step.timestamp = VLC_TS_INVALID; + + p_vout->p->pause.is_on = false; + p_vout->p->pause.date = VLC_TS_INVALID; + + p_vout->p->decoder_fifo = picture_fifo_New(); + p_vout->p->decoder_pool = NULL; vlc_mouse_Init( &p_vout->p->mouse ); vout_snapshot_Init( &p_vout->p->snapshot ); /* Initialize locks */ - vlc_mutex_init( &p_vout->picture_lock ); + vlc_mutex_init( &p_vout->p->picture_lock ); vlc_cond_init( &p_vout->p->picture_wait ); - vlc_mutex_init( &p_vout->change_lock ); + vlc_mutex_init( &p_vout->p->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 ); - - /* Initialize subpicture unit */ - p_vout->p_spu = spu_Create( p_vout ); + 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 ); /* Attach the new object now so we can use var inheritance below */ vlc_object_attach( p_vout, p_parent ); + /* Initialize subpicture unit */ + p_vout->p->p_spu = spu_Create( p_vout ); + /* */ - spu_Init( p_vout->p_spu ); + spu_Init( p_vout->p->p_spu ); + + spu_Attach( p_vout->p->p_spu, VLC_OBJECT(p_vout), true ); - spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), true ); + p_vout->p->is_late_dropped = var_InheritBool( p_vout, "drop-late-frames" ); /* Take care of some "interface/control" related initialisations */ vout_IntfInit( p_vout ); @@ -473,14 +397,14 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) else { psz_parser = strdup( p_vout->p->psz_filter_chain ); - p_vout->p->b_title_show = false; + p_vout->p->title.show = false; } /* Create the vout thread */ - char* psz_tmp = config_ChainCreate( &psz_name, &p_cfg, psz_parser ); + 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->p_cfg = p_cfg; /* Create a few object variables for interface interaction */ var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); @@ -492,37 +416,40 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) DeinterlaceEnable( p_vout ); if( p_vout->p->psz_filter_chain && *p_vout->p->psz_filter_chain ) - p_vout->p->psz_module_type = "video filter"; - else - p_vout->p->psz_module_type = "video output"; + { + 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; - p_vout->p_module = NULL; /* */ vlc_object_set_destructor( p_vout, vout_Destructor ); /* */ vlc_cond_init( &p_vout->p->change_wait ); - if( vlc_clone( &p_vout->p->thread, RunThread, p_vout, + if( vlc_clone( &p_vout->p->thread, Thread, p_vout, VLC_THREAD_PRIORITY_OUTPUT ) ) { - spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false ); - spu_Destroy( p_vout->p_spu ); - p_vout->p_spu = NULL; + 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 ); return NULL; } - vlc_mutex_lock( &p_vout->change_lock ); + 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->change_lock ); + vlc_cond_wait( &p_vout->p->change_wait, &p_vout->p->change_lock ); } - vlc_mutex_unlock( &p_vout->change_lock ); + vlc_mutex_unlock( &p_vout->p->change_lock ); - if( p_vout->b_error ) + if( p_vout->p->b_error ) { msg_Err( p_vout, "video output creation failed" ); vout_CloseAndRelease( p_vout ); @@ -544,10 +471,10 @@ void vout_Close( vout_thread_t *p_vout ) { assert( p_vout ); - vlc_mutex_lock( &p_vout->change_lock ); + 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->change_lock ); + vlc_mutex_unlock( &p_vout->p->change_lock ); vout_snapshot_End( &p_vout->p->snapshot ); @@ -560,19 +487,25 @@ 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 ); + //assert( !p_vout->p_module ); free( p_vout->p->psz_module_name ); /* */ - if( p_vout->p_spu ) - spu_Destroy( p_vout->p_spu ); + if( p_vout->p->p_spu ) + spu_Destroy( p_vout->p->p_spu ); + + vout_chrono_Clean( &p_vout->p->render ); + + if( p_vout->p->decoder_fifo ) + picture_fifo_Delete( p_vout->p->decoder_fifo ); + assert( !p_vout->p->decoder_pool ); /* 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->picture_lock ); + vlc_mutex_destroy( &p_vout->p->change_lock ); vlc_mutex_destroy( &p_vout->p->vfilter_lock ); /* */ @@ -583,9 +516,9 @@ static void vout_Destructor( vlc_object_t * p_this ) /* */ free( p_vout->p->psz_filter_chain ); - free( p_vout->p->psz_title ); + free( p_vout->p->title.value ); - config_ChainDestroy( p_vout->p_cfg ); + config_ChainDestroy( p_vout->p->p_cfg ); free( p_vout->p ); @@ -594,38 +527,39 @@ static void vout_Destructor( vlc_object_t * p_this ) /* */ void vout_ChangePause( vout_thread_t *p_vout, bool b_paused, mtime_t i_date ) { - vlc_mutex_lock( &p_vout->change_lock ); - - assert( !p_vout->p->b_paused || !b_paused ); + vlc_mutex_lock( &p_vout->p->change_lock ); - vlc_mutex_lock( &p_vout->picture_lock ); + assert( !p_vout->p->pause.is_on || !b_paused ); - p_vout->p->i_picture_displayed_date = 0; + vlc_mutex_lock( &p_vout->p->picture_lock ); - if( p_vout->p->b_paused ) + if( p_vout->p->pause.is_on ) { - const mtime_t i_duration = i_date - p_vout->p->i_pause_date; + const mtime_t i_duration = i_date - p_vout->p->pause.date; - for( int i_index = 0; i_index < I_RENDERPICTURES; i_index++ ) - { - picture_t *p_pic = PP_RENDERPICTURE[i_index]; + if (p_vout->p->step.timestamp > VLC_TS_INVALID) + p_vout->p->step.timestamp += i_duration; + if (!b_paused) + p_vout->p->step.last = p_vout->p->step.timestamp; + picture_fifo_OffsetDate( p_vout->p->decoder_fifo, i_duration ); + if (p_vout->p->displayed.decoded) + p_vout->p->displayed.decoded->date += i_duration; - 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 ); + vlc_mutex_unlock( &p_vout->p->picture_lock ); - spu_OffsetSubtitleDate( p_vout->p_spu, i_duration ); + spu_OffsetSubtitleDate( p_vout->p->p_spu, i_duration ); } else { - vlc_mutex_unlock( &p_vout->picture_lock ); + if (b_paused) + p_vout->p->step.last = p_vout->p->step.timestamp; + vlc_mutex_unlock( &p_vout->p->picture_lock ); } - p_vout->p->b_paused = b_paused; - p_vout->p->i_pause_date = i_date; + p_vout->p->pause.is_on = b_paused; + p_vout->p->pause.date = i_date; - vlc_mutex_unlock( &p_vout->change_lock ); + vlc_mutex_unlock( &p_vout->p->change_lock ); } void vout_GetResetStatistic( vout_thread_t *p_vout, int *pi_displayed, int *pi_lost ) @@ -634,947 +568,515 @@ void vout_GetResetStatistic( vout_thread_t *p_vout, int *pi_displayed, int *pi_l pi_displayed, pi_lost ); } -void vout_Flush( vout_thread_t *p_vout, mtime_t i_date ) +static void Flush(vout_thread_t *vout, mtime_t date, bool reset, bool below) { - 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_assert_locked(&vout->p->picture_lock); + vout->p->step.timestamp = VLC_TS_INVALID; + vout->p->step.last = VLC_TS_INVALID; + + picture_t *last = vout->p->displayed.decoded; + if (last) { + if (reset) { + picture_Release(last); + vout->p->displayed.decoded = NULL; + } else if (( below && last->date <= date) || + (!below && last->date >= date)) { + vout->p->step.is_requested = true; } } - vlc_cond_signal( &p_vout->p->picture_wait ); - vlc_mutex_unlock( &p_vout->picture_lock ); + picture_fifo_Flush( vout->p->decoder_fifo, date, below ); } -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(&vout->p->picture_lock); - vlc_mutex_lock( &p_vout->picture_lock ); + Flush(vout, date, false, false); - 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]; + vlc_cond_signal(&vout->p->picture_wait); + vlc_mutex_unlock(&vout->p->picture_lock); +} - 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; +void vout_Reset(vout_thread_t *vout) +{ + vlc_mutex_lock(&vout->p->picture_lock); - continue; - } + Flush(vout, INT64_MAX, true, true); + if (vout->p->decoder_pool) + picture_pool_NonEmpty(vout->p->decoder_pool, true); + vout->p->pause.is_on = false; + vout->p->pause.date = mdate(); - 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; - } + vlc_cond_signal( &vout->p->picture_wait ); + vlc_mutex_unlock(&vout->p->picture_lock); +} + +void vout_FixLeaks( vout_thread_t *vout ) +{ + vlc_mutex_lock(&vout->p->picture_lock); + + picture_t *picture = picture_fifo_Peek(vout->p->decoder_fifo); + if (!picture) { + picture = picture_pool_Get(vout->p->decoder_pool); } - if( i_pic < p_vout->render.i_pictures && !b_forced ) - { - vlc_mutex_unlock( &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; } - /* 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]; + /* 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"); - msg_Dbg( p_vout, "[%d] %d %d", i_pic, p_pic->i_status, p_pic->i_refcount ); - p_pic->i_refcount = 0; + /* */ + picture_pool_NonEmpty(vout->p->decoder_pool, false); - 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 ); + vlc_cond_signal(&vout->p->picture_wait); + vlc_mutex_unlock(&vout->p->picture_lock); } -void vout_NextPicture( vout_thread_t *p_vout, mtime_t *pi_duration ) +void vout_NextPicture(vout_thread_t *vout, mtime_t *duration) { - vlc_mutex_lock( &p_vout->picture_lock ); + vlc_mutex_lock(&vout->p->picture_lock); - const mtime_t i_displayed_date = p_vout->p->i_picture_displayed_date; + vout->p->b_picture_empty = false; + vout->p->step.is_requested = true; - 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 ); - } + /* FIXME I highly doubt that it can works with only one cond_t FIXME */ + vlc_cond_signal(&vout->p->picture_wait); - 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 ); + while (vout->p->step.is_requested && !vout->p->b_picture_empty) + vlc_cond_wait(&vout->p->picture_wait, &vout->p->picture_lock); - *pi_duration = __MAX( p_vout->p->i_picture_displayed_date - i_displayed_date, 0 ); + 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; + } else { + *duration = 0; + } /* TODO advance subpicture by the duration ... */ - - 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 ) { assert( psz_title ); - if( !config_GetInt( p_vout, "osd" ) ) + if( !var_InheritBool( 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 ); + vlc_mutex_lock( &p_vout->p->change_lock ); + free( p_vout->p->title.value ); + p_vout->p->title.value = strdup( psz_title ); + vlc_mutex_unlock( &p_vout->p->change_lock ); } spu_t *vout_GetSpu( vout_thread_t *p_vout ) { - return p_vout->p_spu; + return p_vout->p->p_spu; } /***************************************************************************** * InitThread: initialize video output thread ***************************************************************************** - * This function is called from RunThread and performs the second step of the + * 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 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 ) -{ - if( !vout_ChromaCmp( p_output->i_chroma, p_render->i_chroma ) ) - return false; - - if( p_output->i_chroma != VLC_CODEC_RGB15 && - p_output->i_chroma != VLC_CODEC_RGB16 && - p_output->i_chroma != VLC_CODEC_RGB24 && - p_output->i_chroma != VLC_CODEC_RGB32 ) - 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; -} - -static int InitThread( vout_thread_t *p_vout ) +static int ThreadInit(vout_thread_t *vout) { - int i; - /* 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 ); + if (vout_InitWrapper(vout)) return VLC_EGENERIC; - } - - msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES ); + assert(vout->p->decoder_pool); - 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_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->output.i_aspect * - p_vout->fmt_out.i_height; - p_vout->fmt_out.i_sar_den = VOUT_ASPECT_FACTOR * - p_vout->fmt_out.i_width; - } - - 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 ); - - /* 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 ); + vout->p->displayed.decoded = NULL; /* print some usefull debug info about different vout formats */ - msg_Dbg( p_vout, "pic render sz %ix%i, of (%i,%i), vsz %ix%i, 4cc %4.4s, sar %i:%i, msk r0x%x g0x%x b0x%x", - 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, - p_vout->fmt_render.i_sar_num, p_vout->fmt_render.i_sar_den, - p_vout->fmt_render.i_rmask, p_vout->fmt_render.i_gmask, p_vout->fmt_render.i_bmask ); - - msg_Dbg( p_vout, "pic in sz %ix%i, of (%i,%i), vsz %ix%i, 4cc %4.4s, sar %i:%i, msk r0x%x g0x%x b0x%x", - 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, - p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den, - p_vout->fmt_in.i_rmask, p_vout->fmt_in.i_gmask, p_vout->fmt_in.i_bmask ); - - msg_Dbg( p_vout, "pic out sz %ix%i, of (%i,%i), vsz %ix%i, 4cc %4.4s, sar %i:%i, msk r0x%x g0x%x b0x%x", - 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, - p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den, - p_vout->fmt_out.i_rmask, p_vout->fmt_out.i_gmask, p_vout->fmt_out.i_bmask ); - - /* 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++; - } - - 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; - } - - 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; - } - } + PrintVideoFormat(vout, "pic render", &vout->fmt_render); + PrintVideoFormat(vout, "pic in", &vout->fmt_in); + PrintVideoFormat(vout, "pic out", &vout->fmt_out); + assert(vout->fmt_out.i_width == vout->fmt_render.i_width && + vout->fmt_out.i_height == vout->fmt_render.i_height && + vout->fmt_out.i_chroma == vout->fmt_render.i_chroma); return VLC_SUCCESS; } /***************************************************************************** - * RunThread: video output thread + * CleanThread: clean up after InitThread ***************************************************************************** - * 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. + * 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* RunThread( void *p_this ) +static void ThreadClean(vout_thread_t *vout) { - vout_thread_t *p_vout = p_this; - int i_idle_loops = 0; /* loops without displaying a picture */ - int i_picture_qtype_last = QTYPE_NONE; - bool b_picture_interlaced_last = false; - mtime_t i_picture_interlaced_last_date; - - /* - * Initialize thread - */ - p_vout->p_module = module_need( p_vout, - p_vout->p->psz_module_type, - p_vout->p->psz_module_name, - !strcmp(p_vout->p->psz_module_type, "video filter") ); - - vlc_mutex_lock( &p_vout->change_lock ); - - if( p_vout->p_module ) - p_vout->b_error = InitThread( p_vout ); - else - p_vout->b_error = true; - - /* 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 ) - goto exit_thread; - - /* */ - const bool b_drop_late = var_CreateGetBool( p_vout, "drop-late-frames" ); - i_picture_interlaced_last_date = mdate(); - - /* - * 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 ); - vout_statistic_Update( &p_vout->p->statistic, 0, 1 ); + /* Destroy translation tables */ + if (!vout->p->b_error) { + picture_fifo_Flush(vout->p->decoder_fifo, INT64_MAX, false); + vout_EndWrapper(vout); + } +} - msg_Warn( p_vout, "late picture skipped (%"PRId64" > %d)", - current_date - p_pic->date, - p_vout->p->render_time ); - } - else if( ( !p_last || p_last->date < p_pic->date ) && - ( p_picture == NULL || p_pic->date < p_picture->date ) ) - { - p_picture = p_pic; +static int ThreadDisplayPicture(vout_thread_t *vout, + bool now, mtime_t *deadline) +{ + 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; + 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; } + + vout->p->displayed.is_interlaced = !decoded->b_progressive; + vout->p->displayed.qtype = decoded->i_qtype; } + vout->p->displayed.timestamp = decoded->date; /* */ - const int i_postproc_type = p_vout->p->i_picture_qtype; - const int i_postproc_state = (p_vout->p->i_picture_qtype != QTYPE_NONE) - (i_picture_qtype_last != QTYPE_NONE); - - const bool b_picture_interlaced = p_vout->p->b_picture_interlaced; - const int i_picture_interlaced_state = (!!p_vout->p->b_picture_interlaced) - (!!b_picture_interlaced_last); - - vlc_mutex_unlock( &p_vout->picture_lock ); - - if( p_picture == NULL ) - i_idle_loops++; + if (vout->p->displayed.decoded) + picture_Release(vout->p->displayed.decoded); + picture_Hold(decoded); + vout->p->displayed.decoded = decoded; - p_filtered_picture = NULL; - if( p_picture ) - p_filtered_picture = filter_chain_VideoFilter( p_vout->p->p_vf2_chain, - p_picture ); - - const bool b_snapshot = vout_snapshot_IsRequested( &p_vout->p->snapshot ); + /* */ + 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->p_vf2_chain, decoded); + //assert(filtered == decoded); // TODO implement + vlc_mutex_unlock(&vout->p->vfilter_lock); + if (!filtered) + continue; + } /* * Check for subpictures to display */ - mtime_t spu_render_time; - if( p_vout->p->b_paused ) - spu_render_time = p_vout->p->i_pause_date; - else if( p_picture ) - spu_render_time = p_picture->date > 1 ? p_picture->date : mdate(); + 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 = 0; + spu_render_time = filtered->date > 1 ? filtered->date : mdate(); - subpicture_t *p_subpic = spu_SortSubpictures( p_vout->p_spu, - spu_render_time, - b_snapshot ); + 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 */ - vout_statistic_Update( &p_vout->p->statistic, 1, 0 ); - p_directbuffer = vout_RenderPicture( p_vout, - p_filtered_picture, p_subpic, - spu_render_time ); + 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(&vout->fmt_out); + 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); - /* - * Take a snapshot if requested - */ - if( p_directbuffer && b_snapshot ) - vout_snapshot_Set( &p_vout->p->snapshot, - &p_vout->fmt_out, p_directbuffer ); + if (render) { + picture_Copy(render, filtered); - /* - * 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 ); + spu_RenderSubpictures(vout->p->p_spu, + render, &vout->fmt_out, + subpic, &vout->fmt_in, spu_render_time); + } + 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; + } + picture_Release(filtered); + filtered = NULL; + } else { + direct = filtered; } /* - * Sleep, wake up + * Take a snapshot if requested */ - 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; - } - else - msg_Dbg( p_vout, "skipped big render time %d > %d", (int) current_render_time, - (int) (p_vout->p->render_time +VOUT_DISPLAY_DELAY ) ) ; - } + if (direct && do_snapshot) + vout_snapshot_Set(&vout->p->snapshot, &vout->fmt_out, direct); - /* Give back change lock */ - vlc_mutex_unlock( &p_vout->change_lock ); + /* Render the direct buffer returned by vout_RenderPicture */ + if (direct) { + vout_RenderWrapper(vout, direct); - /* 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 ) + vout_chrono_Stop(&vout->p->render); +#if 0 { - mwait( display_date - VOUT_MWAIT_TOLERANCE ); + 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)); } - } - 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 ); +#endif } - /* 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 ); + /* Wait the real date (for rendering jitter) */ + if (!is_forced) + mwait(decoded->date); - /* - * 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 ); + /* Display the direct buffer returned by vout_RenderPicture */ + vout->p->displayed.date = mdate(); + if (direct) + vout_DisplayWrapper(vout, direct); - /* 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 ); - } + displayed_count++; + break; + } - if( p_picture != NULL ) - { - /* Reinitialize idle loop count */ - i_idle_loops = 0; - } + vout_statistic_Update(&vout->p->statistic, displayed_count, lost_count); + if (displayed_count <= 0) + return VLC_EGENERIC; + return VLC_SUCCESS; +} - /* - * Check events and manage thread - */ - 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; - } +/***************************************************************************** + * 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) +{ + vout_thread_t *vout = object; + bool has_wrapper; - while( p_vout->i_changes & VOUT_ON_TOP_CHANGE ) - { - p_vout->i_changes &= ~VOUT_ON_TOP_CHANGE; - vlc_mutex_unlock( &p_vout->change_lock ); - vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, p_vout->b_on_top ); - vlc_mutex_lock( &p_vout->change_lock ); - } + /* + * Initialize thread + */ + has_wrapper = !vout_OpenWrapper(vout, vout->p->psz_module_name); - 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; + vlc_mutex_lock(&vout->p->change_lock); - p_vout->i_changes &= ~VOUT_SIZE_CHANGE; + if (has_wrapper) + vout->p->b_error = ThreadInit(vout); + else + vout->p->b_error = true; - assert( !p_vout->p->b_direct ); + /* signal the creation of the vout */ + vout->p->b_ready = true; + vlc_cond_signal(&vout->p->change_wait); - ChromaDestroy( p_vout ); + if (vout->p->b_error) + goto exit_thread; - vlc_mutex_lock( &p_vout->picture_lock ); + /* */ + bool last_picture_interlaced = false; + int last_picture_qtype = QTYPE_NONE; + mtime_t last_picture_interlaced_date = mdate(); - p_vout->pf_end( p_vout ); + /* + * Main loop - it is not executed if an error occurred during + * initialization + */ + while (!vout->p->b_done && !vout->p->b_error) { + /* */ + if(vout->p->title.show && vout->p->title.value) + DisplayTitleOnOSD(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 ); + vlc_mutex_lock(&vout->p->picture_lock); - I_OUTPUTPICTURES = 0; + mtime_t deadline = VLC_TS_INVALID; + bool has_displayed = !ThreadDisplayPicture(vout, vout->p->step.is_requested, &deadline); - if( p_vout->pf_init( p_vout ) ) - { - msg_Err( p_vout, "cannot resize display" ); - /* FIXME: pf_end will be called again in CleanThread()? */ - p_vout->b_error = 1; + if (has_displayed) { + vout->p->step.timestamp = vout->p->displayed.timestamp; + if (vout->p->step.last <= VLC_TS_INVALID) + vout->p->step.last = vout->p->step.timestamp; + } + if (vout->p->step.is_requested) { + if (!has_displayed && !vout->p->b_picture_empty) { + picture_t *peek = picture_fifo_Peek(vout->p->decoder_fifo); + if (peek) + picture_Release(peek); + if (!peek) { + vout->p->b_picture_empty = true; + vlc_cond_signal(&vout->p->picture_wait); + } } - - vlc_mutex_unlock( &p_vout->picture_lock ); - - /* 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 (has_displayed) { + vout->p->step.is_requested = false; + vlc_cond_signal(&vout->p->picture_wait); } - if( p_vout->b_error ) - break; } - if( p_vout->i_changes & VOUT_PICTURE_BUFFERS_CHANGE ) - { - /* This happens when the picture buffers need to be recreated. - * This is useful on multimonitor displays for instance. - * - * Warning: This only works when the vout creates only 1 picture - * buffer!! */ - p_vout->i_changes &= ~VOUT_PICTURE_BUFFERS_CHANGE; - - if( !p_vout->p->b_direct ) - ChromaDestroy( p_vout ); - - vlc_mutex_lock( &p_vout->picture_lock ); - - p_vout->pf_end( p_vout ); - - 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" ); + vlc_mutex_unlock(&vout->p->picture_lock); - vlc_cond_signal( &p_vout->p->picture_wait ); - vlc_mutex_unlock( &p_vout->picture_lock ); - - if( p_vout->b_error ) - break; + 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 + vout->p->b_error = true; + break; } /* Post processing */ - if( i_postproc_state == 1 ) - PostProcessEnable( p_vout ); - else if( i_postproc_state == -1 ) - PostProcessDisable( p_vout ); - if( i_postproc_state != 0 ) - i_picture_qtype_last = i_postproc_type; + const int postproc_change = (picture_qtype != QTYPE_NONE) - (last_picture_qtype != QTYPE_NONE); + if (postproc_change == 1) + PostProcessEnable(vout); + else if (postproc_change == -1) + PostProcessDisable(vout); + if (postproc_change) + last_picture_qtype = picture_qtype; /* Deinterlacing * Wait 30s before quiting interlacing mode */ - if( ( i_picture_interlaced_state == 1 ) || - ( i_picture_interlaced_state == -1 && i_picture_interlaced_last_date + 30000000 < current_date ) ) - { - DeinterlaceNeeded( p_vout, b_picture_interlaced ); - b_picture_interlaced_last = b_picture_interlaced; + const int interlacing_change = (!!picture_interlaced) - (!!last_picture_interlaced); + if ((interlacing_change == 1) || + (interlacing_change == -1 && last_picture_interlaced_date + 30000000 < mdate())) { + DeinterlaceNeeded(vout, picture_interlaced); + last_picture_interlaced = picture_interlaced; } - if( b_picture_interlaced ) - i_picture_interlaced_last_date = current_date; - + if (picture_interlaced) + last_picture_interlaced_date = mdate(); /* Check for "video filter2" changes */ - vlc_mutex_lock( &p_vout->p->vfilter_lock ); - if( p_vout->p->psz_vf2 ) - { + vlc_mutex_lock(&vout->p->vfilter_lock); + if (vout->p->psz_vf2) { es_format_t fmt; - 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 ); + es_format_Init(&fmt, VIDEO_ES, vout->fmt_render.i_chroma); + fmt.video = vout->fmt_render; + filter_chain_Reset(vout->p->p_vf2_chain, &fmt, &fmt); + + if (filter_chain_AppendFromString(vout->p->p_vf2_chain, + vout->p->psz_vf2) < 0) + msg_Err(vout, "Video filter chain creation failed"); + + free(vout->p->psz_vf2); + vout->p->psz_vf2 = NULL; - 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" ); + if (last_picture_qtype != QTYPE_NONE) + PostProcessSetFilterQuality(vout); + } + vlc_mutex_unlock(&vout->p->vfilter_lock); - free( p_vout->p->psz_vf2 ); - p_vout->p->psz_vf2 = NULL; + vlc_mutex_unlock(&vout->p->change_lock); - if( i_picture_qtype_last != QTYPE_NONE ) - PostProcessSetFilterQuality( p_vout ); + if (deadline > VLC_TS_INVALID) { + vlc_mutex_lock(&vout->p->picture_lock); + vlc_cond_timedwait(&vout->p->picture_wait, &vout->p->picture_lock, deadline); + vlc_mutex_unlock(&vout->p->picture_lock); } - vlc_mutex_unlock( &p_vout->p->vfilter_lock ); + + vlc_mutex_lock(&vout->p->change_lock); } /* * 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. */ - if( p_vout->b_error ) - ErrorThread( p_vout ); + while (vout->p->b_error && !vout->p->b_done) + vlc_cond_wait(&vout->p->change_wait, &vout->p->change_lock); /* Clean thread */ - CleanThread( p_vout ); + ThreadClean(vout); exit_thread: - /* End of thread */ - EndThread( p_vout ); - vlc_mutex_unlock( &p_vout->change_lock ); - - if( p_vout->p_module ) - module_unneed( p_vout, p_vout->p_module ); - p_vout->p_module = NULL; - - return NULL; -} - -/***************************************************************************** - * 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 ) -{ - /* Wait until a `close' order */ - while( !p_vout->p->b_done ) - vlc_cond_wait( &p_vout->p->change_wait, &p_vout->change_lock ); -} - -/***************************************************************************** - * 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 ) -{ - 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 ); - } - } - - /* Destroy translation tables */ - if( !p_vout->b_error ) - p_vout->pf_end( p_vout ); -} - -/***************************************************************************** - * 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 ) -{ -#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 ); - } -#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 ); + spu_Attach(vout->p->p_spu, VLC_OBJECT(vout), false); + vlc_object_detach(vout->p->p_spu); /* Destroy the video filters2 */ - filter_chain_Delete( p_vout->p->p_vf2_chain ); -} - -/* Thread helpers */ -static picture_t *ChromaGetPicture( filter_t *p_filter ) -{ - picture_t *p_pic = (picture_t *)p_filter->p_owner; - p_filter->p_owner = NULL; - return p_pic; -} - -static int ChromaCreate( vout_thread_t *p_vout ) -{ - 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 ); - - vlc_object_attach( p_chroma, p_vout ); - - /* 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 - ); - - vlc_object_release( p_vout->p->p_chroma ); - p_vout->p->p_chroma = NULL; + filter_chain_Delete(vout->p->p_vf2_chain); - return VLC_EGENERIC; - } - p_chroma->pf_vout_buffer_new = ChromaGetPicture; - return VLC_SUCCESS; -} + vlc_mutex_unlock(&vout->p->change_lock); -static void ChromaDestroy( vout_thread_t *p_vout ) -{ - assert( !p_vout->p->b_direct ); - - if( !p_vout->p->p_chroma ) - return; + if (has_wrapper) + vout_CloseWrapper(vout); - 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; -} - -/* following functions are local */ - -/** - * 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 ) -{ - 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; -} - -/** - * 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 ) -{ - 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; -} - -/** - * This function computes rgb shifts from masks - */ -static void PictureHeapFixRgb( picture_heap_t *p_heap ) -{ - video_format_t fmt; - - /* */ - fmt.i_chroma = p_heap->i_chroma; - VideoFormatImportRgb( &fmt, p_heap ); - - /* */ - video_format_FixRgb( &fmt ); - - VideoFormatExportRgb( &fmt, p_heap ); + return NULL; } /***************************************************************************** @@ -1735,25 +1237,25 @@ static void PostProcessSetFilterQuality( vout_thread_t *p_vout ) static void DisplayTitleOnOSD( vout_thread_t *p_vout ) { const mtime_t i_start = mdate(); - const mtime_t i_stop = i_start + INT64_C(1000) * p_vout->p->i_title_timeout; + const mtime_t i_stop = i_start + INT64_C(1000) * p_vout->p->title.timeout; if( i_stop <= i_start ) return; - vlc_assert_locked( &p_vout->change_lock ); + vlc_assert_locked( &p_vout->p->change_lock ); vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN, - p_vout->p->psz_title, NULL, - p_vout->p->i_title_position, + p_vout->p->title.value, NULL, + p_vout->p->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 ); - free( p_vout->p->psz_title ); + free( p_vout->p->title.value ); - p_vout->p->psz_title = NULL; + p_vout->p->title.value = NULL; } /***************************************************************************** @@ -1771,16 +1273,25 @@ typedef struct */ static const deinterlace_mode_t p_deinterlace_mode[] = { { "", false }, - { "discard", true }, + //{ "discard", true }, { "blend", false }, - { "mean", true }, - { "bob", true }, - { "linear", true }, + //{ "mean", true }, + //{ "bob", true }, + //{ "linear", true }, { "x", false }, - { "yadif", true }, - { "yadif2x", true }, - { NULL, true } + //{ "yadif", true }, + //{ "yadif2x", true }, + { NULL, false } }; +static const deinterlace_mode_t *DeinterlaceGetMode( const char *psz_mode ) +{ + for( const deinterlace_mode_t *p_mode = &p_deinterlace_mode[0]; p_mode->psz_mode; p_mode++ ) + { + if( !strcmp( p_mode->psz_mode, psz_mode ) ) + return p_mode; + } + return NULL; +} static char *FilterFind( char *psz_filter_base, const char *psz_module ) { @@ -1911,15 +1422,10 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd, DeinterlaceSave( p_vout, i_deinterlace, psz_mode, is_needed ); /* */ - bool b_vout_filter = true; - for( const deinterlace_mode_t *p_mode = &p_deinterlace_mode[0]; p_mode->psz_mode; p_mode++ ) - { - if( !strcmp( p_mode->psz_mode, psz_mode ) ) - { - b_vout_filter = p_mode->b_vout_filter; - break; - } - } + bool b_vout_filter = false; + const deinterlace_mode_t *p_mode = DeinterlaceGetMode( psz_mode ); + if( p_mode ) + b_vout_filter = p_mode->b_vout_filter; /* */ char *psz_old; @@ -1998,6 +1504,9 @@ static void DeinterlaceEnable( vout_thread_t *p_vout ) var_Change( p_vout, "deinterlace-mode", VLC_VAR_CLEARCHOICES, NULL, NULL ); for( int i = 0; p_optm && i < p_optm->i_list; i++ ) { + if( !DeinterlaceGetMode( p_optm->ppsz_list[i] ) ) + continue; + val.psz_string = p_optm->ppsz_list[i]; text.psz_string = (char*)vlc_gettext(p_optm->ppsz_list_text[i]); var_Change( p_vout, "deinterlace-mode", VLC_VAR_ADDCHOICE, &val, &text ); @@ -2023,16 +1532,16 @@ static void DeinterlaceEnable( vout_thread_t *p_vout ) /* */ if( i_deinterlace == -2 ) - p_vout->p->b_picture_interlaced = true; + p_vout->p->displayed.is_interlaced = true; else if( i_deinterlace == -3 ) - p_vout->p->b_picture_interlaced = false; + p_vout->p->displayed.is_interlaced = false; if( i_deinterlace < 0 ) i_deinterlace = -1; /* */ val.psz_string = psz_deinterlace ? psz_deinterlace : p_optm->orig.psz; var_Change( p_vout, "deinterlace-mode", VLC_VAR_SETVALUE, &val, NULL ); - val.b_bool = p_vout->p->b_picture_interlaced; + val.b_bool = p_vout->p->displayed.is_interlaced; var_Change( p_vout, "deinterlace-needed", VLC_VAR_SETVALUE, &val, NULL ); var_SetInteger( p_vout, "deinterlace", i_deinterlace ); @@ -2046,3 +1555,17 @@ static void DeinterlaceNeeded( vout_thread_t *p_vout, bool is_interlaced ) var_SetBool( p_vout, "deinterlace-needed", is_interlaced ); } +/* */ +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); +} +