X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=fc7530bd7e0918a178abd881078fd4d2fd966b55;hb=9786ac4147c27fbc2ead747d4ec908fd34c01ef5;hp=6e5dd3714cbc2ca8056883da85ea24433370e6a4;hpb=88c63e2e1cdca4fc42acfb42c2c53af1824b2bfb;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 6e5dd3714c..fc7530bd7e 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -5,10 +5,11 @@ * 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-2004 the VideoLAN team * $Id$ * * Authors: Vincent Seguin + * Gildas Bazin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,15 +23,17 @@ * * 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 + #include /* free() */ +#include -#include #ifdef HAVE_SYS_TIMES_H # include @@ -40,8 +43,11 @@ #include "video_output.h" #include "vlc_spu.h" #include /* for input_thread_t and i_pts_delay */ +#include "vlc_playlist.h" + +#include "vlc_filter.h" -#if defined( SYS_DARWIN ) +#if defined( __APPLE__ ) #include "darwin_specific.h" #endif @@ -57,13 +63,44 @@ static void DestroyThread ( vout_thread_t * ); 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 ); + +/***************************************************************************** + * 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. @@ -71,34 +108,19 @@ static int FilterCallback( vlc_object_t *, char const *, * This function looks for a video output thread matching the current * properties. If not found, it spawns a new one. *****************************************************************************/ -vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, - unsigned int i_width, unsigned int i_height, - vlc_fourcc_t i_chroma, unsigned int i_aspect ) +vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, + video_format_t *p_fmt ) { - if( !i_width || !i_height || !i_chroma ) + 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; } @@ -114,22 +136,18 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, 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; } + vlc_mutex_unlock( &p_playlist->gc_lock ); + pl_Release( p_this ); } } @@ -139,11 +157,11 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, 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 ) @@ -165,11 +183,10 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, if( psz_filter_chain ) free( psz_filter_chain ); } - if( ( p_vout->render.i_width != i_width ) || - ( p_vout->render.i_height != i_height ) || - ( p_vout->render.i_chroma != i_chroma ) || - ( p_vout->render.i_aspect != i_aspect - && !p_vout->b_override_aspect ) || + 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_filter_change ) { /* We are not interested in this format, close this vout */ @@ -192,7 +209,7 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, { msg_Dbg( p_this, "no usable vout present, spawning one" ); - p_vout = vout_Create( p_this, i_width, i_height, i_chroma, i_aspect ); + p_vout = vout_Create( p_this, p_fmt ); } return p_vout; @@ -204,9 +221,7 @@ vout_thread_t * __vout_Request ( vlc_object_t *p_this, vout_thread_t *p_vout, * This function creates a new video output thread, and returns a pointer * to its description. On error, it returns NULL. *****************************************************************************/ -vout_thread_t * __vout_Create( vlc_object_t *p_parent, - unsigned int i_width, unsigned int i_height, - vlc_fourcc_t i_chroma, unsigned int i_aspect ) +vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) { vout_thread_t * p_vout; /* thread descriptor */ input_thread_t * p_input_thread; @@ -214,6 +229,11 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, char * psz_plugin; vlc_value_t val, text; + 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; + /* Allocate descriptor */ p_vout = vlc_object_create( p_parent, VLC_OBJECT_VOUT ); if( p_vout == NULL ) @@ -238,6 +258,12 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, /* 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; @@ -275,6 +301,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, 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 ); @@ -299,54 +326,21 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, /* 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 { @@ -357,8 +351,16 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, if( psz_end && *(psz_end+1) ) p_vout->psz_filter_chain = strdup( psz_end+1 ); else p_vout->psz_filter_chain = NULL; + + /* 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 ) { @@ -379,10 +381,6 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, else psz_plugin = 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 */ p_vout->p_module = module_Need( p_vout, ( p_vout->psz_filter_chain && *p_vout->psz_filter_chain ) ? @@ -413,6 +411,9 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); val.psz_string = "linear"; text.psz_string = _("Linear"); var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); + val.psz_string = "x"; text.psz_string = "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 ); @@ -421,10 +422,10 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, 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, @@ -476,7 +477,8 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, *****************************************************************************/ 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; @@ -484,31 +486,24 @@ void vout_Destroy( vout_thread_t *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 ); /* Free structure */ vlc_object_destroy( p_vout ); - /* If it was the last vout, tell the interface to show up */ - if( p_playlist != NULL ) + 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 ); } + vlc_object_release( p_playlist ); } /***************************************************************************** @@ -555,19 +550,63 @@ static int InitThread( vout_thread_t *p_vout ) msg_Dbg( p_vout, "got %i direct buffer(s)", I_OUTPUTPICTURES ); - AspectRatio( p_vout->render.i_aspect, &i_aspect_x, &i_aspect_y ); - msg_Dbg( p_vout, - "picture in %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i", - p_vout->render.i_width, p_vout->render.i_height, - p_vout->render.i_chroma, (char*)&p_vout->render.i_chroma, - i_aspect_x, i_aspect_y ); + AspectRatio( p_vout->fmt_render.i_aspect, &i_aspect_x, &i_aspect_y ); + + msg_Dbg( p_vout, "picture in %ix%i (%i,%i,%ix%i), " + "chroma %4.4s, ar %i:%i, sar %i:%i", + p_vout->fmt_render.i_width, p_vout->fmt_render.i_height, + p_vout->fmt_render.i_x_offset, p_vout->fmt_render.i_y_offset, + p_vout->fmt_render.i_visible_width, + p_vout->fmt_render.i_visible_height, + (char*)&p_vout->fmt_render.i_chroma, + i_aspect_x, i_aspect_y, + p_vout->fmt_render.i_sar_num, p_vout->fmt_render.i_sar_den ); + + AspectRatio( p_vout->fmt_in.i_aspect, &i_aspect_x, &i_aspect_y ); + + msg_Dbg( p_vout, "picture user %ix%i (%i,%i,%ix%i), " + "chroma %4.4s, ar %i:%i, sar %i:%i", + p_vout->fmt_in.i_width, p_vout->fmt_in.i_height, + p_vout->fmt_in.i_x_offset, p_vout->fmt_in.i_y_offset, + p_vout->fmt_in.i_visible_width, + p_vout->fmt_in.i_visible_height, + (char*)&p_vout->fmt_in.i_chroma, + i_aspect_x, i_aspect_y, + p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den ); + + if( !p_vout->fmt_out.i_width || !p_vout->fmt_out.i_height ) + { + p_vout->fmt_out.i_width = p_vout->fmt_out.i_visible_width = + p_vout->output.i_width; + p_vout->fmt_out.i_height = p_vout->fmt_out.i_visible_height = + p_vout->output.i_height; + p_vout->fmt_out.i_x_offset = p_vout->fmt_out.i_y_offset = 0; + + p_vout->fmt_out.i_aspect = p_vout->output.i_aspect; + p_vout->fmt_out.i_chroma = p_vout->output.i_chroma; + } + if( !p_vout->fmt_out.i_sar_num || !p_vout->fmt_out.i_sar_num ) + { + p_vout->fmt_out.i_sar_num = p_vout->fmt_out.i_aspect * + p_vout->fmt_out.i_height; + p_vout->fmt_out.i_sar_den = VOUT_ASPECT_FACTOR * + p_vout->fmt_out.i_width; + } + + 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->output.i_aspect, &i_aspect_x, &i_aspect_y ); - msg_Dbg( p_vout, - "picture out %ix%i, chroma 0x%.8x (%4.4s), aspect ratio %i:%i", - p_vout->output.i_width, p_vout->output.i_height, - p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma, - i_aspect_x, i_aspect_y ); + AspectRatio( p_vout->fmt_out.i_aspect, &i_aspect_x, &i_aspect_y ); + + 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 ); /* Calculate shifts from system-updated masks */ MaskToShift( &p_vout->output.i_lrshift, &p_vout->output.i_rrshift, @@ -677,13 +716,24 @@ static void RunThread( vout_thread_t *p_vout) 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 ); @@ -705,6 +755,32 @@ static void RunThread( vout_thread_t *p_vout) 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->counters.counters_lock ); + stats_UpdateInteger( p_vout, p_input->counters.p_lost_pictures, + i_lost , NULL); + stats_UpdateInteger( p_vout, + p_input->counters.p_displayed_pictures, + i_displayed , NULL); + i_displayed = i_lost = 0; + vlc_mutex_unlock( &p_input->counters.counters_lock ); + } + } #if 0 p_vout->c_loops++; if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) ) @@ -771,7 +847,8 @@ static void RunThread( vout_thread_t *p_vout) 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 */ @@ -790,6 +867,7 @@ static void RunThread( vout_thread_t *p_vout) } msg_Warn( p_vout, "late picture skipped ("I64Fd")", current_date - display_date ); + i_lost++; vlc_mutex_unlock( &p_vout->picture_lock ); continue; @@ -812,6 +890,7 @@ static void RunThread( vout_thread_t *p_vout) 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 ); @@ -852,14 +931,114 @@ static void RunThread( vout_thread_t *p_vout) i_idle_loops++; } + /* Video Filter2 stuff */ + if( p_vout->b_vfilter_change == VLC_TRUE ) + { + int i; + 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], 0 ); + + 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; + } + + 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; + vout_Snapshot( p_vout, p_picture ); + } + /* * 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 ); /* @@ -1002,6 +1181,11 @@ static void RunThread( vout_thread_t *p_vout) } } + if( p_input ) + { + vlc_object_release( p_input ); + } + /* * Error loop - wait until the thread destruction is requested */ @@ -1072,6 +1256,9 @@ static void EndThread( vout_thread_t *p_vout ) 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 ); @@ -1179,81 +1366,21 @@ static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask ) } /* 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 *****************************************************************************/ @@ -1283,6 +1410,8 @@ 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 ) @@ -1316,7 +1445,7 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd, char *psz_mode = newval.psz_string; char *psz_filter, *psz_deinterlace = NULL; - 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" ); @@ -1325,15 +1454,15 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd, 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" ); } @@ -1354,7 +1483,7 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd, 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; @@ -1380,17 +1509,18 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, /* 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 ); if( val.i_int >= 0 ) { - p_vout->b_filter_change = VLC_TRUE; 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 = VLC_TRUE; vlc_object_yield( p_input ); vlc_thread_create( p_suxor, "suxor", SuxorRestartVideoES, VLC_THREAD_PRIORITY_LOW, VLC_FALSE ); @@ -1400,3 +1530,74 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, 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 ); + free( p_vout->psz_vfilters[p_vout->i_vfilters_cfg] ); + } + 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; + + ParseVideoFilter2Chain( p_vout, newval.psz_string ); + p_vout->b_vfilter_change = VLC_TRUE; + + 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; +}