#include <stdlib.h> /* free() */
#include <string.h>
-
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
-
#include <vlc_vout.h>
#include <vlc_filter.h>
static void CleanThread ( vout_thread_t * );
static void EndThread ( vout_thread_t * );
-static void AspectRatio ( int, int *, int * );
-
-static void VideoFormatImportRgb( video_format_t *, const picture_heap_t * );
-static void PictureHeapFixRgb( picture_heap_t * );
-
static void vout_Destructor ( vlc_object_t * p_this );
/* Object variables callbacks */
static int 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 )
{
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 ||
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->fmt_render.i_sar_num ||
+ i_sar_den != p_vout->fmt_render.i_sar_den ) )
+ {
+ p_vout->fmt_in.i_sar_num = i_sar_num;
+ p_vout->fmt_in.i_sar_den = i_sar_den;
+
+ 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;
}
vlc_mutex_unlock( &p_vout->change_lock );
{
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 );
}
}
return p_vout;
}
+#undef vout_Create
/*****************************************************************************
* vout_Create: creates a new video output thread
*****************************************************************************
* This function creates a new video output thread, and returns a pointer
* to its description. On error, it returns NULL.
*****************************************************************************/
-vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
+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 */
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( i_width <= 0 || i_height <= 0 )
return NULL;
vlc_ureduce( &p_fmt->i_sar_num, &p_fmt->i_sar_den,
p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 );
if( p_fmt->i_sar_num <= 0 || p_fmt->i_sar_den <= 0 )
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";
* 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 */
+ video_format_FixRgb( &p_vout->fmt_render );
+ video_format_FixRgb( &p_vout->fmt_in );
+
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_chroma = 0;
p_vout->output.i_aspect = 0;
- p_vout->output.i_rmask = 0;
- p_vout->output.i_gmask = 0;
- p_vout->output.i_bmask = 0;
-
/* Initialize misc stuff */
p_vout->i_changes = 0;
- p_vout->b_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;
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;
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 );
/* Take care of some "interface/control" related initialisations */
vout_IntfInit( p_vout );
/* 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
{
}
/* 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 );
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 );
if( vlc_clone( &p_vout->p->thread, RunThread, 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_unlock( &p_vout->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 );
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 );
/* Destroy the locks */
vlc_cond_destroy( &p_vout->p->change_wait );
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
}
/* */
vlc_cond_signal( &p_vout->p->picture_wait );
vlc_mutex_unlock( &p_vout->picture_lock );
- spu_OffsetSubtitleDate( p_vout->p_spu, i_duration );
+ spu_OffsetSubtitleDate( p_vout->p->p_spu, i_duration );
}
else
{
{
assert( psz_title );
- if( !config_GetInt( p_vout, "osd" ) )
+ if( !var_InheritBool( p_vout, "osd" ) )
return;
vlc_mutex_lock( &p_vout->change_lock );
spu_t *vout_GetSpu( vout_thread_t *p_vout )
{
- return p_vout->p_spu;
+ return p_vout->p->p_spu;
}
/*****************************************************************************
* 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 )
{
- int i, i_aspect_x, i_aspect_y;
+ int i;
/* Initialize output method, it allocates direct buffers for us */
- if( p_vout->pf_init( p_vout ) )
+ if( vout_InitWrapper( p_vout ) )
return VLC_EGENERIC;
p_vout->p->p_picture_displayed = NULL;
{
msg_Err( p_vout, "plugin was unable to allocate at least "
"one direct buffer" );
- p_vout->pf_end( p_vout );
+ vout_EndWrapper( p_vout );
return VLC_EGENERIC;
}
{
msg_Err( p_vout, "plugin allocated too many direct buffers, "
"our internal buffers must have overflown." );
- p_vout->pf_end( p_vout );
+ vout_EndWrapper( p_vout );
return VLC_EGENERIC;
}
msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES );
- AspectRatio( p_vout->fmt_render.i_aspect, &i_aspect_x, &i_aspect_y );
-
- AspectRatio( p_vout->fmt_in.i_aspect, &i_aspect_x, &i_aspect_y );
-
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_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_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 );
- AspectRatio( p_vout->fmt_out.i_aspect, &i_aspect_x, &i_aspect_y );
-
/* 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 );
+ video_format_FixRgb( &p_vout->fmt_render );
+ video_format_FixRgb( &p_vout->fmt_out );
/* 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",
+ 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,
- 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",
+ 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,
- 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",
+ 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,
- 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 );
+ assert( p_vout->output.i_width == p_vout->render.i_width &&
+ p_vout->output.i_height == p_vout->render.i_height &&
+ p_vout->output.i_chroma == p_vout->render.i_chroma );
/* 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
+ /* 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 */
+ for( i = 1; i < VOUT_MAX_PICTURES; i++ )
{
- /* 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++ )
+ 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 )
{
- 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;
+ /* 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 );
+
return VLC_SUCCESS;
}
static void* RunThread( void *p_this )
{
vout_thread_t *p_vout = p_this;
+ bool b_has_wrapper;
int i_idle_loops = 0; /* loops without displaying a picture */
int i_picture_qtype_last = QTYPE_NONE;
bool b_picture_interlaced_last = false;
/*
* 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") );
+ b_has_wrapper = !vout_OpenWrapper( p_vout, p_vout->p->psz_module_name );
vlc_mutex_lock( &p_vout->change_lock );
- if( p_vout->p_module )
- p_vout->b_error = InitThread( p_vout );
+ if( b_has_wrapper )
+ p_vout->p->b_error = InitThread( p_vout );
else
- p_vout->b_error = true;
+ p_vout->p->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 )
+ if( p_vout->p->b_error )
goto exit_thread;
/* */
* Main loop - it is not executed if an error occurred during
* initialization
*/
- while( !p_vout->p->b_done && !p_vout->b_error )
+ while( !p_vout->p->b_done && !p_vout->p->b_error )
{
/* Initialize loop variables */
const mtime_t current_date = mdate();
p_filtered_picture = NULL;
if( p_picture )
+ {
+ vlc_mutex_lock( &p_vout->p->vfilter_lock );
p_filtered_picture = filter_chain_VideoFilter( p_vout->p->p_vf2_chain,
p_picture );
+ vlc_mutex_unlock( &p_vout->p->vfilter_lock );
+ }
const bool b_snapshot = vout_snapshot_IsRequested( &p_vout->p->snapshot );
else
spu_render_time = 0;
- subpicture_t *p_subpic = spu_SortSubpictures( p_vout->p_spu,
+ subpicture_t *p_subpic = spu_SortSubpictures( p_vout->p->p_spu,
spu_render_time,
b_snapshot );
/*
/*
* Call the plugin-specific rendering method if there is one
*/
- if( p_filtered_picture != NULL && p_directbuffer != NULL && p_vout->pf_render )
+ if( p_filtered_picture != NULL && p_directbuffer != NULL )
{
/* Render the direct buffer returned by vout_RenderPicture */
- p_vout->pf_render( p_vout, p_directbuffer );
+ vout_RenderWrapper( p_vout, p_directbuffer );
}
/*
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 );
+ vout_DisplayWrapper( p_vout, p_directbuffer );
/* Tell the vout this was the last picture and that it does not
* need to be forced anymore. */
/*
* Check events and manage thread
*/
- if( p_vout->pf_manage && p_vout->pf_manage( p_vout ) )
+ if( vout_ManageWrapper( 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;
+ p_vout->p->b_error = 1;
break;
}
- while( p_vout->i_changes & VOUT_ON_TOP_CHANGE )
- {
+ if( 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 CleanThread()? */
- p_vout->b_error = 1;
- }
-
- 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( p_vout->b_error )
- break;
- }
if( p_vout->i_changes & VOUT_PICTURE_BUFFERS_CHANGE )
{
* 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 );
+ vout_EndWrapper( p_vout );
I_OUTPUTPICTURES = I_RENDERPICTURES = 0;
- p_vout->b_error = InitThread( p_vout );
- if( p_vout->b_error )
+ p_vout->p->b_error = InitThread( p_vout );
+ if( p_vout->p->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 )
+ if( p_vout->p->b_error )
break;
}
/*
* Error loop - wait until the thread destruction is requested
*/
- if( p_vout->b_error )
+ if( p_vout->p->b_error )
ErrorThread( p_vout );
/* Clean 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;
+ if( b_has_wrapper )
+ vout_CloseWrapper( p_vout );
return NULL;
}
{
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++ )
{
}
/* Destroy translation tables */
- if( !p_vout->b_error )
- p_vout->pf_end( p_vout );
+ if( !p_vout->p->b_error )
+ vout_EndWrapper( p_vout );
}
/*****************************************************************************
*****************************************************************************/
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( p_vout->p->p_spu, VLC_OBJECT(p_vout), false );
+ vlc_object_detach( p_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;
-
- return VLC_EGENERIC;
- }
- 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;
-}
-
-/**
- * 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 );
-}
/*****************************************************************************
* object variables callbacks: a bunch of object variables are used by the
*/
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 )
{
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;
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 );
projects / vlc / blobdiff