#include <vlc_filter.h>
#include <vlc_osd.h>
+#include <assert.h>
#if defined( __APPLE__ )
/* Include darwin_specific.h here if needed */
#include "input/input_internal.h"
#include "modules/modules.h"
+#include "vout_pictures.h"
+#include "vout_internal.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int InitThread ( vout_thread_t * );
-static void RunThread ( vout_thread_t * );
+static void* RunThread ( vlc_object_t * );
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 int BinaryLog ( uint32_t );
-static void MaskToShift ( int *, int *, uint32_t );
+
+static void VideoFormatImportRgb( video_format_t *, const picture_heap_t * );
+static void PictureHeapFixRgb( picture_heap_t * );
static void vout_Destructor ( vlc_object_t * p_this );
/* Display media title in OSD */
static void DisplayTitleOnOSD( vout_thread_t *p_vout );
+/* */
+static void DropPicture( vout_thread_t *p_vout, picture_t *p_picture );
+
/*****************************************************************************
* Video Filter2 functions
*****************************************************************************/
static picture_t *video_new_buffer_filter( filter_t *p_filter )
{
- picture_t *p_picture;
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 = vout_CreatePicture( p_vout, 0, 0, 0 );
+ p_picture->i_status = READY_PICTURE;
return p_picture;
}
static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
{
- vout_DestroyPicture( (vout_thread_t*)p_filter->p_owner, p_pic );
+ vout_thread_t *p_vout = (vout_thread_t*)p_filter->p_owner;
+
+ DropPicture( p_vout, p_pic );
}
static int video_filter_buffer_allocation_init( filter_t *p_filter, void *p_data )
vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
video_format_t *p_fmt )
{
+ const bool b_vout_provided = p_vout != NULL;
if( !p_fmt )
{
- /* Reattach video output to the instance before bailing out */
+ /* Video output is no longer used.
+ * TODO: support for reusing video outputs with proper _thread-safe_
+ * reference handling. */
if( p_vout )
- {
- spu_Attach( p_vout->p_spu, p_this, false );
- vlc_object_detach( p_vout );
- vlc_object_attach( p_vout, p_this->p_libvlc );
- }
+ vout_CloseAndRelease( p_vout );
return NULL;
}
/* If a video output was provided, lock it, otherwise look for one. */
if( p_vout )
{
- vlc_object_yield( p_vout );
+ vlc_object_hold( p_vout );
}
- else
- {
- p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_CHILD );
- if( !p_vout )
- {
- p_vout = vlc_object_find( p_this->p_libvlc,
- VLC_OBJECT_VOUT, FIND_CHILD );
- /* only first children of p_input for unused vout */
- if( p_vout && p_vout->p_parent != VLC_OBJECT(p_this->p_libvlc) )
- {
- vlc_object_release( p_vout );
- p_vout = NULL;
- }
- if( p_vout )
- vlc_object_detach( p_vout ); /* Remove it from the GC */
- }
- }
+ /* TODO: find a suitable unused video output */
/* If we now have a video output, check it has the right properties */
if( p_vout )
char *psz_filter_chain;
vlc_value_t val;
+ vlc_mutex_lock( &p_vout->change_lock );
+
/* We don't directly check for the "vout-filter" variable for obvious
* performance reasons. */
if( p_vout->b_filter_change )
free( psz_filter_chain );
}
- if( ( p_vout->fmt_render.i_width != p_fmt->i_width ) ||
- ( p_vout->fmt_render.i_height != p_fmt->i_height ) ||
- ( p_vout->fmt_render.i_aspect != p_fmt->i_aspect ) ||
+ if( p_vout->fmt_render.i_chroma != p_fmt->i_chroma ||
+ p_vout->fmt_render.i_width != p_fmt->i_width ||
+ p_vout->fmt_render.i_height != p_fmt->i_height ||
p_vout->b_filter_change )
{
+ vlc_mutex_unlock( &p_vout->change_lock );
+
/* We are not interested in this format, close this vout */
- vlc_object_release( p_vout );
+ vout_CloseAndRelease( p_vout );
vlc_object_release( p_vout );
p_vout = NULL;
}
else
{
/* This video output is cool! Hijack it. */
+ if( p_vout->fmt_render.i_aspect != p_fmt->i_aspect )
+ {
+ /* Correct aspect ratio on change
+ * FIXME factorize this code with other aspect ration related code */
+ unsigned int i_sar_num;
+ unsigned int i_sar_den;
+ unsigned int i_aspect;
+
+ i_aspect = p_fmt->i_aspect;
+ vlc_ureduce( &i_sar_num, &i_sar_den,
+ p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 );
+#if 0
+ /* What's that, it does not seems to be used correcly everywhere
+ * beside the previous p_vout->fmt_render.i_aspect != p_fmt->i_aspect
+ * should be fixed to use it too then */
+ if( p_vout->i_par_num > 0 && p_vout->i_par_den > 0 )
+ {
+ i_sar_num *= p_vout->i_par_den;
+ i_sar_den *= p_vout->i_par_num;
+ i_aspect = i_aspect * p_vout->i_par_den / p_vout->i_par_num;
+ }
+#endif
+
+ if( i_sar_num > 0 && i_sar_den > 0 && i_aspect > 0 )
+ {
+ p_vout->fmt_in.i_sar_num = i_sar_num;
+ p_vout->fmt_in.i_sar_den = i_sar_den;
+ p_vout->fmt_in.i_aspect = i_aspect;
+
+ p_vout->fmt_render.i_sar_num = i_sar_num;
+ p_vout->fmt_render.i_sar_den = i_sar_den;
+ p_vout->fmt_render.i_aspect = i_aspect;
+
+ p_vout->render.i_aspect = i_aspect;
+
+ p_vout->i_changes |= VOUT_ASPECT_CHANGE;
+
+ }
+ }
+ vlc_mutex_unlock( &p_vout->change_lock );
+
+ vlc_object_release( p_vout );
+ }
+
+ if( p_vout )
+ {
+ msg_Dbg( p_this, "reusing provided vout" );
+
spu_Attach( p_vout->p_spu, p_this, true );
+
+ vlc_object_detach( p_vout );
vlc_object_attach( p_vout, p_this );
- if( p_vout->b_title_show )
+
+ /* Display title if we are not using the vout given to vout_Request.
+ * XXX for now b_vout_provided is always true at this stage */
+ if( p_vout->b_title_show && !b_vout_provided )
DisplayTitleOnOSD( p_vout );
- vlc_object_release( p_vout );
}
}
char *psz_parser;
char *psz_name;
+ if( i_width <= 0 || i_height <= 0 || i_aspect <= 0 )
+ return NULL;
+
+ vlc_ureduce( &p_fmt->i_sar_num, &p_fmt->i_sar_den,
+ p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 );
+ if( p_fmt->i_sar_num <= 0 || p_fmt->i_sar_den <= 0 )
+ return NULL;
+
/* Allocate descriptor */
- p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
+ static const char typename[] = "video output";
+ p_vout = vlc_custom_create( p_parent, sizeof( *p_vout ), VLC_OBJECT_VOUT,
+ typename );
if( p_vout == NULL )
return NULL;
/* Initialize the rendering heap */
I_RENDERPICTURES = 0;
- vlc_ureduce( &p_fmt->i_sar_num, &p_fmt->i_sar_den,
- p_fmt->i_sar_num, p_fmt->i_sar_den, 50000 );
p_vout->fmt_render = *p_fmt; /* FIXME palette */
p_vout->fmt_in = *p_fmt; /* FIXME palette */
p_vout->render.i_chroma = i_chroma;
p_vout->render.i_aspect = i_aspect;
- p_vout->render.i_rmask = 0;
- p_vout->render.i_gmask = 0;
- p_vout->render.i_bmask = 0;
+ 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;
p_vout->render_time = 10;
p_vout->c_fps_samples = 0;
p_vout->b_filter_change = 0;
- p_vout->pf_control = 0;
- p_vout->p_parent_intf = 0;
+ p_vout->pf_control = NULL;
+ p_vout->p_window = NULL;
p_vout->i_par_num = p_vout->i_par_den = 1;
/* Initialize locks */
else
{
psz_parser = strdup( p_vout->psz_filter_chain );
+ p_vout->b_title_show = false;
}
/* Create the vout thread */
- 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_module = module_need( p_vout,
( p_vout->psz_filter_chain && *p_vout->psz_filter_chain ) ?
"video filter" : "video output", psz_name, p_vout->psz_filter_chain && *p_vout->psz_filter_chain );
free( psz_name );
if( p_vout->p_module == NULL )
{
msg_Err( p_vout, "no suitable vout module" );
+ // FIXME it's ugly but that's exactly the function that need to be called.
+ EndThread( p_vout );
vlc_object_detach( p_vout );
vlc_object_release( p_vout );
return NULL;
if( vlc_thread_create( p_vout, "video output", RunThread,
VLC_THREAD_PRIORITY_OUTPUT, true ) )
{
- module_Unneed( p_vout, p_vout->p_module );
+ module_unneed( p_vout, p_vout->p_module );
vlc_object_release( p_vout );
return NULL;
}
+ vlc_object_set_destructor( p_vout, vout_Destructor );
+
if( p_vout->b_error )
{
msg_Err( p_vout, "video output creation failed" );
-
- /* Make sure the thread is destroyed */
- vlc_object_release( p_vout );
+ vout_CloseAndRelease( p_vout );
return NULL;
}
- vlc_object_set_destructor( p_vout, vout_Destructor );
-
return p_vout;
}
+/*****************************************************************************
+ * vout_Close: Close a vout created by vout_Create.
+ *****************************************************************************
+ * You HAVE to call it on vout created by vout_Create before vlc_object_release.
+ * You should NEVER call it on vout not obtained through vout_Create
+ * (like with vout_Request or vlc_object_find.)
+ * You can use vout_CloseAndRelease() as a convenient method.
+ *****************************************************************************/
+void vout_Close( vout_thread_t *p_vout )
+{
+ assert( p_vout );
+
+ vlc_object_kill( p_vout );
+ vlc_thread_join( p_vout );
+ module_unneed( p_vout, p_vout->p_module );
+ p_vout->p_module = NULL;
+}
+
+/* */
static void vout_Destructor( vlc_object_t * p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ /* Make sure the vout was stopped first */
+ assert( !p_vout->p_module );
+
/* Destroy the locks */
vlc_mutex_destroy( &p_vout->picture_lock );
vlc_mutex_destroy( &p_vout->change_lock );
vlc_mutex_destroy( &p_vout->vfilter_lock );
- /* Release the module */
- if( p_vout->p_module )
- {
- module_Unneed( p_vout, p_vout->p_module );
- }
-
free( p_vout->psz_filter_chain );
config_ChainDestroy( p_vout->p_cfg );
* This function is called from RunThread and performs the second step of the
* initialization. It returns 0 on success. Note that the thread's flag are not
* modified inside this function.
+ * XXX You have to enter it with change_lock taken.
*****************************************************************************/
-static picture_t *get_pic( filter_t *p_filter )
+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 )
{
- picture_t *p_pic = (picture_t *)p_filter->p_owner;
- p_filter->p_owner = NULL;
- return p_pic;
+ if( !vout_ChromaCmp( p_output->i_chroma, p_render->i_chroma ) )
+ return false;
+
+ if( p_output->i_chroma != FOURCC_RV15 &&
+ p_output->i_chroma != FOURCC_RV16 &&
+ p_output->i_chroma != FOURCC_RV24 &&
+ p_output->i_chroma != FOURCC_RV32 )
+ return true;
+
+ return p_output->i_rmask == p_render->i_rmask &&
+ p_output->i_gmask == p_render->i_gmask &&
+ p_output->i_bmask == p_render->i_bmask;
}
static int InitThread( vout_thread_t *p_vout )
{
int i, i_aspect_x, i_aspect_y;
- vlc_mutex_lock( &p_vout->change_lock );
-
#ifdef STATS
p_vout->c_loops = 0;
#endif
/* Initialize output method, it allocates direct buffers for us */
if( p_vout->pf_init( p_vout ) )
- {
- vlc_mutex_unlock( &p_vout->change_lock );
return VLC_EGENERIC;
- }
if( !I_OUTPUTPICTURES )
{
msg_Err( p_vout, "plugin was unable to allocate at least "
"one direct buffer" );
p_vout->pf_end( p_vout );
- vlc_mutex_unlock( &p_vout->change_lock );
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 );
- vlc_mutex_unlock( &p_vout->change_lock );
return VLC_EGENERIC;
}
i_aspect_x, i_aspect_y,
p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den );
+ /* FIXME removed the need of both fmt_* and heap infos */
/* Calculate shifts from system-updated masks */
- MaskToShift( &p_vout->output.i_lrshift, &p_vout->output.i_rrshift,
- p_vout->output.i_rmask );
- MaskToShift( &p_vout->output.i_lgshift, &p_vout->output.i_rgshift,
- p_vout->output.i_gmask );
- MaskToShift( &p_vout->output.i_lbshift, &p_vout->output.i_rbshift,
- p_vout->output.i_bmask );
+ PictureHeapFixRgb( &p_vout->render );
+ VideoFormatImportRgb( &p_vout->fmt_render, &p_vout->render );
+
+ PictureHeapFixRgb( &p_vout->output );
+ VideoFormatImportRgb( &p_vout->fmt_out, &p_vout->output );
/* Check whether we managed to create direct buffers similar to
* the render buffers, ie same size and chroma */
if( ( p_vout->output.i_width == p_vout->render.i_width )
&& ( p_vout->output.i_height == p_vout->render.i_height )
- && ( vout_ChromaCmp( p_vout->output.i_chroma, p_vout->render.i_chroma ) ) )
+ && ( 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
* find a chroma plugin to do the conversion */
p_vout->b_direct = 0;
- /* Choose the best module */
- p_vout->p_chroma = vlc_object_create( p_vout, VLC_OBJECT_FILTER );
- filter_t *p_chroma = p_vout->p_chroma;
- 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;
-
- /* TODO: put in a function */
- p_chroma->fmt_out.video.i_rmask = p_vout->output.i_rmask;
- p_chroma->fmt_out.video.i_gmask = p_vout->output.i_gmask;
- p_chroma->fmt_out.video.i_bmask = p_vout->output.i_bmask;
- p_chroma->fmt_out.video.i_rrshift = p_vout->output.i_rrshift;
- p_chroma->fmt_out.video.i_lrshift = p_vout->output.i_lrshift;
- p_chroma->fmt_out.video.i_rgshift = p_vout->output.i_rgshift;
- p_chroma->fmt_out.video.i_lgshift = p_vout->output.i_lgshift;
- p_chroma->fmt_out.video.i_rbshift = p_vout->output.i_rbshift;
- p_chroma->fmt_out.video.i_lbshift = p_vout->output.i_lbshift;
- p_chroma->p_module = module_Need( p_chroma, "video filter2", NULL, 0 );
-
- if( p_chroma->p_module == NULL )
+ if( ChromaCreate( p_vout ) )
{
- msg_Err( p_vout, "no chroma module for %4.4s to %4.4s",
- (char*)&p_vout->render.i_chroma,
- (char*)&p_vout->output.i_chroma );
- vlc_object_detach( p_vout->p_chroma );
- p_vout->p_chroma = NULL;
p_vout->pf_end( p_vout );
- vlc_mutex_unlock( &p_vout->change_lock );
return VLC_EGENERIC;
}
- p_chroma->pf_vout_buffer_new = get_pic;
msg_Dbg( p_vout, "indirect render, mapping "
"render pictures 0-%i to system pictures %i-%i",
PP_OUTPUTPICTURE[ i ]->p_heap = &p_vout->output;
}
-/* XXX XXX mark thread ready */
return VLC_SUCCESS;
}
* terminated. It handles the pictures arriving in the video heap and the
* display device events.
*****************************************************************************/
-static void RunThread( vout_thread_t *p_vout)
+static void* RunThread( vlc_object_t *p_this )
{
- int i_index; /* index in heap */
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
int i_idle_loops = 0; /* loops without displaying a picture */
- mtime_t current_date; /* current date */
- mtime_t display_date; /* display date */
- picture_t * p_picture; /* picture pointer */
picture_t * p_last_picture = NULL; /* last picture */
- picture_t * p_directbuffer; /* direct buffer to display */
subpicture_t * p_subpic = NULL; /* subpicture pointer */
- input_thread_t *p_input = NULL ; /* Parent input, if it exists */
+ bool b_drop_late;
- vlc_value_t val;
- bool b_drop_late;
-
- int i_displayed = 0, i_lost = 0, i_loops = 0;
+ int i_displayed = 0, i_lost = 0;
+ int canc = vlc_savecancel ();
/*
* Initialize thread
*/
+ vlc_mutex_lock( &p_vout->change_lock );
p_vout->b_error = InitThread( p_vout );
- var_Create( p_vout, "drop-late-frames", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_vout, "drop-late-frames", &val );
- b_drop_late = val.b_bool;
+ b_drop_late = var_CreateGetBool( p_vout, "drop-late-frames" );
/* signal the creation of the vout */
vlc_thread_ready( p_vout );
if( p_vout->b_error )
- return;
+ {
+ EndThread( p_vout );
+ vlc_mutex_unlock( &p_vout->change_lock );
+ vlc_restorecancel (canc);
+ return NULL;
+ }
vlc_object_lock( p_vout );
* Main loop - it is not executed if an error occurred during
* initialization
*/
- while( (vlc_object_alive( p_vout )) && (!p_vout->b_error) )
+ while( vlc_object_alive( p_vout ) && !p_vout->b_error )
{
/* Initialize loop variables */
- p_picture = NULL;
- display_date = 0;
- current_date = mdate();
+ const mtime_t current_date = mdate();
+ picture_t *p_picture = NULL;
+ picture_t *p_filtered_picture;
+ mtime_t display_date = 0;
+ picture_t *p_directbuffer;
+ input_thread_t *p_input;
+ int i_index;
- i_loops++;
- if( !p_input )
- {
- p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT,
- FIND_PARENT );
- }
- if( p_input )
- {
- vlc_mutex_lock( &p_input->p->counters.counters_lock );
- stats_UpdateInteger( p_vout, p_input->p->counters.p_lost_pictures,
- i_lost , NULL);
- stats_UpdateInteger( p_vout,
- p_input->p->counters.p_displayed_pictures,
- i_displayed , NULL);
- i_displayed = i_lost = 0;
- vlc_mutex_unlock( &p_input->p->counters.counters_lock );
- vlc_object_release( p_input );
- p_input = NULL;
- }
#if 0
p_vout->c_loops++;
if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
}
#endif
+ /* Update statistics */
+ p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT );
+ if( p_input )
+ {
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_UpdateInteger( p_vout, p_input->p->counters.p_lost_pictures,
+ i_lost , NULL);
+ stats_UpdateInteger( p_vout,
+ p_input->p->counters.p_displayed_pictures,
+ i_displayed , NULL);
+ i_displayed = i_lost = 0;
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+ vlc_object_release( p_input );
+ }
+
/*
* Find the picture to display (the one with the earliest date).
* This operation does not need lock, since only READY_PICTUREs
* are handled. */
for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
{
- if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
- && ( (p_picture == NULL) ||
- (PP_RENDERPICTURE[i_index]->date < display_date) ) )
+ picture_t *p_pic = PP_RENDERPICTURE[i_index];
+
+ if( p_pic->i_status == READY_PICTURE &&
+ ( p_picture == NULL || p_pic->date < display_date ) )
{
- p_picture = PP_RENDERPICTURE[i_index];
+ p_picture = p_pic;
display_date = p_picture->date;
}
}
{
for( i_index = 0; i_index < I_RENDERPICTURES; i_index++ )
{
- if( (PP_RENDERPICTURE[i_index]->i_status == READY_PICTURE)
- && (PP_RENDERPICTURE[i_index] != p_last_picture)
- && ((p_picture == p_last_picture) ||
- (PP_RENDERPICTURE[i_index]->date < display_date)) )
+ picture_t *p_pic = PP_RENDERPICTURE[i_index];
+
+ if( p_pic->i_status == READY_PICTURE &&
+ p_pic != p_last_picture &&
+ ( p_picture == p_last_picture || p_pic->date < display_date ) )
{
- p_picture = PP_RENDERPICTURE[i_index];
+ p_picture = p_pic;
display_date = p_picture->date;
}
}
/* If we found better than the last picture, destroy it */
if( p_last_picture && p_picture != p_last_picture )
{
- vlc_mutex_lock( &p_vout->picture_lock );
- if( p_last_picture->i_refcount )
- {
- p_last_picture->i_status = DISPLAYED_PICTURE;
- }
- else
- {
- p_last_picture->i_status = DESTROYED_PICTURE;
- p_vout->i_heap_size--;
- }
- vlc_mutex_unlock( &p_vout->picture_lock );
+ DropPicture( p_vout, p_last_picture );
p_last_picture = NULL;
}
{
/* Picture is late: it will be destroyed and the thread
* will directly choose the next picture */
- vlc_mutex_lock( &p_vout->picture_lock );
- if( p_picture->i_refcount )
- {
- /* Pretend we displayed the picture, but don't destroy
- * it since the decoder might still need it. */
- p_picture->i_status = DISPLAYED_PICTURE;
- }
- else
- {
- /* Destroy the picture without displaying it */
- p_picture->i_status = DESTROYED_PICTURE;
- p_vout->i_heap_size--;
- }
+ DropPicture( p_vout, p_picture );
+ i_lost++;
msg_Warn( p_vout, "late picture skipped (%"PRId64")",
current_date - display_date );
- i_lost++;
- vlc_mutex_unlock( &p_vout->picture_lock );
-
continue;
}
current_date + p_vout->i_pts_delay + VOUT_BOGUS_DELAY )
{
/* Picture is waaay too early: it will be destroyed */
- vlc_mutex_lock( &p_vout->picture_lock );
- if( p_picture->i_refcount )
- {
- /* Pretend we displayed the picture, but don't destroy
- * it since the decoder might still need it. */
- p_picture->i_status = DISPLAYED_PICTURE;
- }
- else
- {
- /* Destroy the picture without displaying it */
- p_picture->i_status = DESTROYED_PICTURE;
- p_vout->i_heap_size--;
- }
+ DropPicture( p_vout, p_picture );
i_lost++;
msg_Warn( p_vout, "vout warning: early picture skipped "
"(%"PRId64")", display_date - current_date
- p_vout->i_pts_delay );
- vlc_mutex_unlock( &p_vout->picture_lock );
-
continue;
}
}
if( p_picture == NULL )
- {
i_idle_loops++;
- }
-
- /* Video Filter2 stuff */
- if( p_vout->psz_vf2 )
- {
- es_format_t fmt;
-
- vlc_mutex_lock( &p_vout->vfilter_lock );
-
- es_format_Init( &fmt, VIDEO_ES, p_vout->fmt_render.i_chroma );
- fmt.video = p_vout->fmt_render;
- filter_chain_Reset( p_vout->p_vf2_chain, &fmt, &fmt );
-
- if( filter_chain_AppendFromString( p_vout->p_vf2_chain,
- p_vout->psz_vf2 ) < 0 )
- msg_Err( p_vout, "Video filter chain creation failed" );
-
- free( p_vout->psz_vf2 );
- p_vout->psz_vf2 = NULL;
- vlc_mutex_unlock( &p_vout->vfilter_lock );
- }
+ p_filtered_picture = NULL;
if( p_picture )
- {
- p_picture = filter_chain_VideoFilter( p_vout->p_vf2_chain,
- p_picture );
- }
+ p_filtered_picture = filter_chain_VideoFilter( p_vout->p_vf2_chain,
+ p_picture );
- if( p_picture && p_vout->b_snapshot )
- {
+ /* FIXME it is a bit ugly that b_snapshot is not locked but I do not
+ * know which lock to use (here and in the snapshot callback) */
+ const bool b_snapshot = p_vout->b_snapshot;
+ if( b_snapshot )
p_vout->b_snapshot = false;
- vout_Snapshot( p_vout, p_picture );
- }
/*
* Check for subpictures to display
*/
+ bool b_paused = false;
if( display_date > 0 )
{
- if( !p_input )
- {
- p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT,
- FIND_PARENT );
- }
- p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date,
- p_input ? var_GetBool( p_input, "state" ) == PAUSE_S : false );
+ p_input = vlc_object_find( p_vout, VLC_OBJECT_INPUT, FIND_PARENT );
+ b_paused = p_input && var_GetInteger( p_input, "state" ) == PAUSE_S;
if( p_input )
vlc_object_release( p_input );
- p_input = NULL;
+
+ p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date, b_paused, b_snapshot );
}
/*
* Perform rendering
*/
i_displayed++;
- p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );
+ p_directbuffer = vout_RenderPicture( p_vout, p_filtered_picture, p_subpic, b_paused );
+
+ /*
+ * Take a snapshot if requested
+ */
+ if( p_directbuffer && b_snapshot )
+ vout_Snapshot( p_vout, p_directbuffer );
/*
* Call the plugin-specific rendering method if there is one
*/
- if( p_picture != NULL && p_directbuffer != NULL && p_vout->pf_render )
+ 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 );
/*
* Display the previously rendered picture
*/
- if( p_picture != NULL && p_directbuffer != NULL )
+ 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_last_picture = p_picture;
- p_last_picture->b_force = 0;
+ p_last_picture->b_force = false;
}
+ /* Drop the filtered picture if created by video filters */
+ if( p_filtered_picture != NULL && p_filtered_picture != p_picture )
+ DropPicture( p_vout, p_filtered_picture );
+
if( p_picture != NULL )
{
/* Reinitialize idle loop count */
/* A fatal error occurred, and the thread must terminate
* immediately, without displaying anything - setting b_error to 1
* causes the immediate end of the main while() loop. */
+ // FIXME pf_end
p_vout->b_error = 1;
+ break;
}
if( p_vout->i_changes & VOUT_SIZE_CHANGE )
p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
+ assert( !p_vout->b_direct );
+
+ ChromaDestroy( p_vout );
+
+ vlc_mutex_lock( &p_vout->picture_lock );
+
p_vout->pf_end( p_vout );
+
for( i = 0; i < I_OUTPUTPICTURES; i++ )
p_vout->p_picture[ i ].i_status = FREE_PICTURE;
I_OUTPUTPICTURES = 0;
+
if( p_vout->pf_init( p_vout ) )
{
msg_Err( p_vout, "cannot resize display" );
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( p_vout->p_chroma->p_module )
+ if( ChromaCreate( p_vout ) )
{
- filter_t *p_chroma = p_vout->p_chroma;
- module_Unneed( p_chroma, p_chroma->p_module );
- p_chroma->fmt_out.video = p_vout->fmt_out;
- p_chroma->fmt_out.video.i_rmask = p_vout->output.i_rmask;
- p_chroma->fmt_out.video.i_gmask = p_vout->output.i_gmask;
- p_chroma->fmt_out.video.i_bmask = p_vout->output.i_bmask;
- p_chroma->fmt_out.video.i_rrshift = p_vout->output.i_rrshift;
- p_chroma->fmt_out.video.i_lrshift = p_vout->output.i_lrshift;
- p_chroma->fmt_out.video.i_rgshift = p_vout->output.i_rgshift;
- p_chroma->fmt_out.video.i_lgshift = p_vout->output.i_lgshift;
- p_chroma->fmt_out.video.i_rbshift = p_vout->output.i_rbshift;
- p_chroma->fmt_out.video.i_lbshift = p_vout->output.i_lbshift;
- p_chroma->p_module = module_Need( p_chroma, "video filter2", NULL, 0 );
- if( !p_chroma->p_module )
- {
- msg_Err( p_vout, "WOW THIS SUCKS BIG TIME!!!!!" );
- }
+ 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 )
p_vout->i_changes &= ~VOUT_PICTURE_BUFFERS_CHANGE;
if( !p_vout->b_direct )
- {
- module_Unneed( p_vout->p_chroma, p_vout->p_chroma->p_module );
- p_vout->p_chroma = NULL;
- }
+ ChromaDestroy( p_vout );
vlc_mutex_lock( &p_vout->picture_lock );
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\n" );
vlc_mutex_unlock( &p_vout->picture_lock );
+
+ if( p_vout->b_error )
+ break;
}
- }
+ /* Check for "video filter2" changes */
+ vlc_mutex_lock( &p_vout->vfilter_lock );
+ if( p_vout->psz_vf2 )
+ {
+ es_format_t fmt;
- if( p_input )
- {
- vlc_object_release( p_input );
+ es_format_Init( &fmt, VIDEO_ES, p_vout->fmt_render.i_chroma );
+ fmt.video = p_vout->fmt_render;
+ filter_chain_Reset( p_vout->p_vf2_chain, &fmt, &fmt );
+
+ if( filter_chain_AppendFromString( p_vout->p_vf2_chain,
+ p_vout->psz_vf2 ) < 0 )
+ msg_Err( p_vout, "Video filter chain creation failed" );
+
+ free( p_vout->psz_vf2 );
+ p_vout->psz_vf2 = NULL;
+ }
+ vlc_mutex_unlock( &p_vout->vfilter_lock );
}
/*
* 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 );
+
vlc_object_unlock( p_vout );
+ vlc_restorecancel (canc);
+ return NULL;
}
/*****************************************************************************
static void ErrorThread( vout_thread_t *p_vout )
{
/* Wait until a `die' order */
- while( !p_vout->b_die )
+ while( vlc_object_alive( p_vout ) )
+ vlc_object_wait( p_vout );
+}
+
+/*****************************************************************************
+ * CleanThread: clean up after InitThread
+ *****************************************************************************
+ * This function is called after a sucessful
+ * initialization. It frees all resources allocated by InitThread.
+ * XXX You have to enter it with change_lock taken.
+ *****************************************************************************/
+static void CleanThread( vout_thread_t *p_vout )
+{
+ int i_index; /* index in heap */
+
+ if( !p_vout->b_direct )
+ ChromaDestroy( p_vout );
+
+ /* Destroy all remaining pictures */
+ for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++ )
{
- /* Sleep a while */
- msleep( VOUT_IDLE_SLEEP );
+ if ( p_vout->p_picture[i_index].i_type == MEMORY_PICTURE )
+ {
+ free( p_vout->p_picture[i_index].p_data_orig );
+ }
}
+
+ /* Destroy translation tables */
+ if( !p_vout->b_error )
+ p_vout->pf_end( p_vout );
}
/*****************************************************************************
* EndThread: thread destruction
*****************************************************************************
- * This function is called when the thread ends after a sucessful
- * initialization. It frees all resources allocated by InitThread.
+ * This function is called when the thread ends.
+ * It frees all resources not allocated by InitThread.
+ * XXX You have to enter it with change_lock taken.
*****************************************************************************/
static void EndThread( vout_thread_t *p_vout )
{
- int i_index; /* index in heap */
-
#ifdef STATS
{
struct tms cpu_usage;
}
#endif
- if( !p_vout->b_direct )
- {
- module_Unneed( p_vout->p_chroma, p_vout->p_chroma->p_module );
- p_vout->p_chroma->p_module = NULL;
- }
-
- /* 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 );
- }
- }
+ /* FIXME does that function *really* need to be called inside the thread ? */
/* Destroy subpicture unit */
spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false );
/* Destroy the video filters2 */
filter_chain_Delete( p_vout->p_vf2_chain );
+}
- /* Destroy translation tables */
- p_vout->pf_end( p_vout );
+/* 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;
+}
- /* Release the change lock */
- vlc_mutex_unlock( &p_vout->change_lock );
+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_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, 0 );
+
+ 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_chroma );
+ p_vout->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->b_direct );
+
+ if( !p_vout->p_chroma )
+ return;
+
+ module_unneed( p_vout->p_chroma, p_vout->p_chroma->p_module );
+ vlc_object_release( p_vout->p_chroma );
+ p_vout->p_chroma = NULL;
}
+static void DropPicture( vout_thread_t *p_vout, picture_t *p_picture )
+{
+ vlc_mutex_lock( &p_vout->picture_lock );
+ if( p_picture->i_refcount )
+ {
+ /* Pretend we displayed the picture, but don't destroy
+ * it since the decoder might still need it. */
+ p_picture->i_status = DISPLAYED_PICTURE;
+ }
+ else
+ {
+ /* Destroy the picture without displaying it */
+ p_picture->i_status = DESTROYED_PICTURE;
+ p_vout->i_heap_size--;
+ picture_CleanupQuant( p_picture );
+ }
+ vlc_mutex_unlock( &p_vout->picture_lock );
+}
+
+
+
/* following functions are local */
static int ReduceHeight( int i_ratio )
*i_aspect_y = VOUT_ASPECT_FACTOR / i_pgcd;
}
-/*****************************************************************************
- * BinaryLog: computes the base 2 log of a binary value
- *****************************************************************************
- * This functions is used by MaskToShift, to get a bit index from a binary
- * value.
- *****************************************************************************/
-static int BinaryLog( uint32_t i )
+/**
+ * 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 )
{
- int i_log = 0;
-
- if( i == 0 ) return -31337;
-
- if( i & 0xffff0000 ) i_log += 16;
- if( i & 0xff00ff00 ) i_log += 8;
- if( i & 0xf0f0f0f0 ) i_log += 4;
- if( i & 0xcccccccc ) i_log += 2;
- if( i & 0xaaaaaaaa ) i_log += 1;
-
- return i_log;
+ 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;
}
-/*****************************************************************************
- * MaskToShift: transform a color mask into right and left shifts
- *****************************************************************************
- * This function is used for obtaining color shifts from masks.
- *****************************************************************************/
-static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask )
+/**
+ * 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 )
{
- uint32_t i_low, i_high; /* lower hand higher bits of the mask */
-
- if( !i_mask )
- {
- *pi_left = *pi_right = 0;
- return;
- }
-
- /* Get bits */
- i_low = i_high = i_mask;
-
- i_low &= - (int32_t)i_low; /* lower bit of the mask */
- i_high += i_low; /* higher bit of the mask */
-
- /* Transform bits into an index. Also deal with i_high overflow, which
- * is faster than changing the BinaryLog code to handle 64 bit integers. */
- i_low = BinaryLog (i_low);
- i_high = i_high ? BinaryLog (i_high) : 32;
-
- /* Update pointers and return */
- *pi_left = i_low;
- *pi_right = (8 - i_high + i_low);
+ 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;
}
-/*****************************************************************************
- * vout_VarCallback: generic callback for intf variables
- *****************************************************************************/
-int vout_VarCallback( vlc_object_t * p_this, const char * psz_variable,
- vlc_value_t oldval, vlc_value_t newval,
- void *p_data )
+/**
+ * This function computes rgb shifts from masks
+ */
+static void PictureHeapFixRgb( picture_heap_t *p_heap )
{
- vout_thread_t * p_vout = (vout_thread_t *)p_this;
- vlc_value_t val;
- (void)psz_variable; (void)newval; (void)oldval; (void)p_data;
- val.b_bool = true;
- var_Set( p_vout, "intf-change", val );
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Helper thread for object variables callbacks.
- * Only used to avoid deadlocks when using the video embedded mode.
- *****************************************************************************/
-typedef struct suxor_thread_t
-{
- VLC_COMMON_MEMBERS
- input_thread_t *p_input;
-
-} suxor_thread_t;
-
-static void SuxorRestartVideoES( suxor_thread_t *p_this )
-{
- vlc_value_t val;
-
- vlc_thread_ready( p_this );
+ video_format_t fmt;
- /* Now restart current video stream */
- var_Get( p_this->p_input, "video-es", &val );
- if( val.i_int >= 0 )
- {
- vlc_value_t val_es;
- val_es.i_int = -VIDEO_ES;
- var_Set( p_this->p_input, "video-es", val_es );
- var_Set( p_this->p_input, "video-es", val );
- }
+ /* */
+ fmt.i_chroma = p_heap->i_chroma;
+ VideoFormatImportRgb( &fmt, p_heap );
- vlc_object_release( p_this->p_input );
+ /* */
+ video_format_FixRgb( &fmt );
- vlc_object_release( p_this );
+ VideoFormatExportRgb( &fmt, p_heap );
}
/*****************************************************************************
var_Set( p_input, "vout-filter", val );
/* Now restart current video stream */
- var_Get( p_input, "video-es", &val );
- if( val.i_int >= 0 )
- {
- suxor_thread_t *p_suxor =
- vlc_object_create( p_vout, sizeof(suxor_thread_t) );
- p_suxor->p_input = p_input;
- p_vout->b_filter_change = true;
- vlc_object_yield( p_input );
- vlc_thread_create( p_suxor, "suxor", SuxorRestartVideoES,
- VLC_THREAD_PRIORITY_LOW, false );
- }
-
+ input_Control( p_input, INPUT_RESTART_ES, -VIDEO_ES );
vlc_object_release( p_input );
return VLC_SUCCESS;
input_thread_t *p_input;
mtime_t i_now, i_stop;
+ if( !config_GetInt( p_vout, "osd" ) ) return;
+
p_input = (input_thread_t *)vlc_object_find( p_vout,
VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( p_input )
projects / vlc / blobdiff