#include "input/input_internal.h"
#include "modules/modules.h"
+#include <assert.h>
/*****************************************************************************
* Local prototypes
static int InitThread ( vout_thread_t * );
static void RunThread ( vout_thread_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 * );
{
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 );
+ vlc_object_kill( p_vout );
+ vlc_thread_join( p_vout );
+ module_Unneed( p_vout, p_vout->p_module );
+ vlc_object_release( p_vout );
}
return NULL;
}
{
vlc_object_yield( 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_name;
/* 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;
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;
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;
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 */
+ /* Make sure the thread is destroyed and data released */
+ vlc_object_kill( p_vout );
+ vlc_thread_join( p_vout );
+ module_Unneed( p_vout, p_vout->p_module );
vlc_object_release( p_vout );
return NULL;
}
- vlc_object_set_destructor( p_vout, vout_Destructor );
-
return p_vout;
}
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 )
-{
- 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 void ChromaDestroy( vout_thread_t *p_vout );
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;
}
p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den );
/* Calculate shifts from system-updated masks */
+ MaskToShift( &p_vout->render.i_lrshift, &p_vout->output.i_rrshift,
+ p_vout->render.i_rmask );
+ MaskToShift( &p_vout->render.i_lgshift, &p_vout->output.i_rgshift,
+ p_vout->render.i_gmask );
+ MaskToShift( &p_vout->render.i_lbshift, &p_vout->output.i_rbshift,
+ p_vout->render.i_bmask );
+
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,
* 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;
}
/*
* 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 );
vlc_thread_ready( p_vout );
if( p_vout->b_error )
+ {
+ EndThread( p_vout );
+ vlc_mutex_unlock( &p_vout->change_lock );
return;
+ }
vlc_object_lock( p_vout );
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 );
- }
-
if( p_picture )
{
p_picture = filter_chain_VideoFilter( p_vout->p_vf2_chain,
/* 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 );
- vlc_object_detach( p_vout->p_chroma );
- vlc_object_release( p_vout->p_chroma );
- 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;
+
+ 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 );
}
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 );
- vlc_object_detach( p_vout->p_chroma );
- vlc_object_release( p_vout->p_chroma );
- p_vout->p_chroma = 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 void ChromaCopyRgbInfo( es_format_t *p_fmt, picture_heap_t *p_heap )
+{
+ p_fmt->video.i_rmask = p_heap->i_rmask;
+ p_fmt->video.i_gmask = p_heap->i_gmask;
+ p_fmt->video.i_bmask = p_heap->i_bmask;
+ p_fmt->video.i_rrshift = p_heap->i_rrshift;
+ p_fmt->video.i_lrshift = p_heap->i_lrshift;
+ p_fmt->video.i_rgshift = p_heap->i_rgshift;
+ p_fmt->video.i_lgshift = p_heap->i_lgshift;
+ p_fmt->video.i_rbshift = p_heap->i_rbshift;
+ p_fmt->video.i_lbshift = p_heap->i_lbshift;
+}
+
+static int ChromaCreate( vout_thread_t *p_vout )
+{
+ filter_t *p_chroma;
+
+ /* Choose the best module */
+ p_chroma = p_vout->p_chroma = vlc_object_create( p_vout, sizeof(filter_t) );
+
+ 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;
+ ChromaCopyRgbInfo( &p_chroma->fmt_in, &p_vout->render );
+ ChromaCopyRgbInfo( &p_chroma->fmt_out, &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;
}
+
+
/* following functions are local */
static int ReduceHeight( int i_ratio )
static void SuxorRestartVideoES( suxor_thread_t *p_this )
{
- vlc_value_t val;
-
- vlc_thread_ready( p_this );
-
/* Now restart current video stream */
- var_Get( p_this->p_input, "video-es", &val );
- if( val.i_int >= 0 )
+ int val = var_GetInteger( p_this->p_input, "video-es" );
+ if( val >= 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 );
+ var_SetInteger( p_this->p_input, "video-es", -VIDEO_ES );
+ var_SetInteger( p_this->p_input, "video-es", val );
}
vlc_object_release( p_this->p_input );
projects / vlc / blobdiff