# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <stdlib.h> /* free() */
#include <string.h>
#endif
#include <vlc_vout.h>
-#include <vlc_playlist.h>
#include <vlc_filter.h>
#include <vlc_osd.h>
/* From vout_intf.c */
int vout_Snapshot( vout_thread_t *, picture_t * );
-/* Video filter2 parsing */
-static int ParseVideoFilter2Chain( vout_thread_t *, char * );
-static void RemoveVideoFilters2( vout_thread_t *p_vout );
-
/* Display media title in OSD */
static void DisplayTitleOnOSD( vout_thread_t *p_vout );
/*****************************************************************************
* Video Filter2 functions
*****************************************************************************/
-struct filter_owner_sys_t
-{
- vout_thread_t *p_vout;
-};
-
static picture_t *video_new_buffer_filter( filter_t *p_filter )
{
picture_t *p_picture;
- vout_thread_t *p_vout = p_filter->p_owner->p_vout;
+ vout_thread_t *p_vout = (vout_thread_t*)p_filter->p_owner;
p_picture = vout_CreatePicture( p_vout, 0, 0, 0 );
static void video_del_buffer_filter( filter_t *p_filter, picture_t *p_pic )
{
- vout_DestroyPicture( p_filter->p_owner->p_vout, p_pic );
+ vout_DestroyPicture( (vout_thread_t*)p_filter->p_owner, 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->p_owner = p_data; /* p_vout */
+ return VLC_SUCCESS;
}
/*****************************************************************************
{
if( !p_fmt )
{
- /* Reattach video output to playlist before bailing out */
+ /* Reattach video output to the instance before bailing out */
if( p_vout )
{
spu_Attach( p_vout->p_spu, p_this, false );
{
/* We are not interested in this format, close this vout */
vlc_object_release( p_vout );
- vout_Destroy( p_vout );
+ vlc_object_release( p_vout );
p_vout = NULL;
}
else
/* Allocate descriptor */
p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
if( p_vout == NULL )
- {
- msg_Err( p_parent, "out of memory" );
return NULL;
- }
/* Initialize pictures - translation tables and functions
* will be initialized later in InitThread */
p_vout->i_par_num = p_vout->i_par_den = 1;
/* Initialize locks */
- vlc_mutex_init( p_vout, &p_vout->picture_lock );
- vlc_mutex_init( p_vout, &p_vout->change_lock );
- vlc_mutex_init( p_vout, &p_vout->vfilter_lock );
+ vlc_mutex_init( &p_vout->picture_lock );
+ vlc_mutex_init( &p_vout->change_lock );
+ vlc_mutex_init( &p_vout->vfilter_lock );
/* Mouse coordinates */
var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
if( p_parent->i_object_type != VLC_OBJECT_VOUT )
{
/* Look for the default filter configuration */
- var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_vout, "vout-filter", &val );
- p_vout->psz_filter_chain = val.psz_string;
+ p_vout->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 );
- var_Get( p_vout, "video-filter", &val );
- ParseVideoFilter2Chain( p_vout, val.psz_string );
- free( val.psz_string );
+ p_vout->psz_vf2 =
+ var_CreateGetStringCommand( p_vout, "video-filter" );
}
else
{
free( psz_tmp );
/* Create a video filter2 var ... but don't inherit values */
- var_Create( p_vout, "video-filter", VLC_VAR_STRING );
- ParseVideoFilter2Chain( p_vout, NULL );
+ var_Create( p_vout, "video-filter",
+ VLC_VAR_STRING | VLC_VAR_ISCOMMAND );
+ p_vout->psz_vf2 = var_GetString( p_vout, "video-filter" );
}
var_AddCallback( p_vout, "video-filter", VideoFilter2Callback, NULL );
- p_vout->b_vfilter_change = true;
- p_vout->i_vfilters = 0;
+ p_vout->p_vf2_chain = filter_chain_New( p_vout, "video filter2",
+ false, video_filter_buffer_allocation_init, NULL, p_vout );
/* Choose the video output module */
if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain )
if( vlc_thread_create( p_vout, "video output", RunThread,
VLC_THREAD_PRIORITY_OUTPUT, true ) )
{
- msg_Err( p_vout, "out of memory" );
module_Unneed( p_vout, p_vout->p_module );
vlc_object_release( p_vout );
return NULL;
return p_vout;
}
-/*****************************************************************************
- * vout_Destroy: destroys a previously created video output
- *****************************************************************************
- * Destroy a terminated thread.
- * The function will request a destruction of the specified thread. If pi_error
- * is NULL, it will return once the thread is destroyed. Else, it will be
- * update using one of the THREAD_* constants.
- *****************************************************************************/
-void vout_Destroy( vout_thread_t *p_vout )
-{
- /* XXX: should go in the destructor */
- var_Destroy( p_vout, "intf-change" );
-
- vlc_object_release( p_vout );
-}
-
static void vout_Destructor( vlc_object_t * p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
#ifndef __APPLE__
vout_thread_t *p_another_vout;
- playlist_t *p_playlist = pl_Get( p_vout );
- if( p_playlist->b_die ) return;
- vlc_object_yield( p_playlist );
-/* This is a dirty hack for mostly 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 )
- {
- vlc_value_t val;
- val.b_bool = true;
- var_Set( p_playlist, "intf-show", val );
- }
+ /* 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 );
- }
- vlc_object_release( p_playlist );
#endif
}
* initialization. It returns 0 on success. Note that the thread's flag are not
* modified inside this function.
*****************************************************************************/
+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 InitThread( vout_thread_t *p_vout )
{
int i, i_aspect_x, i_aspect_y;
p_vout->b_direct = 0;
/* Choose the best module */
- p_vout->chroma.p_module = module_Need( p_vout, "chroma", NULL, 0 );
-
- if( p_vout->chroma.p_module == NULL )
+ 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 )
{
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",
if( p_vout->b_error )
return;
+ vlc_object_lock( p_vout );
+
if( p_vout->b_title_show )
DisplayTitleOnOSD( p_vout );
* Main loop - it is not executed if an error occurred during
* initialization
*/
- while( (!p_vout->b_die) && (!p_vout->b_error) )
+ while( (vlc_object_alive( p_vout )) && (!p_vout->b_error) )
{
/* Initialize loop variables */
p_picture = NULL;
p_picture->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
}
- msg_Warn( p_vout, "late picture skipped ("I64Fd")",
+ msg_Warn( p_vout, "late picture skipped (%"PRId64")",
current_date - display_date );
i_lost++;
vlc_mutex_unlock( &p_vout->picture_lock );
}
i_lost++;
msg_Warn( p_vout, "vout warning: early picture skipped "
- "("I64Fd")", display_date - current_date
+ "(%"PRId64")", display_date - current_date
- p_vout->i_pts_delay );
vlc_mutex_unlock( &p_vout->picture_lock );
}
/* Video Filter2 stuff */
- if( p_vout->b_vfilter_change == true )
+ if( p_vout->psz_vf2 )
{
- int i;
- vlc_mutex_lock( &p_vout->vfilter_lock );
- RemoveVideoFilters2( p_vout );
- for( i = 0; i < p_vout->i_vfilters_cfg; i++ )
- {
- filter_t *p_vfilter =
- p_vout->pp_vfilters[p_vout->i_vfilters] =
- vlc_object_create( p_vout, VLC_OBJECT_FILTER );
+ es_format_t fmt;
- vlc_object_attach( p_vfilter, p_vout );
-
- p_vfilter->pf_vout_buffer_new = video_new_buffer_filter;
- p_vfilter->pf_vout_buffer_del = video_del_buffer_filter;
+ vlc_mutex_lock( &p_vout->vfilter_lock );
- if( !p_vout->i_vfilters )
- {
- p_vfilter->fmt_in.video = p_vout->fmt_render;
- }
- else
- {
- p_vfilter->fmt_in.video = (p_vfilter-1)->fmt_out.video;
- }
- /* TODO: one day filters in the middle of the chain might
- * have a different fmt_out.video than fmt_render ... */
- p_vfilter->fmt_out.video = p_vout->fmt_render;
+ 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 );
- p_vfilter->p_cfg = p_vout->p_vfilters_cfg[i];
- p_vfilter->p_module = module_Need( p_vfilter, "video filter2",
- p_vout->psz_vfilters[i],
- true );
+ if( filter_chain_AppendFromString( p_vout->p_vf2_chain,
+ p_vout->psz_vf2 ) < 0 )
+ msg_Err( p_vout, "Video filter chain creation failed" );
- if( p_vfilter->p_module )
- {
- p_vfilter->p_owner =
- malloc( sizeof( filter_owner_sys_t ) );
- p_vfilter->p_owner->p_vout = p_vout;
- p_vout->i_vfilters++;
- msg_Dbg( p_vout, "video filter found (%s)",
- p_vout->psz_vfilters[i] );
- }
- else
- {
- msg_Err( p_vout, "no video filter found (%s)",
- p_vout->psz_vfilters[i] );
- vlc_object_detach( p_vfilter );
- vlc_object_release( p_vfilter );
- }
- }
- p_vout->b_vfilter_change = false;
+ free( p_vout->psz_vf2 );
+ p_vout->psz_vf2 = NULL;
vlc_mutex_unlock( &p_vout->vfilter_lock );
}
if( p_picture )
{
- int i;
- for( i = 0; i < p_vout->i_vfilters; i++ )
- {
- picture_t *p_old = p_picture;
- p_picture = p_vout->pp_vfilters[i]->pf_video_filter(
- p_vout->pp_vfilters[i], p_picture );
- if( !p_picture )
- {
- break;
- }
- /* FIXME: this is kind of wrong
- * if you have 2 or more vfilters and the 2nd breaks,
- * on the next loop the 1st one will be applied again */
-
- /* if p_old and p_picture are the same (ie the filter
- * worked on the old picture), then following code is
- * still alright since i_status gets changed back to
- * the right value */
- if( p_old->i_refcount )
- {
- p_old->i_status = DISPLAYED_PICTURE;
- }
- else
- {
- p_old->i_status = DESTROYED_PICTURE;
- }
- p_picture->i_status = READY_PICTURE;
- }
+ p_picture = filter_chain_VideoFilter( p_vout->p_vf2_chain,
+ p_picture );
}
if( p_picture && p_vout->b_snapshot )
/* Give back change lock */
vlc_mutex_unlock( &p_vout->change_lock );
+ vlc_object_unlock( p_vout );
+
/* Sleep a while or until a given date */
if( display_date != 0 )
{
/* On awakening, take back lock and send immediately picture
* to display. */
+ vlc_object_lock( p_vout );
+ /* Note: vlc_object_alive() could be false here, and we
+ * could be dead */
vlc_mutex_lock( &p_vout->change_lock );
/*
p_vout->b_error = 1;
}
- /* Need to reinitialise the chroma plugin */
- if( p_vout->chroma.p_module )
+ /* 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( p_vout->chroma.p_module->pf_deactivate )
- p_vout->chroma.p_module->pf_deactivate( VLC_OBJECT(p_vout) );
- p_vout->chroma.p_module->pf_activate( VLC_OBJECT(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!!!!!" );
+ }
}
}
if( !p_vout->b_direct )
{
- module_Unneed( p_vout, p_vout->chroma.p_module );
+ module_Unneed( p_vout->p_chroma, p_vout->p_chroma->p_module );
+ p_vout->p_chroma = NULL;
}
vlc_mutex_lock( &p_vout->picture_lock );
}
}
+
if( p_input )
{
vlc_object_release( p_input );
/* End of thread */
EndThread( p_vout );
+ vlc_object_unlock( p_vout );
}
/*****************************************************************************
if( !p_vout->b_direct )
{
- module_Unneed( p_vout, p_vout->chroma.p_module );
+ module_Unneed( p_vout->p_chroma, p_vout->p_chroma->p_module );
+ p_vout->p_chroma->p_module = NULL;
}
/* Destroy all remaining pictures */
spu_Destroy( p_vout->p_spu );
/* Destroy the video filters2 */
- RemoveVideoFilters2( p_vout );
+ filter_chain_Delete( p_vout->p_vf2_chain );
/* Destroy translation tables */
p_vout->pf_end( p_vout );
/*****************************************************************************
* Video Filter2 stuff
*****************************************************************************/
-static int ParseVideoFilter2Chain( vout_thread_t *p_vout, char *psz_vfilters )
-{
- int i;
- for( i = 0; i < p_vout->i_vfilters_cfg; i++ )
- {
- struct config_chain_t *p_cfg =
- p_vout->p_vfilters_cfg[p_vout->i_vfilters_cfg];
- config_ChainDestroy( p_cfg );
- free( p_vout->psz_vfilters[p_vout->i_vfilters_cfg] );
- p_vout->psz_vfilters[p_vout->i_vfilters_cfg] = NULL;
- }
- p_vout->i_vfilters_cfg = 0;
- if( psz_vfilters && *psz_vfilters )
- {
- char *psz_parser = psz_vfilters;
-
- while( psz_parser && *psz_parser )
- {
- psz_parser = config_ChainCreate(
- &p_vout->psz_vfilters[p_vout->i_vfilters_cfg],
- &p_vout->p_vfilters_cfg[p_vout->i_vfilters_cfg],
- psz_parser );
- msg_Dbg( p_vout, "adding vfilter: %s",
- p_vout->psz_vfilters[p_vout->i_vfilters_cfg] );
- p_vout->i_vfilters_cfg++;
- if( psz_parser && *psz_parser )
- {
- if( p_vout->i_vfilters_cfg == MAX_VFILTERS )
- {
- msg_Warn( p_vout,
- "maximum number of video filters reached. \"%s\" discarded",
- psz_parser );
- break;
- }
- }
- }
- }
- return VLC_SUCCESS;
-}
-
static int VideoFilter2Callback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
(void)psz_cmd; (void)oldval; (void)p_data;
vlc_mutex_lock( &p_vout->vfilter_lock );
- ParseVideoFilter2Chain( p_vout, newval.psz_string );
- p_vout->b_vfilter_change = true;
+ p_vout->psz_vf2 = strdup( newval.psz_string );
vlc_mutex_unlock( &p_vout->vfilter_lock );
return VLC_SUCCESS;
}
-static void RemoveVideoFilters2( vout_thread_t *p_vout )
-{
- int i;
- for( i = 0; i < p_vout->i_vfilters; i++ )
- {
- vlc_object_detach( p_vout->pp_vfilters[i] );
- if( p_vout->pp_vfilters[i]->p_module )
- {
- module_Unneed( p_vout->pp_vfilters[i],
- p_vout->pp_vfilters[i]->p_module );
- }
-
- free( p_vout->pp_vfilters[i]->p_owner );
- vlc_object_release( p_vout->pp_vfilters[i] );
- }
- p_vout->i_vfilters = 0;
-}
-
static void DisplayTitleOnOSD( vout_thread_t *p_vout )
{
input_thread_t *p_input;
projects / vlc / blobdiff