* 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_release( p_vout );
- }
+ vout_CloseAndRelease( p_vout );
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->b_error )
{
msg_Err( p_vout, "video output creation failed" );
-
- /* Make sure the thread is destroyed and data released */
- vlc_object_release( p_vout );
+ vout_CloseAndRelease( p_vout );
return NULL;
}
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 though 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 );
+}
+
+/* */
static void vout_Destructor( vlc_object_t * p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
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 );
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,
return p_pic;
}
+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 )
{
+ static const char typename[] = "chroma";
filter_t *p_chroma;
/* Choose the best module */
- p_chroma = p_vout->p_chroma = vlc_object_create( p_vout, sizeof(filter_t) );
+ 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;
+ ChromaCopyRgbInfo( &p_chroma->fmt_in, &p_vout->render );
+ ChromaCopyRgbInfo( &p_chroma->fmt_out, &p_vout->output );
- 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 )
*pi_right = (8 - i_high + i_low);
}
-/*****************************************************************************
- * 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 )
-{
- 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.
var_Get( p_input, "video-es", &val );
if( val.i_int >= 0 )
{
+ static const char typename[] = "kludge";
suxor_thread_t *p_suxor =
- vlc_object_create( p_vout, sizeof(suxor_thread_t) );
+ vlc_custom_create( p_vout, sizeof(suxor_thread_t),
+ VLC_OBJECT_GENERIC, typename );
p_suxor->p_input = p_input;
p_vout->b_filter_change = true;
vlc_object_yield( p_input );
projects / vlc / blobdiff