* It includes functions allowing to open a new thread, send pictures to a
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
+ * Copyright (C) 2000-2007 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <vlc/vlc.h>
+
#include <stdlib.h> /* free() */
+#include <string.h>
-#include <vlc/vlc.h>
#ifdef HAVE_SYS_TIMES_H
# include <sys/times.h>
#endif
-#include "vlc_video.h"
-#include "video_output.h"
-#include "vlc_spu.h"
-#include <vlc/input.h> /* for input_thread_t and i_pts_delay */
+#include <vlc_vout.h>
+#include <vlc_playlist.h>
+
+#include <vlc_filter.h>
+#include <vlc_osd.h>
-#if defined( SYS_DARWIN )
-#include "darwin_specific.h"
+#if defined( __APPLE__ )
+/* Include darwin_specific.h here if needed */
#endif
+/** FIXME This is quite ugly but needed while we don't have counters
+ * helpers */
+#include "input/input_internal.h"
+
+#include "modules/modules.h"
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void AspectRatio ( int, int *, int * );
static int BinaryLog ( uint32_t );
static void MaskToShift ( int *, int *, uint32_t );
-static void InitWindowSize ( vout_thread_t *, int *, int * );
/* Object variables callbacks */
static int DeinterlaceCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int FilterCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
+static int VideoFilter2Callback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
/* 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;
+
+ p_picture = vout_CreatePicture( p_vout, 0, 0, 0 );
+
+ return p_picture;
+}
+
+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_Request: find a video output thread, create one, or destroy one.
*****************************************************************************
{
if( !p_fmt )
{
- /* Reattach video output to input before bailing out */
+ /* Reattach video output to playlist before bailing out */
if( p_vout )
{
- vlc_object_t *p_playlist;
-
- p_playlist = vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist )
- {
- spu_Attach( p_vout->p_spu, p_this, VLC_FALSE );
- vlc_object_detach( p_vout );
- vlc_object_attach( p_vout, p_playlist );
-
- vlc_object_release( p_playlist );
- }
- else
- {
- msg_Dbg( p_this, "cannot find playlist, destroying vout" );
- vlc_object_detach( p_vout );
- vout_Destroy( p_vout );
- }
+ playlist_t *p_playlist = pl_Yield( p_this );
+ spu_Attach( p_vout->p_spu, p_this, VLC_FALSE );
+ vlc_object_detach( p_vout );
+ vlc_object_attach( p_vout, p_playlist );
+ pl_Release( p_this );
}
return NULL;
}
if( !p_vout )
{
- vlc_object_t *p_playlist;
-
- p_playlist = vlc_object_find( p_this,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( p_playlist )
+ playlist_t *p_playlist = pl_Yield( p_this );
+ vlc_mutex_lock( &p_playlist->gc_lock );
+ p_vout = vlc_object_find( p_playlist,
+ VLC_OBJECT_VOUT, FIND_CHILD );
+ /* only first children of p_input for unused vout */
+ if( p_vout && p_vout->p_parent != (vlc_object_t *)p_playlist )
{
- p_vout = vlc_object_find( p_playlist,
- VLC_OBJECT_VOUT, FIND_CHILD );
- /* only first children of p_input for unused vout */
- if( p_vout && p_vout->p_parent != p_playlist )
- {
- vlc_object_release( p_vout );
- p_vout = NULL;
- }
- vlc_object_release( p_playlist );
+ vlc_object_release( p_vout );
+ p_vout = NULL;
}
+ if( p_vout )
+ vlc_object_detach( p_vout ); /* Remove it from the GC */
+ vlc_mutex_unlock( &p_playlist->gc_lock );
+ pl_Release( p_this );
}
}
char *psz_filter_chain;
vlc_value_t val;
- /* We don't directly check for the "filter" variable for obvious
+ /* We don't directly check for the "vout-filter" variable for obvious
* performance reasons. */
if( p_vout->b_filter_change )
{
- var_Get( p_vout, "filter", &val );
+ var_Get( p_vout, "vout-filter", &val );
psz_filter_chain = val.psz_string;
if( psz_filter_chain && !*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_chroma != p_fmt->i_chroma ) ||
- ( p_vout->fmt_render.i_aspect != p_fmt->i_aspect
- && !p_vout->b_override_aspect ) ||
+ ( p_vout->fmt_render.i_aspect != p_fmt->i_aspect ) ||
p_vout->b_filter_change )
{
/* We are not interested in this format, close this vout */
- vlc_object_detach( p_vout );
vlc_object_release( p_vout );
vout_Destroy( p_vout );
p_vout = NULL;
else
{
/* This video output is cool! Hijack it. */
- vlc_object_detach( p_vout );
spu_Attach( p_vout->p_spu, p_this, VLC_TRUE );
vlc_object_attach( p_vout, p_this );
+ if( p_vout->b_title_show )
+ DisplayTitleOnOSD( p_vout );
vlc_object_release( p_vout );
}
}
vout_thread_t * p_vout; /* thread descriptor */
input_thread_t * p_input_thread;
int i_index; /* loop variable */
- char * psz_plugin;
vlc_value_t val, text;
- unsigned int i_width = p_fmt->i_visible_width;
- unsigned int i_height = p_fmt->i_visible_height;
+ unsigned int i_width = p_fmt->i_width;
+ unsigned int i_height = p_fmt->i_height;
vlc_fourcc_t i_chroma = p_fmt->i_chroma;
unsigned int i_aspect = p_fmt->i_aspect;
+ config_chain_t *p_cfg;
+ char *psz_parser;
+ char *psz_name;
+
/* Allocate descriptor */
p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT );
if( p_vout == 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_width = i_width;
p_vout->render.i_height = i_height;
p_vout->render.i_chroma = i_chroma;
p_vout->b_filter_change = 0;
p_vout->pf_control = 0;
p_vout->p_parent_intf = 0;
+ 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 );
/* Mouse coordinates */
var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
/* Take care of some "interface/control" related initialisations */
vout_IntfInit( p_vout );
- p_vout->b_override_aspect = VLC_FALSE;
-
/* If the parent is not a VOUT object, that means we are at the start of
* the video output pipe */
if( p_parent->i_object_type != VLC_OBJECT_VOUT )
{
- var_Get( p_vout, "aspect-ratio", &val );
-
- /* Check whether the user tried to override aspect ratio */
- if( val.psz_string )
- {
- unsigned int i_new_aspect = i_aspect;
- char *psz_parser = strchr( val.psz_string, ':' );
-
- if( psz_parser )
- {
- *psz_parser++ = '\0';
- i_new_aspect = atoi( val.psz_string ) * VOUT_ASPECT_FACTOR
- / atoi( psz_parser );
- }
- else
- {
- i_new_aspect = i_width * VOUT_ASPECT_FACTOR
- * atof( val.psz_string )
- / i_height;
- }
-
- free( val.psz_string );
-
- if( i_new_aspect && i_new_aspect != i_aspect )
- {
- int i_aspect_x, i_aspect_y;
-
- AspectRatio( i_new_aspect, &i_aspect_x, &i_aspect_y );
-
- msg_Dbg( p_vout, "overriding source aspect ratio to %i:%i",
- i_aspect_x, i_aspect_y );
-
- p_vout->render.i_aspect = i_new_aspect;
-
- p_vout->b_override_aspect = VLC_TRUE;
- }
- }
-
/* Look for the default filter configuration */
- var_Create( p_vout, "filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_vout, "filter", &val );
+ 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;
+
+ /* 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 );
}
else
{
/* continue the parent's filter chain */
- char *psz_end;
-
- psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ',' );
- if( psz_end && *(psz_end+1) )
- p_vout->psz_filter_chain = strdup( psz_end+1 );
- else p_vout->psz_filter_chain = NULL;
+ char *psz_tmp;
+
+ /* Ugly hack to jump to our configuration chain */
+ p_vout->psz_filter_chain
+ = ((vout_thread_t *)p_parent)->psz_filter_chain;
+ p_vout->psz_filter_chain
+ = config_ChainCreate( &psz_tmp, &p_cfg, p_vout->psz_filter_chain );
+ config_ChainDestroy( p_cfg );
+ 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_AddCallback( p_vout, "video-filter", VideoFilter2Callback, NULL );
+ p_vout->b_vfilter_change = VLC_TRUE;
+ p_vout->i_vfilters = 0;
+
/* Choose the video output module */
if( !p_vout->psz_filter_chain || !*p_vout->psz_filter_chain )
{
var_Create( p_vout, "vout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Get( p_vout, "vout", &val );
- psz_plugin = val.psz_string;
+ psz_parser = val.psz_string;
}
else
{
- /* the filter chain is a string list of filters separated by double
- * colons */
- char *psz_end;
-
- psz_end = strchr( p_vout->psz_filter_chain, ',' );
- if( psz_end )
- psz_plugin = strndup( p_vout->psz_filter_chain,
- psz_end - p_vout->psz_filter_chain );
- else psz_plugin = strdup( p_vout->psz_filter_chain );
+ psz_parser = strdup( p_vout->psz_filter_chain );
}
- /* Initialize the dimensions of the video window */
- InitWindowSize( p_vout, &p_vout->i_window_width,
- &p_vout->i_window_height );
-
/* Create the vout thread */
+ config_ChainCreate( &psz_name, &p_cfg, psz_parser );
+ free( psz_parser );
+ p_vout->p_cfg = p_cfg;
p_vout->p_module = module_Need( p_vout,
( p_vout->psz_filter_chain && *p_vout->psz_filter_chain ) ?
- "video filter" : "video output", psz_plugin, 0 );
+ "video filter" : "video output", psz_name, 0 );
+ free( psz_name );
- if( psz_plugin ) free( psz_plugin );
if( p_vout->p_module == NULL )
{
msg_Err( p_vout, "no suitable vout module" );
var_Create( p_vout, "deinterlace", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
text.psz_string = _("Deinterlace");
var_Change( p_vout, "deinterlace", VLC_VAR_SETTEXT, &text, NULL );
- val.psz_string = ""; text.psz_string = _("Disable");
+ val.psz_string = (char *)""; text.psz_string = _("Disable");
+ var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
+ val.psz_string = (char *)"discard"; text.psz_string = _("Discard");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "discard"; text.psz_string = _("Discard");
+ val.psz_string = (char *)"blend"; text.psz_string = _("Blend");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "blend"; text.psz_string = _("Blend");
+ val.psz_string = (char *)"mean"; text.psz_string = _("Mean");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "mean"; text.psz_string = _("Mean");
+ val.psz_string = (char *)"bob"; text.psz_string = _("Bob");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "bob"; text.psz_string = _("Bob");
+ val.psz_string = (char *)"linear"; text.psz_string = _("Linear");
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
- val.psz_string = "linear"; text.psz_string = _("Linear");
+ val.psz_string = (char *)"x"; text.psz_string = (char *)"X";
var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
+
if( var_Get( p_vout, "deinterlace-mode", &val ) == VLC_SUCCESS )
{
var_Set( p_vout, "deinterlace", val );
}
var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL );
-
- var_Create( p_vout, "filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
text.psz_string = _("Filters");
- var_Change( p_vout, "filter", VLC_VAR_SETTEXT, &text, NULL );
- var_AddCallback( p_vout, "filter", FilterCallback, NULL );
+ var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL );
+ var_AddCallback( p_vout, "vout-filter", FilterCallback, NULL );
/* Calculate delay created by internal caching */
p_input_thread = (input_thread_t *)vlc_object_find( p_vout,
msg_Err( p_vout, "video output creation failed" );
/* Make sure the thread is destroyed */
- p_vout->b_die = VLC_TRUE;
-
+ vlc_object_kill( p_vout );
vlc_thread_join( p_vout );
vlc_object_detach( p_vout );
*****************************************************************************/
void vout_Destroy( vout_thread_t *p_vout )
{
- vlc_object_t *p_playlist;
+ vout_thread_t *p_another_vout;
+ playlist_t *p_playlist = pl_Yield( p_vout );
/* Request thread destruction */
- p_vout->b_die = VLC_TRUE;
+ vlc_object_kill( p_vout );
vlc_thread_join( p_vout );
var_Destroy( p_vout, "intf-change" );
- p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
if( p_vout->psz_filter_chain ) free( p_vout->psz_filter_chain );
+ config_ChainDestroy( p_vout->p_cfg );
+
/* Free structure */
vlc_object_destroy( p_vout );
-
- /* If it was the last vout, tell the interface to show up */
- if( p_playlist != NULL )
+#ifndef __APPLE__
+ /* 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_playlist,
+ VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_another_vout == NULL )
{
- vout_thread_t *p_another_vout = vlc_object_find( p_playlist,
- VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_another_vout == NULL )
- {
- vlc_value_t val;
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-show", val );
- }
- else
- {
- vlc_object_release( p_another_vout );
- }
- vlc_object_release( p_playlist );
+ vlc_value_t val;
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-show", val );
}
+ else
+ {
+ vlc_object_release( p_another_vout );
+ }
+#endif
+ vlc_object_release( p_playlist );
}
/*****************************************************************************
p_vout->fmt_out.i_width;
}
- vlc_reduce( &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 );
+ 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 );
- msg_Dbg( p_vout, "picture out %ix%i, chroma %4.4s, ar %i:%i, sar %i:%i",
- p_vout->output.i_width, p_vout->output.i_height,
- (char*)&p_vout->output.i_chroma,
+ msg_Dbg( p_vout, "picture out %ix%i (%i,%i,%ix%i), "
+ "chroma %4.4s, ar %i:%i, sar %i:%i",
+ 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 );
picture_t * p_last_picture = NULL; /* last picture */
picture_t * p_directbuffer; /* direct buffer to display */
- subpicture_t * p_subpic; /* subpicture pointer */
+ subpicture_t * p_subpic = NULL; /* subpicture pointer */
+
+ input_thread_t *p_input = NULL ; /* Parent input, if it exists */
+
+ vlc_value_t val;
+ vlc_bool_t b_drop_late;
+
+ int i_displayed = 0, i_lost = 0, i_loops = 0;
/*
* Initialize thread
*/
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;
+
/* signal the creation of the vout */
vlc_thread_ready( p_vout );
return;
}
+ if( p_vout->b_title_show )
+ DisplayTitleOnOSD( p_vout );
+
/*
* Main loop - it is not executed if an error occurred during
* initialization
display_date = 0;
current_date = mdate();
+ if( p_input && p_input->b_die )
+ {
+ vlc_object_release( p_input );
+ p_input = NULL;
+ }
+
+ i_loops++;
+ if( i_loops % 20 == 0 )
+ {
+ 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 );
+ }
+ }
#if 0
p_vout->c_loops++;
if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) )
if( !p_picture->b_force &&
p_picture != p_last_picture &&
- display_date < current_date + p_vout->render_time )
+ display_date < current_date + p_vout->render_time &&
+ b_drop_late )
{
/* Picture is late: it will be destroyed and the thread
* will directly choose the next picture */
}
msg_Warn( p_vout, "late picture skipped ("I64Fd")",
current_date - display_date );
+ i_lost++;
vlc_mutex_unlock( &p_vout->picture_lock );
continue;
p_picture->i_status = DESTROYED_PICTURE;
p_vout->i_heap_size--;
}
+ i_lost++;
msg_Warn( p_vout, "vout warning: early picture skipped "
"("I64Fd")", display_date - current_date
- p_vout->i_pts_delay );
i_idle_loops++;
}
+ /* Video Filter2 stuff */
+ if( p_vout->b_vfilter_change == VLC_TRUE )
+ {
+ 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 );
+
+ 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;
+
+ 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;
+
+ 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],
+ VLC_TRUE );
+
+ 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_destroy( p_vfilter );
+ }
+ }
+ p_vout->b_vfilter_change = VLC_FALSE;
+ 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;
+ }
+ }
+
if( p_picture && p_vout->b_snapshot )
{
p_vout->b_snapshot = VLC_FALSE;
/*
* Check for subpictures to display
*/
- p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date );
+ 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 : VLC_FALSE );
+ }
/*
* Perform rendering
*/
+ i_displayed++;
p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic );
/*
}
}
+ if( p_input )
+ {
+ vlc_object_release( p_input );
+ }
+
/*
* Error loop - wait until the thread destruction is requested
*/
spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), VLC_FALSE );
spu_Destroy( p_vout->p_spu );
+ /* Destroy the video filters2 */
+ RemoveVideoFilters2( p_vout );
+
/* Destroy translation tables */
p_vout->pf_end( p_vout );
/* 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_vout->p_module )
}
/* Get bits */
- i_low = i_mask & (- (int32_t)i_mask); /* lower bit of the mask */
- i_high = i_mask + i_low; /* higher bit of the mask */
+ 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 */
+ /* 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 = BinaryLog (i_high);
+ i_high = i_high ? BinaryLog (i_high) : 32;
/* Update pointers and return */
*pi_left = i_low;
*pi_right = (8 - i_high + i_low);
}
-/*****************************************************************************
- * InitWindowSize: find the initial dimensions the video window should have.
- *****************************************************************************
- * This function will check the "width", "height" and "zoom" config options and
- * will calculate the size that the video window should have.
- *****************************************************************************/
-static void InitWindowSize( vout_thread_t *p_vout, int *pi_width,
- int *pi_height )
-{
- vlc_value_t val;
- int i_width, i_height;
- uint64_t ll_zoom;
-
-#define FP_FACTOR 1000 /* our fixed point factor */
-
- var_Get( p_vout, "align", &val );
- p_vout->i_alignment = val.i_int;
-
- var_Get( p_vout, "width", &val );
- i_width = val.i_int;
- var_Get( p_vout, "height", &val );
- i_height = val.i_int;
- var_Get( p_vout, "zoom", &val );
- ll_zoom = (uint64_t)( FP_FACTOR * val.f_float );
-
- if( i_width > 0 && i_height > 0)
- {
- *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
- *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
- return;
- }
- else if( i_width > 0 )
- {
- *pi_width = (int)( i_width * ll_zoom / FP_FACTOR );
- *pi_height = (int)( i_width * ll_zoom * VOUT_ASPECT_FACTOR /
- p_vout->render.i_aspect / FP_FACTOR );
- return;
- }
- else if( i_height > 0 )
- {
- *pi_height = (int)( i_height * ll_zoom / FP_FACTOR );
- *pi_width = (int)( i_height * ll_zoom * p_vout->render.i_aspect /
- VOUT_ASPECT_FACTOR / FP_FACTOR );
- return;
- }
-
- if( p_vout->render.i_height * p_vout->render.i_aspect
- >= p_vout->render.i_width * VOUT_ASPECT_FACTOR )
- {
- *pi_width = (int)( p_vout->render.i_height * ll_zoom
- * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR / FP_FACTOR );
- *pi_height = (int)( p_vout->render.i_height * ll_zoom / FP_FACTOR );
- }
- else
- {
- *pi_width = (int)( p_vout->render.i_width * ll_zoom / FP_FACTOR );
- *pi_height = (int)( p_vout->render.i_width * ll_zoom
- * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect / FP_FACTOR );
- }
-
-#undef FP_FACTOR
-}
-
/*****************************************************************************
* vout_VarCallback: generic callback for intf variables
*****************************************************************************/
int vout_VarCallback( vlc_object_t * p_this, const char * psz_variable,
- vlc_value_t old_value, vlc_value_t new_value,
- void * unused )
+ 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 = VLC_TRUE;
var_Set( p_vout, "intf-change", val );
return VLC_SUCCESS;
vlc_object_release( p_this->p_input );
-#ifdef WIN32
- CloseHandle( p_this->thread_id );
-#endif
-
vlc_object_destroy( p_this );
}
char *psz_mode = newval.psz_string;
char *psz_filter, *psz_deinterlace = NULL;
+ (void)psz_cmd; (void)oldval; (void)p_data;
- var_Get( p_vout, "filter", &val );
+ var_Get( p_vout, "vout-filter", &val );
psz_filter = val.psz_string;
if( psz_filter ) psz_deinterlace = strstr( psz_filter, "deinterlace" );
if( psz_deinterlace )
{
char *psz_src = psz_deinterlace + sizeof("deinterlace") - 1;
- if( psz_src[0] == ',' ) psz_src++;
+ if( psz_src[0] == ':' ) psz_src++;
memmove( psz_deinterlace, psz_src, strlen(psz_src) + 1 );
}
}
else if( !psz_deinterlace )
{
psz_filter = realloc( psz_filter, strlen( psz_filter ) +
- sizeof(",deinterlace") );
- if( psz_filter && *psz_filter ) strcat( psz_filter, "," );
+ sizeof(":deinterlace") );
+ if( psz_filter && *psz_filter ) strcat( psz_filter, ":" );
strcat( psz_filter, "deinterlace" );
}
var_Set( p_vout, "intf-change", val );
val.psz_string = psz_filter;
- var_Set( p_vout, "filter", val );
+ var_Set( p_vout, "vout-filter", val );
if( psz_filter ) free( psz_filter );
return VLC_SUCCESS;
vout_thread_t *p_vout = (vout_thread_t *)p_this;
input_thread_t *p_input;
vlc_value_t val;
+ (void)psz_cmd; (void)oldval; (void)p_data;
p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT,
FIND_PARENT );
/* Modify input as well because the vout might have to be restarted */
val.psz_string = newval.psz_string;
- var_Create( p_input, "filter", VLC_VAR_STRING );
- var_Set( p_input, "filter", val );
+ var_Create( p_input, "vout-filter", VLC_VAR_STRING );
+
+ var_Set( p_input, "vout-filter", val );
/* Now restart current video stream */
var_Get( p_input, "video-es", &val );
return VLC_SUCCESS;
}
+
+/*****************************************************************************
+ * 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 );
+ if( p_vout->psz_vfilters[p_vout->i_vfilters_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 )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ (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 = VLC_TRUE;
+ 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_destroy( p_vout->pp_vfilters[i] );
+ }
+ p_vout->i_vfilters = 0;
+}
+
+static void DisplayTitleOnOSD( vout_thread_t *p_vout )
+{
+ input_thread_t *p_input;
+ mtime_t i_now, i_stop;
+
+ p_input = (input_thread_t *)vlc_object_find( p_vout,
+ VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( p_input )
+ {
+ i_now = mdate();
+ i_stop = i_now + (mtime_t)(p_vout->i_title_timeout * 1000);
+ char *psz_nowplaying =
+ input_item_GetNowPlaying( input_GetItem( p_input ) );
+ char *psz_artist = input_item_GetArtist( input_GetItem( p_input ) );
+ char *psz_name = input_item_GetTitle( input_GetItem( p_input ) );
+ if( EMPTY_STR( psz_name ) )
+ {
+ free( psz_name );
+ psz_name = input_item_GetName( input_GetItem( p_input ) );
+ }
+ if( !EMPTY_STR( psz_nowplaying ) )
+ {
+ vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
+ psz_nowplaying, NULL,
+ p_vout->i_title_position,
+ 30 + p_vout->fmt_in.i_width
+ - p_vout->fmt_in.i_visible_width
+ - p_vout->fmt_in.i_x_offset,
+ 20 + p_vout->fmt_in.i_y_offset,
+ i_now, i_stop );
+ }
+ else if( !EMPTY_STR( psz_artist ) )
+ {
+ char *psz_string = NULL;
+
+ psz_string = malloc( strlen( psz_name ) + strlen( psz_artist ) );
+ if( psz_string )
+ {
+ sprintf( psz_string, "%s - %s", psz_name, psz_artist );
+
+ vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
+ psz_string, NULL,
+ p_vout->i_title_position,
+ 30 + p_vout->fmt_in.i_width
+ - p_vout->fmt_in.i_visible_width
+ - p_vout->fmt_in.i_x_offset,
+ 20 + p_vout->fmt_in.i_y_offset,
+ i_now, i_stop );
+ free( psz_string );
+ }
+ }
+ else
+ {
+ vout_ShowTextAbsolute( p_vout, DEFAULT_CHAN,
+ psz_name, NULL,
+ p_vout->i_title_position,
+ 30 + p_vout->fmt_in.i_width
+ - p_vout->fmt_in.i_visible_width
+ - p_vout->fmt_in.i_x_offset,
+ 20 + p_vout->fmt_in.i_y_offset,
+ i_now, i_stop );
+ }
+ vlc_object_release( p_input );
+ free( psz_artist );
+ free( psz_name );
+ free( psz_nowplaying );
+ }
+}
projects / vlc / blobdiff