X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=38ab8214d00d3ba1352f8c2039bb7be05e92db2c;hb=b160af605b251682ad86348cc4e07287084e891c;hp=7e77af015a728f6d9b181509108b013ef56d5813;hpb=c4fef7e0c05f6e406186630b1b3566e951b805ce;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 7e77af015a..38ab8214d0 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -29,24 +29,30 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#include + #include /* free() */ +#include -#include #ifdef HAVE_SYS_TIMES_H # include #endif -#include "vlc_video.h" -#include "video_output.h" -#include "vlc_spu.h" -#include /* for input_thread_t and i_pts_delay */ -#include "vlc_playlist.h" +#include +#include + +#include +#include #if defined( __APPLE__ ) -#include "darwin_specific.h" +/* 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" + /***************************************************************************** * Local prototypes *****************************************************************************/ @@ -65,10 +71,39 @@ 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. ***************************************************************************** @@ -80,28 +115,14 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, { 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; } @@ -117,24 +138,20 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, if( !p_vout ) { - playlist_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 ) { - 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 ) - { - vlc_object_release( p_vout ); - p_vout = NULL; - } - vlc_mutex_unlock( &p_playlist->gc_lock ); - 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 ); } } @@ -177,7 +194,6 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, 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; @@ -185,7 +201,6 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, 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 ); vlc_object_release( p_vout ); @@ -229,10 +244,6 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) return NULL; } - stats_Create( p_vout, "displayed_pictures", VLC_VAR_INTEGER, - STATS_COUNTER ); - stats_Create( p_vout, "lost_pictures", VLC_VAR_INTEGER, STATS_COUNTER ); - /* Initialize pictures - translation tables and functions * will be initialized later in InitThread */ for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++) @@ -297,6 +308,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) /* 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 ); @@ -325,6 +337,13 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) 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 { @@ -335,8 +354,16 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) 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 ) { @@ -375,19 +402,19 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) 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 = "discard"; text.psz_string = _("Discard"); + val.psz_string = (char *)"discard"; text.psz_string = _("Discard"); var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "blend"; text.psz_string = _("Blend"); + val.psz_string = (char *)"blend"; text.psz_string = _("Blend"); var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "mean"; text.psz_string = _("Mean"); + val.psz_string = (char *)"mean"; text.psz_string = _("Mean"); var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "bob"; text.psz_string = _("Bob"); + val.psz_string = (char *)"bob"; text.psz_string = _("Bob"); var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "linear"; text.psz_string = _("Linear"); + val.psz_string = (char *)"linear"; text.psz_string = _("Linear"); var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text ); - val.psz_string = "x"; text.psz_string = "X"; + 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 ) @@ -453,7 +480,8 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) *****************************************************************************/ 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; @@ -461,31 +489,29 @@ 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 ) +#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 ); } /***************************************************************************** @@ -700,11 +726,22 @@ static void RunThread( vout_thread_t *p_vout) 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 ); @@ -726,6 +763,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->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) ) @@ -790,12 +853,10 @@ static void RunThread( vout_thread_t *p_vout) p_vout->p_fps_sample[ p_vout->c_fps_samples++ % VOUT_FPS_SAMPLES ] = display_date; - /* XXX: config_GetInt is slow, but this kind of frame dropping - * should not happen that often. */ if( !p_picture->b_force && p_picture != p_last_picture && display_date < current_date + p_vout->render_time && - config_GetInt( p_vout, "skip-frames" ) ) + b_drop_late ) { /* Picture is late: it will be destroyed and the thread * will directly choose the next picture */ @@ -814,7 +875,7 @@ static void RunThread( vout_thread_t *p_vout) } msg_Warn( p_vout, "late picture skipped ("I64Fd")", current_date - display_date ); - stats_UpdateInteger( p_vout, "lost_pictures", 1 ); + i_lost++; vlc_mutex_unlock( &p_vout->picture_lock ); continue; @@ -837,7 +898,7 @@ static void RunThread( vout_thread_t *p_vout) p_picture->i_status = DESTROYED_PICTURE; p_vout->i_heap_size--; } - stats_UpdateInteger( p_vout, "lost_pictures", 1 ); + i_lost++; msg_Warn( p_vout, "vout warning: early picture skipped " "("I64Fd")", display_date - current_date - p_vout->i_pts_delay ); @@ -878,6 +939,92 @@ static void RunThread( vout_thread_t *p_vout) 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], 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; + 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; @@ -889,13 +1036,19 @@ static void RunThread( vout_thread_t *p_vout) */ if( display_date > 0 ) { - p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date ); + 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 */ - stats_UpdateInteger( p_vout, "displayed_pictures", 1 ); + i_displayed++; p_directbuffer = vout_RenderPicture( p_vout, p_picture, p_subpic ); /* @@ -1038,6 +1191,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 */ @@ -1108,6 +1266,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 ); @@ -1126,6 +1287,7 @@ static void DestroyThread( vout_thread_t *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 ) @@ -1215,12 +1377,15 @@ 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; - /* Transform bits into an index */ + 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. 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; @@ -1376,3 +1541,80 @@ 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 ); + 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; + + 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; +}