*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
+ * Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
*
* 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
#include <stdlib.h> /* free() */
#include <string.h>
-
-
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
+#include <assert.h>
#include <vlc_vout.h>
#include <vlc_filter.h>
#include <vlc_osd.h>
-#include <assert.h>
-
-#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 <libvlc.h>
#include <vlc_input.h>
#include "vout_pictures.h"
#include "vout_internal.h"
+#include "interlacing.h"
+#include "postprocessing.h"
+#include "display.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int InitThread ( vout_thread_t * );
-static void* RunThread ( void * );
-static void ErrorThread ( vout_thread_t * );
-static void CleanThread ( vout_thread_t * );
-static void EndThread ( vout_thread_t * );
-
-static void AspectRatio ( int, int *, int * );
-
-static void VideoFormatImportRgb( video_format_t *, const picture_heap_t * );
-static void PictureHeapFixRgb( picture_heap_t * );
-
-static void vout_Destructor ( vlc_object_t * p_this );
+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 void PostProcessEnable( vout_thread_t * );
-static void PostProcessDisable( vout_thread_t * );
-static void PostProcessSetFilterQuality( vout_thread_t *p_vout );
-static int PostProcessCallback( vlc_object_t *, char const *,
- vlc_value_t, vlc_value_t, void * );
-/* */
-static void DeinterlaceEnable( vout_thread_t * );
-
-/* From vout_intf.c */
-int vout_Snapshot( vout_thread_t *, picture_t * );
+static void PrintVideoFormat(vout_thread_t *, const char *, const video_format_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))
+/* Maximum delay between 2 displayed pictures.
+ * XXX it is needed for now but should be removed in the long term.
+ */
+#define VOUT_REDISPLAY_DELAY (INT64_C(80000))
-/* Maximum lap of time allowed between the beginning of rendering and
- * display. If, compared to the current date, the next image is too
- * late, the thread will perform an idle loop. This time should be
- * at least VOUT_IDLE_SLEEP plus the time required to render a few
- * images, to avoid trashing of decoded images */
-#define VOUT_DISPLAY_DELAY ((int)(0.200*CLOCK_FREQ))
+/**
+ * Late pictures having a delay higher than this value are thrashed.
+ */
+#define VOUT_DISPLAY_LATE_THRESHOLD (INT64_C(20000))
/* Better be in advance when awakening than late... */
-#define VOUT_MWAIT_TOLERANCE ((mtime_t)(0.020*CLOCK_FREQ))
-
-/* Minimum number of direct pictures the video output will accept without
- * creating additional pictures in system memory */
-#ifdef OPTIMIZE_MEMORY
-# define VOUT_MIN_DIRECT_PICTURES (VOUT_MAX_PICTURES/2)
-#else
-# define VOUT_MIN_DIRECT_PICTURES (3*VOUT_MAX_PICTURES/4)
-#endif
+#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;
- 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 )
{
/* 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. */
free( psz_filter_chain );
}
- 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 ||
+#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->change_lock );
+ vlc_mutex_unlock( &p_vout->p->change_lock );
/* We are not interested in this format, close this vout */
vout_CloseAndRelease( p_vout );
else
{
/* This video output is cool! Hijack it. */
- if( p_vout->fmt_render.i_aspect != p_fmt->i_aspect )
- {
- /* Correct aspect ratio on change
- * FIXME factorize this code with other aspect ration related code */
- unsigned int i_sar_num;
- unsigned int i_sar_den;
- unsigned int i_aspect;
-
- i_aspect = p_fmt->i_aspect;
- vlc_ureduce( &i_sar_num, &i_sar_den,
- p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 );
+ /* 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
- * beside the previous p_vout->fmt_render.i_aspect != p_fmt->i_aspect
- * should be fixed to use it too then */
- if( p_vout->i_par_num > 0 && p_vout->i_par_den > 0 )
- {
- i_sar_num *= p_vout->i_par_den;
- i_sar_den *= p_vout->i_par_num;
- i_aspect = i_aspect * p_vout->i_par_den / p_vout->i_par_num;
- }
+ /* 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_aspect > 0 )
- {
- p_vout->fmt_in.i_sar_num = i_sar_num;
- p_vout->fmt_in.i_sar_den = i_sar_den;
- p_vout->fmt_in.i_aspect = i_aspect;
-
- p_vout->fmt_render.i_sar_num = i_sar_num;
- p_vout->fmt_render.i_sar_den = i_sar_den;
- p_vout->fmt_render.i_aspect = i_aspect;
-
- p_vout->render.i_aspect = i_aspect;
-
- p_vout->i_changes |= VOUT_ASPECT_CHANGE;
+ 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->change_lock );
+ vlc_mutex_unlock( &p_vout->p->change_lock );
vlc_object_release( 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 );
}
}
* 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 );
- unsigned int i_aspect = p_fmt->i_aspect;
config_chain_t *p_cfg;
char *psz_parser;
char *psz_name;
- if( i_width <= 0 || i_height <= 0 || i_aspect <= 0 )
+ 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 );
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;
+ /* */
+ p_vout->p->fmt_render = *p_fmt; /* FIXME palette */
+ p_vout->p->fmt_in = *p_fmt; /* FIXME palette */
- /* Initialize the rendering heap */
- I_RENDERPICTURES = 0;
+ 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 );
- p_vout->fmt_render = *p_fmt; /* FIXME palette */
- p_vout->fmt_in = *p_fmt; /* FIXME palette */
+ /* 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;
- 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->p->step.last = VLC_TS_INVALID;
+ p_vout->p->step.timestamp = VLC_TS_INVALID;
- 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->p->pause.is_on = false;
+ p_vout->p->pause.date = VLC_TS_INVALID;
- p_vout->render.i_last_used_pic = -1;
- p_vout->render.b_allow_modify_pics = 1;
+ p_vout->p->decoder_fifo = picture_fifo_New();
+ p_vout->p->decoder_pool = NULL;
- /* 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;
+ vlc_mouse_Init( &p_vout->p->mouse );
- p_vout->output.i_rmask = 0;
- p_vout->output.i_gmask = 0;
- p_vout->output.i_bmask = 0;
+ vout_snapshot_Init( &p_vout->p->snapshot );
- /* 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_picture_lost = 0;
- p_vout->p->i_picture_displayed = 0;
- p_vout->p->b_filter_change = 0;
- p_vout->p->b_paused = false;
- p_vout->p->i_pause_date = 0;
- p_vout->pf_control = NULL;
- p_vout->p->i_par_num =
- p_vout->p->i_par_den = 1;
- p_vout->p->p_picture_displayed = NULL;
- p_vout->p->i_picture_displayed_date = 0;
- p_vout->p->b_picture_displayed = false;
- p_vout->p->b_picture_empty = false;
- p_vout->p->i_picture_qtype = QTYPE_NONE;
-
- p_vout->p->snapshot.b_available = true;
- p_vout->p->snapshot.i_request = 0;
- p_vout->p->snapshot.p_picture = NULL;
- vlc_mutex_init( &p_vout->p->snapshot.lock );
- vlc_cond_init( &p_vout->p->snapshot.wait );
+ p_vout->p->p_vf2_chain = filter_chain_New( p_vout, "video filter2",
+ false, video_filter_buffer_allocation_init, NULL, p_vout );
/* Initialize locks */
- vlc_mutex_init( &p_vout->picture_lock );
- vlc_cond_init( &p_vout->p->picture_wait );
- vlc_mutex_init( &p_vout->change_lock );
+ vlc_mutex_init( &p_vout->p->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-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_spu, VLC_OBJECT(p_vout), true );
+ 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" );
/* Take care of some "interface/control" related initialisations */
vout_IntfInit( p_vout );
- /* If the parent is not a VOUT object, that means we are at the start of
- * the video output pipe */
- if( vlc_internals( p_parent )->i_object_type != VLC_OBJECT_VOUT )
- {
- /* Look for the default filter configuration */
- p_vout->p->psz_filter_chain =
- var_CreateGetStringCommand( p_vout, "vout-filter" );
-
- /* Apply video filter2 objects on the first vout */
- p_vout->p->psz_vf2 =
- var_CreateGetStringCommand( p_vout, "video-filter" );
-
- p_vout->p->b_first_vout = true;
- }
- else
- {
- /* continue the parent's filter chain */
- char *psz_tmp;
-
- /* Ugly hack to jump to our configuration chain */
- p_vout->p->psz_filter_chain
- = ((vout_thread_t *)p_parent)->p->psz_filter_chain;
- p_vout->p->psz_filter_chain
- = config_ChainCreate( &psz_tmp, &p_cfg, p_vout->p->psz_filter_chain );
- config_ChainDestroy( p_cfg );
- free( psz_tmp );
-
- /* Create a video filter2 var ... but don't inherit values */
- var_Create( p_vout, "video-filter",
- VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
- p_vout->p->psz_vf2 = var_GetString( p_vout, "video-filter" );
-
- /* */
- p_vout->p->b_first_vout = false;
- }
+ /* 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 );
- p_vout->p->p_vf2_chain = filter_chain_New( p_vout, "video filter2",
- false, video_filter_buffer_allocation_init, NULL, p_vout );
+ 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 = var_CreateGetString( p_vout, "vout" );
+ psz_parser = NULL;
}
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_module = module_need( p_vout,
- ( p_vout->p->psz_filter_chain && *p_vout->p->psz_filter_chain ) ?
- "video filter" : "video output", psz_name, p_vout->p->psz_filter_chain && *p_vout->p->psz_filter_chain );
- free( psz_name );
-
- vlc_object_set_destructor( p_vout, vout_Destructor );
-
- if( p_vout->p_module == NULL )
- {
- msg_Err( p_vout, "no suitable vout module" );
- spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false );
- spu_Destroy( p_vout->p_spu );
- p_vout->p_spu = NULL;
- vlc_object_release( p_vout );
- return NULL;
- }
+ 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 );
var_AddCallback( p_vout, "vout-filter", FilterCallback, NULL );
/* */
- DeinterlaceEnable( p_vout );
+ 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;
+
+ /* */
+ 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 ) )
{
- module_unneed( p_vout, p_vout->p_module );
- p_vout->p_module = NULL;
- 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 );
{
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 );
- vlc_mutex_lock( &p_vout->p->snapshot.lock );
- p_vout->p->snapshot.b_available = false;
- vlc_cond_broadcast( &p_vout->p->snapshot.wait );
- vlc_mutex_unlock( &p_vout->p->snapshot.lock );
+ vout_snapshot_End( &p_vout->p->snapshot );
vlc_join( p_vout->p->thread, NULL );
- module_unneed( p_vout, p_vout->p_module );
- p_vout->p_module = NULL;
}
/* */
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 );
+ vout_control_Clean( &p_vout->p->control );
/* */
- for( ;; )
- {
- picture_t *p_picture = p_vout->p->snapshot.p_picture;
- if( !p_picture )
- break;
+ vout_statistic_Clean( &p_vout->p->statistic );
- p_vout->p->snapshot.p_picture = p_picture->p_next;
-
- picture_Release( p_picture );
- }
- vlc_cond_destroy( &p_vout->p->snapshot.wait );
- vlc_mutex_destroy( &p_vout->p->snapshot.lock );
+ /* */
+ vout_snapshot_Clean( &p_vout->p->snapshot );
/* */
free( p_vout->p->psz_filter_chain );
- free( p_vout->p->psz_title );
- config_ChainDestroy( p_vout->p_cfg );
+ config_ChainDestroy( p_vout->p->p_cfg );
free( p_vout->p );
-#ifndef __APPLE__
- vout_thread_t *p_another_vout;
-
- /* This is a dirty hack mostly for Linux, where there is no way to get the
- * GUI back if you closed it while playing video. This is solved in
- * Mac OS X, where we have this novelty called menubar, that will always
- * allow you access to the applications main functionality. They should try
- * that on linux sometime. */
- p_another_vout = vlc_object_find( p_this->p_libvlc,
- VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_another_vout == NULL )
- var_SetBool( p_this->p_libvlc, "intf-show", true );
- else
- vlc_object_release( p_another_vout );
-#endif
}
/* */
-void vout_ChangePause( vout_thread_t *p_vout, bool b_paused, mtime_t i_date )
+void vout_ChangePause(vout_thread_t *vout, bool is_paused, mtime_t date)
{
- vlc_mutex_lock( &p_vout->change_lock );
-
- assert( !p_vout->p->b_paused || !b_paused );
-
- vlc_mutex_lock( &p_vout->picture_lock );
-
- p_vout->p->i_picture_displayed_date = 0;
-
- if( p_vout->p->b_paused )
- {
- const mtime_t i_duration = i_date - p_vout->p->i_pause_date;
-
- for( int i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
- {
- picture_t *p_pic = PP_RENDERPICTURE[i_index];
+ vout_control_cmd_t cmd;
+ vout_control_cmd_Init(&cmd, VOUT_CONTROL_PAUSE);
+ cmd.u.pause.is_on = is_paused;
+ cmd.u.pause.date = date;
+ vout_control_Push(&vout->p->control, &cmd);
- 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 );
-
- spu_OffsetSubtitleDate( p_vout->p_spu, i_duration );
- }
- else
- {
- vlc_mutex_unlock( &p_vout->picture_lock );
- }
- p_vout->p->b_paused = b_paused;
- p_vout->p->i_pause_date = i_date;
-
- vlc_mutex_unlock( &p_vout->change_lock );
+ vout_control_WaitEmpty(&vout->p->control);
}
void vout_GetResetStatistic( vout_thread_t *p_vout, int *pi_displayed, int *pi_lost )
{
- vlc_mutex_lock( &p_vout->change_lock );
-
- *pi_displayed = p_vout->p->i_picture_displayed;
- *pi_lost = p_vout->p->i_picture_lost;
-
- p_vout->p->i_picture_displayed = 0;
- p_vout->p->i_picture_lost = 0;
-
- vlc_mutex_unlock( &p_vout->change_lock );
+ vout_statistic_GetReset( &p_vout->p->statistic,
+ pi_displayed, pi_lost );
}
-void vout_Flush( vout_thread_t *p_vout, mtime_t i_date )
+void vout_Flush(vout_thread_t *vout, mtime_t date)
{
- 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];
+ vout_control_PushTime(&vout->p->control, VOUT_CONTROL_FLUSH, date);
+ vout_control_WaitEmpty(&vout->p->control);
+}
- if( p_pic->i_status == READY_PICTURE ||
- p_pic->i_status == DISPLAYED_PICTURE )
- {
- /* We cannot change picture status if it is in READY_PICTURE state,
- * Just make sure they won't be displayed */
- if( p_pic->date > i_date )
- p_pic->date = i_date;
- }
- }
- vlc_cond_signal( &p_vout->p->picture_wait );
- vlc_mutex_unlock( &p_vout->picture_lock );
+void vout_Reset(vout_thread_t *vout)
+{
+ vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_RESET);
+ vout_control_WaitEmpty(&vout->p->control);
}
-void vout_FixLeaks( vout_thread_t *p_vout, bool b_forced )
+bool vout_IsEmpty(vout_thread_t *vout)
{
- int i_pic, i_ready_pic;
+ vlc_mutex_lock(&vout->p->picture_lock);
- vlc_mutex_lock( &p_vout->picture_lock );
+ picture_t *picture = picture_fifo_Peek(vout->p->decoder_fifo);
+ if (picture)
+ picture_Release(picture);
- 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_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;
+ return !picture;
+}
- continue;
- }
+void vout_FixLeaks( vout_thread_t *vout )
+{
+ vlc_mutex_lock(&vout->p->picture_lock);
- 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;
- }
+ 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_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 );
-
- const mtime_t i_displayed_date = p_vout->p->i_picture_displayed_date;
-
- 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 );
- }
-
- 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 );
-
- *pi_duration = __MAX( p_vout->p->i_picture_displayed_date - i_displayed_date, 0 );
+ vout_control_cmd_t cmd;
+ vout_control_cmd_Init(&cmd, VOUT_CONTROL_STEP);
+ cmd.u.time_ptr = duration;
- /* TODO advance subpicture by the duration ... */
-
- vlc_mutex_unlock( &p_vout->picture_lock );
+ vout_control_Push(&vout->p->control, &cmd);
+ vout_control_WaitEmpty(&vout->p->control);
}
-void vout_DisplayTitle( vout_thread_t *p_vout, const char *psz_title )
+void vout_DisplayTitle(vout_thread_t *vout, const char *title)
{
- assert( psz_title );
+ assert(title);
+ vout_control_PushString(&vout->p->control, VOUT_CONTROL_OSD_TITLE, title);
+}
- if( !config_GetInt( p_vout, "osd" ) )
- return;
+spu_t *vout_GetSpu( vout_thread_t *p_vout )
+{
+ return p_vout->p->p_spu;
+}
- vlc_mutex_lock( &p_vout->change_lock );
- free( p_vout->p->psz_title );
- p_vout->p->psz_title = strdup( psz_title );
- vlc_mutex_unlock( &p_vout->change_lock );
+/* vout_Control* are usable by anyone at anytime */
+void vout_ControlChangeFullscreen(vout_thread_t *vout, bool fullscreen)
+{
+ vout_control_PushBool(&vout->p->control, VOUT_CONTROL_FULLSCREEN,
+ fullscreen);
+}
+void vout_ControlChangeOnTop(vout_thread_t *vout, bool is_on_top)
+{
+ vout_control_PushBool(&vout->p->control, VOUT_CONTROL_ON_TOP,
+ is_on_top);
+}
+void vout_ControlChangeDisplayFilled(vout_thread_t *vout, bool is_filled)
+{
+ vout_control_PushBool(&vout->p->control, VOUT_CONTROL_DISPLAY_FILLED,
+ is_filled);
+}
+void vout_ControlChangeZoom(vout_thread_t *vout, int num, int den)
+{
+ vout_control_PushPair(&vout->p->control, VOUT_CONTROL_ZOOM,
+ num, den);
}
/*****************************************************************************
* 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, i_aspect_x, i_aspect_y;
-
/* Initialize output method, it allocates direct buffers for us */
- if( p_vout->pf_init( p_vout ) )
+ if (vout_InitWrapper(vout))
return VLC_EGENERIC;
+ assert(vout->p->decoder_pool);
- p_vout->p->p_picture_displayed = NULL;
+ vout->p->displayed.decoded = 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;
- }
+ /* 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);
- if( I_OUTPUTPICTURES > VOUT_MAX_PICTURES )
- {
- msg_Err( p_vout, "plugin allocated too many direct buffers, "
- "our internal buffers must have overflown." );
- p_vout->pf_end( p_vout );
- return VLC_EGENERIC;
+ 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;
+}
+
+/*****************************************************************************
+ * 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)
+{
+ /* Destroy translation tables */
+ if (!vout->p->b_error) {
+ picture_fifo_Flush(vout->p->decoder_fifo, INT64_MAX, false);
+ vout_EndWrapper(vout);
}
+}
- msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
+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 && vout->p->displayed.decoded;
+ bool is_forced;
+
+ /* FIXME/XXX we must redisplay the last decoded picture (because
+ * of potential vout updated, or filters update or SPU update)
+ * For now a high update period is needed but it coulmd be removed
+ * if and only if:
+ * - vout module emits events from theselves.
+ * - *and* SPU is modified to emit an event or a deadline when needed.
+ *
+ * So it will be done latter.
+ */
+ if (!redisplay) {
+ picture_t *peek = picture_fifo_Peek(vout->p->decoder_fifo);
+ if (peek) {
+ is_forced = peek->b_force || is_paused || now;
+ *deadline = (is_forced ? date : peek->date) - vout_chrono_GetHigh(&vout->p->render);
+ picture_Release(peek);
+ } else {
+ redisplay = true;
+ }
+ }
+ if (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;
- AspectRatio( p_vout->fmt_render.i_aspect, &i_aspect_x, &i_aspect_y );
+ /* If we are too early and can wait, do it */
+ if (date < *deadline && !now)
+ break;
- AspectRatio( p_vout->fmt_in.i_aspect, &i_aspect_x, &i_aspect_y );
+ 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;
+ }
+ }
+ }
- if( !p_vout->fmt_out.i_width || !p_vout->fmt_out.i_height )
- {
- p_vout->fmt_out.i_width = p_vout->fmt_out.i_visible_width =
- p_vout->output.i_width;
- p_vout->fmt_out.i_height = p_vout->fmt_out.i_visible_height =
- p_vout->output.i_height;
- p_vout->fmt_out.i_x_offset = p_vout->fmt_out.i_y_offset = 0;
-
- p_vout->fmt_out.i_aspect = p_vout->output.i_aspect;
- p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
- }
- if( !p_vout->fmt_out.i_sar_num || !p_vout->fmt_out.i_sar_num )
- {
- p_vout->fmt_out.i_sar_num = p_vout->fmt_out.i_aspect *
- p_vout->fmt_out.i_height;
- p_vout->fmt_out.i_sar_den = VOUT_ASPECT_FACTOR *
- p_vout->fmt_out.i_width;
- }
+ vout->p->displayed.is_interlaced = !decoded->b_progressive;
+ vout->p->displayed.qtype = decoded->i_qtype;
+ }
+ vout->p->displayed.timestamp = decoded->date;
- 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 );
+ /* */
+ if (vout->p->displayed.decoded)
+ picture_Release(vout->p->displayed.decoded);
+ picture_Hold(decoded);
+ vout->p->displayed.decoded = decoded;
- AspectRatio( p_vout->fmt_out.i_aspect, &i_aspect_x, &i_aspect_y );
+ /* */
+ 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;
+ }
- /* 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 );
+ /*
+ * Check for subpictures to display
+ */
+ const bool do_snapshot = vout_snapshot_IsRequested(&vout->p->snapshot);
+ mtime_t spu_render_time = is_forced ? mdate() : filtered->date;
+ if (vout->p->pause.is_on)
+ spu_render_time = vout->p->pause.date;
+ else
+ spu_render_time = filtered->date > 1 ? filtered->date : mdate();
- PictureHeapFixRgb( &p_vout->output );
- VideoFormatImportRgb( &p_vout->fmt_out, &p_vout->output );
+ 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
+ */
+ 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->p->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);
- /* 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, ar %i:%i, 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,
- i_aspect_x, i_aspect_y,
- 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, ar %i:%i, 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,
- i_aspect_x, i_aspect_y,
- 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, ar %i:%i, 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,
- i_aspect_x, i_aspect_y,
- 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;
+ if (render) {
+ picture_Copy(render, filtered);
- 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;
+ spu_RenderSubpictures(vout->p->p_spu,
+ render, &vout->p->fmt_out,
+ subpic, &vout->p->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;
}
- PP_RENDERPICTURE[ I_RENDERPICTURES ] = &p_vout->p_picture[ i ];
- I_RENDERPICTURES++;
+ picture_Release(filtered);
+ filtered = NULL;
+ } else {
+ direct = filtered;
}
- 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;
+ /*
+ * Take a snapshot if requested
+ */
+ if (direct && do_snapshot)
+ vout_snapshot_Set(&vout->p->snapshot, &vout->p->fmt_out, direct);
- if( ChromaCreate( p_vout ) )
- {
- p_vout->pf_end( p_vout );
- return VLC_EGENERIC;
+ /* Render the direct buffer returned by vout_RenderPicture */
+ if (direct) {
+ vout_RenderWrapper(vout, direct);
+
+ vout_chrono_Stop(&vout->p->render);
+#if 0
+ {
+ static int i = 0;
+ if (((i++)%10) == 0)
+ msg_Info(vout, "render: avg %d ms var %d ms",
+ (int)(vout->p->render.avg/1000), (int)(vout->p->render.var/1000));
+ }
+#endif
}
- 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 );
+ /* Wait the real date (for rendering jitter) */
+ if (!is_forced)
+ mwait(decoded->date);
- /* 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++;
+ /* Display the direct buffer returned by vout_RenderPicture */
+ vout->p->displayed.date = mdate();
+ if (direct)
+ vout_DisplayWrapper(vout, direct);
- /* Check if we have enough render pictures */
- if( I_RENDERPICTURES == VOUT_MAX_PICTURES )
- break;
- }
+ displayed_count++;
+ break;
}
+ vout_statistic_Update(&vout->p->statistic, displayed_count, lost_count);
+ if (displayed_count <= 0)
+ return VLC_EGENERIC;
return VLC_SUCCESS;
}
-/*****************************************************************************
- * RunThread: video output thread
- *****************************************************************************
- * Video output thread. This function does only returns when the thread is
- * terminated. It handles the pictures arriving in the video heap and the
- * display device events.
- *****************************************************************************/
-static void* RunThread( void *p_this )
+static int ThreadManage(vout_thread_t *vout,
+ mtime_t *deadline,
+ vout_interlacing_support_t *interlacing,
+ vout_postprocessing_support_t *postprocessing)
{
- vout_thread_t *p_vout = p_this;
- int i_idle_loops = 0; /* loops without displaying a picture */
- int i_picture_qtype_last = QTYPE_NONE;
+ vlc_mutex_lock(&vout->p->picture_lock);
- bool b_drop_late;
+ *deadline = VLC_TS_INVALID;
+ ThreadDisplayPicture(vout, false, deadline);
- /*
- * Initialize thread
- */
- vlc_mutex_lock( &p_vout->change_lock );
- p_vout->b_error = InitThread( p_vout );
+ const int picture_qtype = vout->p->displayed.qtype;
+ const bool picture_interlaced = vout->p->displayed.is_interlaced;
- b_drop_late = var_CreateGetBool( p_vout, "drop-late-frames" );
+ vlc_mutex_unlock(&vout->p->picture_lock);
- /* signal the creation of the vout */
- p_vout->p->b_ready = true;
- vlc_cond_signal( &p_vout->p->change_wait );
+ /* Post processing */
+ vout_SetPostProcessingState(vout, postprocessing, picture_qtype);
- if( p_vout->b_error )
- {
- EndThread( p_vout );
- vlc_mutex_unlock( &p_vout->change_lock );
- return NULL;
- }
+ /* Deinterlacing */
+ vout_SetInterlacingState(vout, interlacing, picture_interlaced);
- /*
- * 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 (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;
+}
- if( p_vout->p->b_title_show && p_vout->p->psz_title )
- DisplayTitleOnOSD( p_vout );
+static void ThreadDisplayOsdTitle(vout_thread_t *vout, const char *string)
+{
+ if( !var_InheritBool(vout, "osd"))
+ return;
+ if (!vout->p->title.show)
+ return;
- vlc_mutex_lock( &p_vout->picture_lock );
+ 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, DEFAULT_CHAN,
+ 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);
+}
- /* Look for the earliest picture but after the last displayed one */
- picture_t *p_last = p_vout->p->p_picture_displayed;;
+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;
- p_picture = NULL;
- for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
- {
- picture_t *p_pic = PP_RENDERPICTURE[i_index];
+ vlc_mutex_lock(&vout->p->vfilter_lock);
- if( p_pic->i_status != READY_PICTURE )
- continue;
+ filter_chain_Reset(vout->p->p_vf2_chain, &fmt, &fmt);
+ if (filter_chain_AppendFromString(vout->p->p_vf2_chain,
+ filters) < 0)
+ msg_Err(vout, "Video filter chain creation failed");
- if( p_vout->p->b_paused && p_last && p_last->date > 1 )
- continue;
+ vlc_mutex_unlock(&vout->p->vfilter_lock);
+}
- if( p_last && p_pic != p_last && p_pic->date <= p_last->date )
- {
- /* Drop old picture */
- vout_UsePictureLocked( p_vout, p_pic );
- }
- else if( !p_vout->p->b_paused && !p_pic->b_force && p_pic != p_last &&
- p_pic->date < current_date + p_vout->p->render_time &&
- b_drop_late )
- {
- /* Picture is late: it will be destroyed and the thread
- * will directly choose the next picture */
- vout_UsePictureLocked( p_vout, p_pic );
- p_vout->p->i_picture_lost++;
-
- msg_Warn( p_vout, "late picture skipped (%"PRId64" > %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;
- }
- }
- 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 );
- }
- }
-
- 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( 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 );
- }
- }
- p_vout->p->p_picture_displayed = p_picture;
- }
- }
-
- /* */
- 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);
-
- vlc_mutex_unlock( &p_vout->picture_lock );
-
- if( p_picture == NULL )
- i_idle_loops++;
-
- p_filtered_picture = NULL;
- if( p_picture )
- p_filtered_picture = filter_chain_VideoFilter( p_vout->p->p_vf2_chain,
- p_picture );
-
- bool b_snapshot = false;
- if( vlc_mutex_trylock( &p_vout->p->snapshot.lock ) == 0 )
- {
- b_snapshot = p_vout->p->snapshot.i_request > 0
- && p_picture != NULL;
- vlc_mutex_unlock( &p_vout->p->snapshot.lock );
- }
-
- /*
- * Check for subpictures to display
- */
- subpicture_t *p_subpic = NULL;
- if( display_date > 0 )
- p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date,
- p_vout->p->b_paused, b_snapshot );
-
- /*
- * Perform rendering
- */
- p_vout->p->i_picture_displayed++;
- p_directbuffer = vout_RenderPicture( p_vout, p_filtered_picture,
- p_subpic, p_vout->p->b_paused );
-
- /*
- * Take a snapshot if requested
- */
- if( p_directbuffer && b_snapshot )
- {
- vlc_mutex_lock( &p_vout->p->snapshot.lock );
- assert( p_vout->p->snapshot.i_request > 0 );
- while( p_vout->p->snapshot.i_request > 0 )
- {
- picture_t *p_pic = picture_New( p_vout->fmt_out.i_chroma,
- p_vout->fmt_out.i_width,
- p_vout->fmt_out.i_height,
- p_vout->fmt_out.i_aspect );
- if( !p_pic )
- break;
-
- picture_Copy( p_pic, p_directbuffer );
-
- p_pic->p_next = p_vout->p->snapshot.p_picture;
- p_vout->p->snapshot.p_picture = p_pic;
- p_vout->p->snapshot.i_request--;
- }
- vlc_cond_broadcast( &p_vout->p->snapshot.wait );
- vlc_mutex_unlock( &p_vout->p->snapshot.lock );
- }
-
- /*
- * Call the plugin-specific rendering method if there is one
- */
- if( p_filtered_picture != NULL && p_directbuffer != NULL && p_vout->pf_render )
- {
- /* Render the direct buffer returned by vout_RenderPicture */
- p_vout->pf_render( p_vout, p_directbuffer );
- }
-
- /*
- * Sleep, wake up
- */
- if( display_date != 0 && p_directbuffer != NULL )
- {
- mtime_t current_render_time = mdate() - current_date;
- /* if render time is very large we don't include it in the mean */
- if( current_render_time < p_vout->p->render_time +
- VOUT_DISPLAY_DELAY )
- {
- /* Store render time using a sliding mean weighting to
- * current value in a 3 to 1 ratio*/
- p_vout->p->render_time *= 3;
- p_vout->p->render_time += current_render_time;
- p_vout->p->render_time >>= 2;
- }
- else
- msg_Dbg( p_vout, "skipped big render time %d > %d", (int) current_render_time,
- (int) (p_vout->p->render_time +VOUT_DISPLAY_DELAY ) ) ;
- }
-
- /* Give back change lock */
- vlc_mutex_unlock( &p_vout->change_lock );
-
- /* Sleep a while or until a given date */
- if( display_date != 0 )
- {
- /* If there are *vout* filters in the chain, better give them the picture
- * in advance */
- if( !p_vout->p->psz_filter_chain || !*p_vout->p->psz_filter_chain )
- {
- mwait( display_date - VOUT_MWAIT_TOLERANCE );
- }
- }
- else
- {
- /* Wait until a frame is being sent or a spurious wakeup (not a problem here) */
- vlc_mutex_lock( &p_vout->picture_lock );
- vlc_cond_timedwait( &p_vout->p->picture_wait, &p_vout->picture_lock, current_date + VOUT_IDLE_SLEEP );
- vlc_mutex_unlock( &p_vout->picture_lock );
- }
-
- /* On awakening, take back lock and send immediately picture
- * to display. */
- /* Note: p_vout->p->b_done could be true here and now */
- vlc_mutex_lock( &p_vout->change_lock );
-
- /*
- * Display the previously rendered picture
- */
- if( p_filtered_picture != NULL && p_directbuffer != NULL )
- {
- /* Display the direct buffer returned by vout_RenderPicture */
- if( p_vout->pf_display )
- p_vout->pf_display( p_vout, p_directbuffer );
-
- /* Tell the vout this was the last picture and that it does not
- * need to be forced anymore. */
- p_picture->b_force = false;
- }
-
- /* Drop the filtered picture if created by video filters */
- if( p_filtered_picture != NULL && p_filtered_picture != p_picture )
- {
- vlc_mutex_lock( &p_vout->picture_lock );
- vout_UsePictureLocked( p_vout, p_filtered_picture );
- vlc_mutex_unlock( &p_vout->picture_lock );
- }
-
- if( p_picture != NULL )
- {
- /* Reinitialize idle loop count */
- i_idle_loops = 0;
- }
-
- /*
- * 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;
- }
-
- 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 );
- }
-
- if( p_vout->i_changes & VOUT_SIZE_CHANGE )
- {
- /* this must only happen when the vout plugin is incapable of
- * rescaling the picture itself. In this case we need to destroy
- * the current picture buffers and recreate new ones with the right
- * dimensions */
- int i;
-
- p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
-
- assert( !p_vout->p->b_direct );
-
- ChromaDestroy( p_vout );
-
- vlc_mutex_lock( &p_vout->picture_lock );
-
- p_vout->pf_end( p_vout );
-
- p_vout->p->p_picture_displayed = NULL;
- for( i = 0; i < I_OUTPUTPICTURES; i++ )
- p_vout->p_picture[ i ].i_status = FREE_PICTURE;
- vlc_cond_signal( &p_vout->p->picture_wait );
-
- I_OUTPUTPICTURES = 0;
-
- if( p_vout->pf_init( p_vout ) )
- {
- msg_Err( p_vout, "cannot resize display" );
- /* FIXME: pf_end will be called again in EndThread() */
- p_vout->b_error = 1;
- }
-
- vlc_mutex_unlock( &p_vout->picture_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) {
+ const mtime_t duration = date - vout->p->pause.date;
+
+ if (vout->p->step.timestamp > VLC_TS_INVALID)
+ vout->p->step.timestamp += duration;
+ if (vout->p->step.last > VLC_TS_INVALID)
+ vout->p->step.last += duration;
+ picture_fifo_OffsetDate(vout->p->decoder_fifo, duration);
+ if (vout->p->displayed.decoded)
+ vout->p->displayed.decoded->date += duration;
+
+ spu_OffsetSubtitleDate(vout->p->p_spu, duration);
+ } else {
+ vout->p->step.timestamp = VLC_TS_INVALID;
+ vout->p->step.last = VLC_TS_INVALID;
+ }
+ vout->p->pause.is_on = is_paused;
+ vout->p->pause.date = date;
+}
- /* Need to reinitialise the chroma plugin. Since we might need
- * resizing too and it's not sure that we already had it,
- * recreate the chroma plugin chain from scratch. */
- /* dionoea */
- if( ChromaCreate( p_vout ) )
- {
- msg_Err( p_vout, "WOW THIS SUCKS BIG TIME!!!!!" );
- p_vout->b_error = 1;
- }
- if( p_vout->b_error )
- break;
+static void ThreadFlush(vout_thread_t *vout, bool below, mtime_t date)
+{
+ vout->p->step.timestamp = VLC_TS_INVALID;
+ vout->p->step.last = VLC_TS_INVALID;
+
+ picture_t *last = vout->p->displayed.decoded;
+ if (last) {
+ if (( below && last->date <= date) ||
+ (!below && last->date >= date)) {
+ picture_Release(last);
+
+ vout->p->displayed.decoded = NULL;
+ vout->p->displayed.date = VLC_TS_INVALID;
+ vout->p->displayed.timestamp = VLC_TS_INVALID;
}
+ }
+ picture_fifo_Flush(vout->p->decoder_fifo, date, below);
+}
- 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;
-
- p_vout->b_error = InitThread( p_vout );
- if( p_vout->b_error )
- msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed" );
-
- vlc_cond_signal( &p_vout->p->picture_wait );
- vlc_mutex_unlock( &p_vout->picture_lock );
-
- if( p_vout->b_error )
- break;
- }
+static void ThreadReset(vout_thread_t *vout)
+{
+ ThreadFlush(vout, true, INT64_MAX);
+ if (vout->p->decoder_pool)
+ picture_pool_NonEmpty(vout->p->decoder_pool, true);
+ vout->p->pause.is_on = false;
+ vout->p->pause.date = mdate();
+}
- /* 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;
-
- /* Check for "video filter2" changes */
- vlc_mutex_lock( &p_vout->p->vfilter_lock );
- if( p_vout->p->psz_vf2 )
- {
- es_format_t fmt;
+static void ThreadStep(vout_thread_t *vout, mtime_t *duration)
+{
+ *duration = 0;
- 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 );
+ if (vout->p->step.last <= VLC_TS_INVALID)
+ vout->p->step.last = vout->p->displayed.timestamp;
- 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" );
+ mtime_t dummy;
+ if (ThreadDisplayPicture(vout, true, &dummy))
+ return;
- free( p_vout->p->psz_vf2 );
- p_vout->p->psz_vf2 = NULL;
+ vout->p->step.timestamp = vout->p->displayed.timestamp;
- if( i_picture_qtype_last != QTYPE_NONE )
- PostProcessSetFilterQuality( p_vout );
- }
- vlc_mutex_unlock( &p_vout->p->vfilter_lock );
+ if (vout->p->step.last > VLC_TS_INVALID &&
+ vout->p->step.timestamp > vout->p->step.last) {
+ *duration = vout->p->step.timestamp - vout->p->step.last;
+ vout->p->step.last = vout->p->step.timestamp;
+ /* TODO advance subpicture by the duration ... */
}
-
- /*
- * Error loop - wait until the thread destruction is requested
- */
- if( p_vout->b_error )
- ErrorThread( p_vout );
-
- /* End of thread */
- CleanThread( p_vout );
- EndThread( p_vout );
- vlc_mutex_unlock( &p_vout->change_lock );
-
- 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 )
+static void ThreadChangeFullscreen(vout_thread_t *vout, bool fullscreen)
{
- /* Wait until a `close' order */
- while( !p_vout->p->b_done )
- vlc_cond_wait( &p_vout->p->change_wait, &p_vout->change_lock );
+ /* FIXME not sure setting "fullscreen" is good ... */
+ var_SetBool(vout, "fullscreen", fullscreen);
+ vout_SetDisplayFullscreen(vout->p->display.vd, fullscreen);
}
-/*****************************************************************************
- * CleanThread: clean up after InitThread
- *****************************************************************************
- * This function is called after a sucessful
- * initialization. It frees all resources allocated by InitThread.
- * XXX You have to enter it with change_lock taken.
- *****************************************************************************/
-static void CleanThread( vout_thread_t *p_vout )
+static void ThreadChangeOnTop(vout_thread_t *vout, bool is_on_top)
{
- int i_index; /* index in heap */
+ vout_SetWindowState(vout->p->display.vd,
+ is_on_top ? VOUT_WINDOW_STATE_ABOVE :
+ VOUT_WINDOW_STATE_NORMAL);
+}
- if( !p_vout->p->b_direct )
- ChromaDestroy( p_vout );
+static void ThreadChangeDisplayFilled(vout_thread_t *vout, bool is_filled)
+{
+ vout_SetDisplayFilled(vout->p->display.vd, is_filled);
+}
- /* 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 );
- }
+static void ThreadChangeZoom(vout_thread_t *vout, int num, int den)
+{
+ if (num * 10 < den) {
+ num = den;
+ den *= 10;
+ } else if (num > den * 10) {
+ num = den * 10;
}
- /* Destroy translation tables */
- if( !p_vout->b_error )
- p_vout->pf_end( p_vout );
+ vout_SetDisplayZoom(vout->p->display.vd, num, den);
}
/*****************************************************************************
- * EndThread: thread destruction
+ * Thread: video output thread
*****************************************************************************
- * 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.
+ * 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 EndThread( vout_thread_t *p_vout )
+static void *Thread(void *object)
{
-#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
+ vout_thread_t *vout = object;
+ bool has_wrapper;
- /* FIXME does that function *really* need to be called inside the thread ? */
-
- /* Detach subpicture unit from both input and vout */
- spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false );
- vlc_object_detach( p_vout->p_spu );
-
- /* Destroy the video filters2 */
- filter_chain_Delete( p_vout->p->p_vf2_chain );
-}
-
-/* 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;
-}
+ /*
+ * Initialize thread
+ */
+ has_wrapper = !vout_OpenWrapper(vout, vout->p->psz_module_name);
-static int ChromaCreate( vout_thread_t *p_vout )
-{
- static const char typename[] = "chroma";
- filter_t *p_chroma;
+ vlc_mutex_lock(&vout->p->change_lock);
- /* Choose the best module */
- p_chroma = p_vout->p->p_chroma =
- vlc_custom_create( p_vout, sizeof(filter_t), VLC_OBJECT_GENERIC,
- typename );
+ if (has_wrapper)
+ vout->p->b_error = ThreadInit(vout);
+ else
+ vout->p->b_error = true;
- vlc_object_attach( p_chroma, p_vout );
+ /* signal the creation of the vout */
+ vout->p->b_ready = true;
+ vlc_cond_signal(&vout->p->change_wait);
- /* 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 );
+ if (vout->p->b_error)
+ goto exit_thread;
- p_chroma->p_module = module_need( p_chroma, "video filter2", NULL, false );
+ /* */
+ vout_interlacing_support_t interlacing = {
+ .is_interlaced = false,
+ .date = mdate(),
+ };
+ vout_postprocessing_support_t postprocessing = {
+ .qtype = QTYPE_NONE,
+ };
- 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
- );
+ /*
+ * 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) {
+ vout_control_cmd_t cmd;
- vlc_object_release( p_vout->p->p_chroma );
- p_vout->p->p_chroma = NULL;
+ 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_OSD_TITLE:
+ ThreadDisplayOsdTitle(vout, cmd.u.string);
+ break;
+ case VOUT_CONTROL_CHANGE_FILTERS:
+ ThreadChangeFilters(vout, cmd.u.string);
+ break;
+ case VOUT_CONTROL_PAUSE:
+ ThreadChangePause(vout, cmd.u.pause.is_on, cmd.u.pause.date);
+ break;
+ case VOUT_CONTROL_FLUSH:
+ ThreadFlush(vout, false, cmd.u.time);
+ break;
+ case VOUT_CONTROL_RESET:
+ ThreadReset(vout);
+ break;
+ case VOUT_CONTROL_STEP:
+ ThreadStep(vout, cmd.u.time_ptr);
+ break;
+ case VOUT_CONTROL_FULLSCREEN:
+ ThreadChangeFullscreen(vout, cmd.u.boolean);
+ break;
+ case VOUT_CONTROL_ON_TOP:
+ ThreadChangeOnTop(vout, cmd.u.boolean);
+ break;
+ case VOUT_CONTROL_DISPLAY_FILLED:
+ ThreadChangeDisplayFilled(vout, cmd.u.boolean);
+ break;
+ case VOUT_CONTROL_ZOOM:
+ ThreadChangeZoom(vout, cmd.u.pair.a, cmd.u.pair.b);
+ break;
+ default:
+ break;
+ }
+ vlc_mutex_unlock(&vout->p->change_lock);
+ vout_control_cmd_Clean(&cmd);
+ }
+ vlc_mutex_lock(&vout->p->change_lock);
- return VLC_EGENERIC;
+ /* */
+ if (ThreadManage(vout, &deadline,
+ &interlacing, &postprocessing)) {
+ vout->p->b_error = true;
+ break;
+ }
}
- p_chroma->pf_vout_buffer_new = ChromaGetPicture;
- return VLC_SUCCESS;
-}
-
-static void ChromaDestroy( vout_thread_t *p_vout )
-{
- assert( !p_vout->p->b_direct );
-
- if( !p_vout->p->p_chroma )
- return;
-
- 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 */
-static void AspectRatio( int i_aspect, int *i_aspect_x, int *i_aspect_y )
-{
- const int i_pgcd = i_aspect ? GCD( i_aspect, VOUT_ASPECT_FACTOR ) : 1;
- *i_aspect_x = i_aspect / i_pgcd;
- *i_aspect_y = VOUT_ASPECT_FACTOR / i_pgcd;
-}
+ /*
+ * 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);
-/**
- * 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;
-}
+ /* Clean thread */
+ ThreadClean(vout);
-/**
- * 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;
-}
+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);
-/**
- * This function computes rgb shifts from masks
- */
-static void PictureHeapFixRgb( picture_heap_t *p_heap )
-{
- video_format_t fmt;
+ vlc_mutex_unlock(&vout->p->change_lock);
- /* */
- fmt.i_chroma = p_heap->i_chroma;
- VideoFormatImportRgb( &fmt, p_heap );
+ if (has_wrapper)
+ vout_CloseWrapper(vout);
+ vout_control_Dead(&vout->p->control);
- /* */
- video_format_FixRgb( &fmt );
+ /* Destroy the video filters2 */
+ filter_chain_Delete(vout->p->p_vf2_chain);
- VideoFormatExportRgb( &fmt, p_heap );
+ return NULL;
}
/*****************************************************************************
return VLC_EGENERIC;
}
- var_SetBool( p_vout, "intf-change", true );
-
/* 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 );
/*****************************************************************************
* Video Filter2 stuff
*****************************************************************************/
-static int VideoFilter2Callback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- (void)psz_cmd; (void)oldval; (void)p_data;
-
- vlc_mutex_lock( &p_vout->p->vfilter_lock );
- p_vout->p->psz_vf2 = strdup( newval.psz_string );
- vlc_mutex_unlock( &p_vout->p->vfilter_lock );
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Post-processing
- *****************************************************************************/
-static bool PostProcessIsPresent( const char *psz_filter )
-{
- const char *psz_pp = "postproc";
- const size_t i_pp = strlen(psz_pp);
- return psz_filter &&
- !strncmp( psz_filter, psz_pp, strlen(psz_pp) ) &&
- ( psz_filter[i_pp] == '\0' || psz_filter[i_pp] == ':' );
-}
-
-static int PostProcessCallback( 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;
- VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
-
- static const char *psz_pp = "postproc";
-
- char *psz_vf2 = var_GetString( p_vout, "video-filter" );
-
- if( newval.i_int <= 0 )
- {
- if( PostProcessIsPresent( psz_vf2 ) )
- {
- strcpy( psz_vf2, &psz_vf2[strlen(psz_pp)] );
- if( *psz_vf2 == ':' )
- strcpy( psz_vf2, &psz_vf2[1] );
- }
- }
- else
- {
- if( !PostProcessIsPresent( psz_vf2 ) )
- {
- if( psz_vf2 )
- {
- char *psz_tmp = psz_vf2;
- if( asprintf( &psz_vf2, "%s:%s", psz_pp, psz_tmp ) < 0 )
- psz_vf2 = psz_tmp;
- else
- free( psz_tmp );
- }
- else
- {
- psz_vf2 = strdup( psz_pp );
- }
- }
- }
- if( psz_vf2 )
- {
- var_SetString( p_vout, "video-filter", psz_vf2 );
- free( psz_vf2 );
- }
-
- return VLC_SUCCESS;
-}
-static void PostProcessEnable( vout_thread_t *p_vout )
-{
- msg_Dbg( p_vout, "Post-processing available" );
- var_Create( p_vout, "postprocess", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
- for( int i = 0; i <= 6; i++ )
- {
- vlc_value_t val;
- vlc_value_t text;
- char psz_text[1+1];
-
- val.i_int = i;
- snprintf( psz_text, sizeof(psz_text), "%d", i );
- if( i == 0 )
- text.psz_string = _("Disable");
- else
- text.psz_string = psz_text;
- var_Change( p_vout, "postprocess", VLC_VAR_ADDCHOICE, &val, &text );
- }
- var_AddCallback( p_vout, "postprocess", PostProcessCallback, NULL );
-
- /* */
- char *psz_filter = var_GetNonEmptyString( p_vout, "video-filter" );
- int i_postproc_q = 0;
- if( PostProcessIsPresent( psz_filter ) )
- i_postproc_q = var_CreateGetInteger( p_vout, "postproc-q" );
-
- var_SetInteger( p_vout, "postprocess", i_postproc_q );
-
- free( psz_filter );
-}
-static void PostProcessDisable( vout_thread_t *p_vout )
-{
- msg_Dbg( p_vout, "Post-processing no more available" );
- var_Destroy( p_vout, "postprocess" );
-}
-static void PostProcessSetFilterQuality( vout_thread_t *p_vout )
-{
- vlc_object_t *p_pp = vlc_object_find_name( p_vout, "postproc", FIND_CHILD );
- if( !p_pp )
- return;
-
- var_SetInteger( p_pp, "postproc-q", var_GetInteger( p_vout, "postprocess" ) );
- vlc_object_release( p_pp );
-}
-
-
-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;
-
- if( i_stop <= i_start )
- return
-
- vlc_assert_locked( &p_vout->change_lock );
-
- vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
- p_vout->p->psz_title, NULL,
- p_vout->p->i_title_position,
- 30 + p_vout->fmt_in.i_width
- - p_vout->fmt_in.i_visible_width
- - p_vout->fmt_in.i_x_offset,
- 20 + p_vout->fmt_in.i_y_offset,
- i_start, i_stop );
-
- free( p_vout->p->psz_title );
-
- p_vout->p->psz_title = NULL;
-}
-
-/*****************************************************************************
- * Deinterlacing
- *****************************************************************************/
-typedef struct
-{
- const char *psz_mode;
- const char *psz_description;
- bool b_vout_filter;
-} deinterlace_mode_t;
-
-/* XXX
- * You can use the non vout filter if and only if the video properties stay the
- * same (width/height/chroma/fps), at least for now.
- */
-static const deinterlace_mode_t p_deinterlace_mode[] = {
- { "", "Disable", false },
- { "discard", "Discard", true },
- { "blend", "Blend", false },
- { "mean", "Mean", true },
- { "bob", "Bob", true },
- { "linear", "Linear", true },
- { "x", "X", false },
- { NULL, NULL, true }
-};
-
-static char *FilterFind( char *psz_filter_base, const char *psz_module )
-{
- const size_t i_module = strlen( psz_module );
- const char *psz_filter = psz_filter_base;
-
- if( !psz_filter || i_module <= 0 )
- return NULL;
-
- for( ;; )
- {
- char *psz_find = strstr( psz_filter, psz_module );
- if( !psz_find )
- return NULL;
- if( psz_find[i_module] == '\0' || psz_find[i_module] == ':' )
- return psz_find;
- psz_filter = &psz_find[i_module];
- }
-}
-
-static bool DeinterlaceIsPresent( vout_thread_t *p_vout, bool b_vout_filter )
-{
- char *psz_filter = var_GetNonEmptyString( p_vout, b_vout_filter ? "vout-filter" : "video-filter" );
-
- bool b_found = FilterFind( psz_filter, "deinterlace" ) != NULL;
-
- free( psz_filter );
-
- return b_found;
-}
-
-static void DeinterlaceRemove( vout_thread_t *p_vout, bool b_vout_filter )
-{
- const char *psz_variable = b_vout_filter ? "vout-filter" : "video-filter";
- char *psz_filter = var_GetNonEmptyString( p_vout, psz_variable );
-
- char *psz = FilterFind( psz_filter, "deinterlace" );
- if( !psz )
- {
- free( psz_filter );
- return;
- }
-
- /* */
- strcpy( &psz[0], &psz[strlen("deinterlace")] );
- if( *psz == ':' )
- strcpy( &psz[0], &psz[1] );
-
- var_SetString( p_vout, psz_variable, psz_filter );
- free( psz_filter );
-}
-static void DeinterlaceAdd( vout_thread_t *p_vout, bool b_vout_filter )
-{
- const char *psz_variable = b_vout_filter ? "vout-filter" : "video-filter";
-
- char *psz_filter = var_GetNonEmptyString( p_vout, psz_variable );
-
- if( FilterFind( psz_filter, "deinterlace" ) )
- {
- free( psz_filter );
- return;
- }
-
- /* */
- if( psz_filter )
- {
- char *psz_tmp = psz_filter;
- if( asprintf( &psz_filter, "%s:%s", psz_tmp, "deinterlace" ) < 0 )
- psz_filter = psz_tmp;
- else
- free( psz_tmp );
- }
- else
- {
- psz_filter = strdup( "deinterlace" );
- }
-
- if( psz_filter )
- {
- var_SetString( p_vout, psz_variable, psz_filter );
- free( psz_filter );
- }
-}
-
-static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int VideoFilter2Callback(vlc_object_t *object, char const *cmd,
+ vlc_value_t oldval, vlc_value_t newval,
+ void *data)
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ vout_thread_t *vout = (vout_thread_t *)object;
+ (void)cmd; (void)oldval; (void)data;
- /* */
- const deinterlace_mode_t *p_mode;
- for( p_mode = &p_deinterlace_mode[0]; p_mode->psz_mode; p_mode++ )
- {
- if( !strcmp( p_mode->psz_mode,
- newval.psz_string ? newval.psz_string : "" ) )
- break;
- }
- if( !p_mode->psz_mode )
- {
- msg_Err( p_this, "Invalid value (%s) ignored", newval.psz_string );
- return VLC_EGENERIC;
- }
-
- /* We have to set input variable to ensure restart support
- * XXX it is only needed because of vout-filter but must be done
- * for non video filter anyway */
- input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_PARENT );
- if( p_input )
- {
- var_Create( p_input, "vout-deinterlace", VLC_VAR_STRING );
- var_SetString( p_input, "vout-deinterlace", p_mode->psz_mode );
-
- var_Create( p_input, "deinterlace-mode", VLC_VAR_STRING );
- var_SetString( p_input, "deinterlace-mode", p_mode->psz_mode );
-
- var_Create( p_input, "sout-deinterlace-mode", VLC_VAR_STRING );
- var_SetString( p_input, "sout-deinterlace-mode", p_mode->psz_mode );
-
- vlc_object_release( p_input );
- }
-
- char *psz_old;
-
- if( p_mode->b_vout_filter )
- {
- psz_old = var_CreateGetString( p_vout, "deinterlace-mode" );
- }
- else
- {
- psz_old = var_CreateGetString( p_vout, "sout-deinterlace-mode" );
- var_SetString( p_vout, "sout-deinterlace-mode", p_mode->psz_mode );
- }
-
- /* */
- if( !strcmp( p_mode->psz_mode, "" ) )
- {
- DeinterlaceRemove( p_vout, false );
- DeinterlaceRemove( p_vout, true );
- }
- else if( !DeinterlaceIsPresent( p_vout, p_mode->b_vout_filter ) )
- {
- DeinterlaceRemove( p_vout, !p_mode->b_vout_filter );
- DeinterlaceAdd( p_vout, p_mode->b_vout_filter );
- }
- else
- {
- DeinterlaceRemove( p_vout, !p_mode->b_vout_filter );
- if( psz_old && strcmp( psz_old, p_mode->psz_mode ) )
- var_TriggerCallback( p_vout, p_mode->b_vout_filter ? "vout-filter" : "video-filter" );
- }
- free( psz_old );
-
- (void)psz_cmd; (void) oldval; (void) p_data;
+ vout_control_PushString(&vout->p->control, VOUT_CONTROL_CHANGE_FILTERS,
+ newval.psz_string);
return VLC_SUCCESS;
}
-static void DeinterlaceEnable( vout_thread_t *p_vout )
+/* */
+static void PrintVideoFormat(vout_thread_t *vout,
+ const char *description,
+ const video_format_t *fmt)
{
- vlc_value_t val, text;
-
- if( !p_vout->p->b_first_vout )
- return;
-
- msg_Dbg( p_vout, "Deinterlacing available" );
-
- /* Create the configuration variable */
- var_Create( p_vout, "deinterlace", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
- text.psz_string = _("Deinterlace");
- var_Change( p_vout, "deinterlace", VLC_VAR_SETTEXT, &text, NULL );
-
- for( int i = 0; p_deinterlace_mode[i].psz_mode; i++ )
- {
- val.psz_string = (char*)p_deinterlace_mode[i].psz_mode;
- text.psz_string = (char*)vlc_gettext(p_deinterlace_mode[i].psz_description);
- var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
- }
- var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );
-
- /* */
- char *psz_mode = NULL;
- if( var_Type( p_vout, "vout-deinterlace" ) != 0 )
- psz_mode = var_CreateGetNonEmptyString( p_vout, "vout-deinterlace" );
- if( !psz_mode )
- {
- /* Get the initial value */
- if( DeinterlaceIsPresent( p_vout, true ) )
- psz_mode = var_CreateGetNonEmptyString( p_vout, "deinterlace-mode" );
- else if( DeinterlaceIsPresent( p_vout, false ) )
- psz_mode = var_CreateGetNonEmptyString( p_vout, "sout-deinterlace-mode" );
- }
- var_SetString( p_vout, "deinterlace", psz_mode ? psz_mode : "" );
- free( psz_mode );
+ 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);
}