X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_output.c;h=e0837c6bb4d8bc8da3a2e5aeafb37d3035b80ffc;hb=d926bc98dd544cbd5d20b4cf3b6c3250baa51eb6;hp=95332b5d452e1d888bc17bdb4d01bbc1f43ca522;hpb=1aa4230a8154b65139570ee8a953e9cc0b0b2bfd;p=vlc diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 95332b5d45..e0837c6bb4 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -5,7 +5,7 @@ * 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 the VideoLAN team + * Copyright (C) 2000-2007 the VideoLAN team * $Id$ * * Authors: Vincent Seguin @@ -29,40 +29,51 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#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 "vlc_filter.h" -#include /* sout_CfgParse */ +#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" + +#include "modules/modules.h" +#include + /***************************************************************************** * Local prototypes *****************************************************************************/ static int InitThread ( vout_thread_t * ); static void RunThread ( vout_thread_t * ); static void ErrorThread ( vout_thread_t * ); +static void CleanThread ( vout_thread_t * ); static void EndThread ( vout_thread_t * ); -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 vout_Destructor ( vlc_object_t * p_this ); + /* Object variables callbacks */ static int DeinterlaceCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); @@ -74,22 +85,16 @@ static int VideoFilter2Callback( vlc_object_t *, char const *, /* 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 ); @@ -98,7 +103,15 @@ static picture_t *video_new_buffer_filter( filter_t *p_filter ) 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; } /***************************************************************************** @@ -112,29 +125,11 @@ 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 */ + /* Video output is no longer used. + * TODO: support for reusing video outputs with proper _thread-safe_ + * reference handling. */ 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 ); - } - } + vout_CloseAndRelease( p_vout ); return NULL; } @@ -143,32 +138,8 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, { vlc_object_yield( p_vout ); } - else - { - p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_CHILD ); - - if( !p_vout ) - { - playlist_t *p_playlist; - p_playlist = vlc_object_find( p_this, - VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); - if( 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 ); - } - } - } + /* TODO: find a suitable unused video output */ /* If we now have a video output, check it has the right properties */ if( p_vout ) @@ -196,30 +167,29 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout, if( !psz_filter_chain && !p_vout->psz_filter_chain ) { - p_vout->b_filter_change = VLC_FALSE; + p_vout->b_filter_change = false; } - if( psz_filter_chain ) free( psz_filter_chain ); + free( 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_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 ); + vlc_object_release( 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 ); + spu_Attach( p_vout->p_spu, p_this, true ); vlc_object_attach( p_vout, p_this ); + if( p_vout->b_title_show ) + DisplayTitleOnOSD( p_vout ); vlc_object_release( p_vout ); } } @@ -245,7 +215,6 @@ 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; int i_index; /* loop variable */ - char * psz_plugin; vlc_value_t val, text; unsigned int i_width = p_fmt->i_width; @@ -253,13 +222,16 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) 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 ); + static const char typename[] = "video output"; + p_vout = vlc_custom_create( p_parent, sizeof( *p_vout ), VLC_OBJECT_VOUT, + typename ); 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 */ @@ -288,9 +260,9 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) p_vout->render.i_chroma = i_chroma; p_vout->render.i_aspect = i_aspect; - p_vout->render.i_rmask = 0; - p_vout->render.i_gmask = 0; - p_vout->render.i_bmask = 0; + p_vout->render.i_rmask = p_fmt->i_rmask; + p_vout->render.i_gmask = p_fmt->i_gmask; + p_vout->render.i_bmask = p_fmt->i_bmask; p_vout->render.i_last_used_pic = -1; p_vout->render.b_allow_modify_pics = 1; @@ -318,13 +290,14 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) p_vout->render_time = 10; p_vout->c_fps_samples = 0; p_vout->b_filter_change = 0; - p_vout->pf_control = 0; - p_vout->p_parent_intf = 0; + p_vout->pf_control = NULL; + p_vout->p_window = NULL; 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->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 ); @@ -335,7 +308,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) /* Initialize subpicture unit */ p_vout->p_spu = spu_Create( p_vout ); - spu_Attach( p_vout->p_spu, p_parent, VLC_TRUE ); + spu_Attach( p_vout->p_spu, p_parent, true ); /* Attach the new object now so we can use var inheritance below */ vlc_object_attach( p_vout, p_parent ); @@ -350,67 +323,64 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) 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 { /* continue the parent's filter chain */ - char *psz_end; + char *psz_tmp; - 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; + /* 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_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 = VLC_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 ) { 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 ); } /* 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, p_vout->psz_filter_chain && *p_vout->psz_filter_chain ); + free( psz_name ); - if( psz_plugin ) free( psz_plugin ); if( p_vout->p_module == NULL ) { msg_Err( p_vout, "no suitable vout module" ); + // FIXME it's ugly but that's exactly the function that need to be called. + EndThread( p_vout ); vlc_object_detach( p_vout ); - vlc_object_destroy( p_vout ); + vlc_object_release( p_vout ); return NULL; } @@ -418,29 +388,28 @@ 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 ) { var_Set( p_vout, "deinterlace", val ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); } var_AddCallback( p_vout, "deinterlace", DeinterlaceCallback, NULL ); - var_Create( p_vout, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); text.psz_string = _("Filters"); var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL ); @@ -460,26 +429,19 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) } if( vlc_thread_create( p_vout, "video output", RunThread, - VLC_THREAD_PRIORITY_OUTPUT, VLC_TRUE ) ) + VLC_THREAD_PRIORITY_OUTPUT, true ) ) { - msg_Err( p_vout, "out of memory" ); module_Unneed( p_vout, p_vout->p_module ); - vlc_object_detach( p_vout ); - vlc_object_destroy( p_vout ); + vlc_object_release( p_vout ); return NULL; } + vlc_object_set_destructor( p_vout, vout_Destructor ); + if( p_vout->b_error ) { msg_Err( p_vout, "video output creation failed" ); - - /* Make sure the thread is destroyed */ - p_vout->b_die = VLC_TRUE; - - vlc_thread_join( p_vout ); - - vlc_object_detach( p_vout ); - vlc_object_destroy( p_vout ); + vout_CloseAndRelease( p_vout ); return NULL; } @@ -487,48 +449,51 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt ) } /***************************************************************************** - * vout_Destroy: destroys a previously created video output + * vout_Close: Close a vout created by vout_Create. ***************************************************************************** - * 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. + * You HAVE to call it on vout created by vout_Create before vlc_object_release. + * You should NEVER call it on vout not obtained though vout_Create + * (like with vout_Request or vlc_object_find.) + * You can use vout_CloseAndRelease() as a convenient method. *****************************************************************************/ -void vout_Destroy( vout_thread_t *p_vout ) +void vout_Close( vout_thread_t *p_vout ) { - vlc_object_t *p_playlist; + assert( p_vout ); - /* Request thread destruction */ - p_vout->b_die = VLC_TRUE; + vlc_object_kill( p_vout ); vlc_thread_join( p_vout ); + module_Unneed( p_vout, p_vout->p_module ); +} - var_Destroy( p_vout, "intf-change" ); +/* */ +static void vout_Destructor( vlc_object_t * p_this ) +{ + vout_thread_t *p_vout = (vout_thread_t *)p_this; - p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + /* Destroy the locks */ + vlc_mutex_destroy( &p_vout->picture_lock ); + vlc_mutex_destroy( &p_vout->change_lock ); + vlc_mutex_destroy( &p_vout->vfilter_lock ); - if( p_vout->psz_filter_chain ) free( p_vout->psz_filter_chain ); + free( p_vout->psz_filter_chain ); - /* Free structure */ - vlc_object_destroy( p_vout ); + config_ChainDestroy( p_vout->p_cfg ); - /* If it was the last vout, tell the interface to show up */ - if( p_playlist != 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 ); - } +#ifndef __APPLE__ + vout_thread_t *p_another_vout; + + /* 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 ); +#endif } /***************************************************************************** @@ -537,30 +502,28 @@ void vout_Destroy( vout_thread_t *p_vout ) * This function is called from RunThread and performs the second step of the * initialization. It returns 0 on success. Note that the thread's flag are not * modified inside this function. + * XXX You have to enter it with change_lock taken. *****************************************************************************/ +static int ChromaCreate( vout_thread_t *p_vout ); +static void ChromaDestroy( vout_thread_t *p_vout ); + static int InitThread( vout_thread_t *p_vout ) { int i, i_aspect_x, i_aspect_y; - vlc_mutex_lock( &p_vout->change_lock ); - #ifdef STATS p_vout->c_loops = 0; #endif /* Initialize output method, it allocates direct buffers for us */ if( p_vout->pf_init( p_vout ) ) - { - vlc_mutex_unlock( &p_vout->change_lock ); return VLC_EGENERIC; - } if( !I_OUTPUTPICTURES ) { msg_Err( p_vout, "plugin was unable to allocate at least " "one direct buffer" ); p_vout->pf_end( p_vout ); - vlc_mutex_unlock( &p_vout->change_lock ); return VLC_EGENERIC; } @@ -569,7 +532,6 @@ static int InitThread( vout_thread_t *p_vout ) msg_Err( p_vout, "plugin allocated too many direct buffers, " "our internal buffers must have overflown." ); p_vout->pf_end( p_vout ); - vlc_mutex_unlock( &p_vout->change_lock ); return VLC_EGENERIC; } @@ -634,6 +596,13 @@ static int InitThread( vout_thread_t *p_vout ) p_vout->fmt_out.i_sar_num, p_vout->fmt_out.i_sar_den ); /* Calculate shifts from system-updated masks */ + MaskToShift( &p_vout->render.i_lrshift, &p_vout->output.i_rrshift, + p_vout->render.i_rmask ); + MaskToShift( &p_vout->render.i_lgshift, &p_vout->output.i_rgshift, + p_vout->render.i_gmask ); + MaskToShift( &p_vout->render.i_lbshift, &p_vout->output.i_rbshift, + p_vout->render.i_bmask ); + MaskToShift( &p_vout->output.i_lrshift, &p_vout->output.i_rrshift, p_vout->output.i_rmask ); MaskToShift( &p_vout->output.i_lgshift, &p_vout->output.i_rgshift, @@ -678,16 +647,9 @@ static int InitThread( vout_thread_t *p_vout ) * find a chroma plugin to do the conversion */ 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 ) + if( ChromaCreate( p_vout ) ) { - 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 ); p_vout->pf_end( p_vout ); - vlc_mutex_unlock( &p_vout->change_lock ); return VLC_EGENERIC; } @@ -719,7 +681,6 @@ static int InitThread( vout_thread_t *p_vout ) PP_OUTPUTPICTURE[ i ]->p_heap = &p_vout->output; } -/* XXX XXX mark thread ready */ return VLC_SUCCESS; } @@ -746,13 +707,14 @@ static void RunThread( vout_thread_t *p_vout) input_thread_t *p_input = NULL ; /* Parent input, if it exists */ vlc_value_t val; - vlc_bool_t b_drop_late; + bool b_drop_late; int i_displayed = 0, i_lost = 0, i_loops = 0; /* * Initialize thread */ + vlc_mutex_lock( &p_vout->change_lock ); p_vout->b_error = InitThread( p_vout ); var_Create( p_vout, "drop-late-frames", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); @@ -764,31 +726,28 @@ static void RunThread( vout_thread_t *p_vout) if( p_vout->b_error ) { - /* Destroy thread structures allocated by Create and InitThread */ - DestroyThread( p_vout ); + EndThread( p_vout ); + vlc_mutex_unlock( &p_vout->change_lock ); 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; 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, @@ -796,16 +755,17 @@ static void RunThread( vout_thread_t *p_vout) } if( p_input ) { - vlc_mutex_lock( &p_input->counters.counters_lock ); - stats_UpdateInteger( p_vout, p_input->counters.p_lost_pictures, + 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->counters.p_displayed_pictures, + p_input->p->counters.p_displayed_pictures, i_displayed , NULL); i_displayed = i_lost = 0; - vlc_mutex_unlock( &p_input->counters.counters_lock ); + vlc_mutex_unlock( &p_input->p->counters.counters_lock ); + vlc_object_release( p_input ); + p_input = NULL; } - } #if 0 p_vout->c_loops++; if( !(p_vout->c_loops % VOUT_STATS_NB_LOOPS) ) @@ -890,7 +850,7 @@ static void RunThread( vout_thread_t *p_vout) 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 ); @@ -917,7 +877,7 @@ static void RunThread( vout_thread_t *p_vout) } 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 ); @@ -956,93 +916,15 @@ 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; - } + p_picture = filter_chain_VideoFilter( p_vout->p_vf2_chain, + p_picture ); } if( p_picture && p_vout->b_snapshot ) { - p_vout->b_snapshot = VLC_FALSE; + p_vout->b_snapshot = false; vout_Snapshot( p_vout, p_picture ); } @@ -1057,7 +939,10 @@ static void RunThread( vout_thread_t *p_vout) FIND_PARENT ); } p_subpic = spu_SortSubpictures( p_vout->p_spu, display_date, - p_input ? var_GetBool( p_input, "state" ) == PAUSE_S : VLC_FALSE ); + p_input ? var_GetBool( p_input, "state" ) == PAUSE_S : false ); + if( p_input ) + vlc_object_release( p_input ); + p_input = NULL; } /* @@ -1096,6 +981,8 @@ static void RunThread( vout_thread_t *p_vout) /* 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 ) { @@ -1113,6 +1000,9 @@ static void RunThread( vout_thread_t *p_vout) /* 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 ); /* @@ -1146,7 +1036,9 @@ static void RunThread( vout_thread_t *p_vout) /* A fatal error occurred, and the thread must terminate * immediately, without displaying anything - setting b_error to 1 * causes the immediate end of the main while() loop. */ + // FIXME pf_end p_vout->b_error = 1; + break; } if( p_vout->i_changes & VOUT_SIZE_CHANGE ) @@ -1159,11 +1051,19 @@ static void RunThread( vout_thread_t *p_vout) p_vout->i_changes &= ~VOUT_SIZE_CHANGE; + assert( !p_vout->b_direct ); + + ChromaDestroy( p_vout ); + + vlc_mutex_lock( &p_vout->picture_lock ); + p_vout->pf_end( p_vout ); + for( i = 0; i < I_OUTPUTPICTURES; i++ ) p_vout->p_picture[ i ].i_status = FREE_PICTURE; I_OUTPUTPICTURES = 0; + if( p_vout->pf_init( p_vout ) ) { msg_Err( p_vout, "cannot resize display" ); @@ -1171,13 +1071,19 @@ static void RunThread( vout_thread_t *p_vout) p_vout->b_error = 1; } - /* Need to reinitialise the chroma plugin */ - if( p_vout->chroma.p_module ) + vlc_mutex_unlock( &p_vout->picture_lock ); + + /* 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( ChromaCreate( p_vout ) ) { - 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) ); + msg_Err( p_vout, "WOW THIS SUCKS BIG TIME!!!!!" ); + p_vout->b_error = 1; } + if( p_vout->b_error ) + break; } if( p_vout->i_changes & VOUT_PICTURE_BUFFERS_CHANGE ) @@ -1190,9 +1096,7 @@ static void RunThread( vout_thread_t *p_vout) p_vout->i_changes &= ~VOUT_PICTURE_BUFFERS_CHANGE; if( !p_vout->b_direct ) - { - module_Unneed( p_vout, p_vout->chroma.p_module ); - } + ChromaDestroy( p_vout ); vlc_mutex_lock( &p_vout->picture_lock ); @@ -1201,11 +1105,36 @@ static void RunThread( vout_thread_t *p_vout) I_OUTPUTPICTURES = I_RENDERPICTURES = 0; p_vout->b_error = InitThread( p_vout ); + if( p_vout->b_error ) + msg_Err( p_vout, "InitThread after VOUT_PICTURE_BUFFERS_CHANGE failed\n" ); vlc_mutex_unlock( &p_vout->picture_lock ); + + if( p_vout->b_error ) + break; + } + + /* Check for "video filter2" changes */ + vlc_mutex_lock( &p_vout->vfilter_lock ); + if( p_vout->psz_vf2 ) + { + es_format_t fmt; + + 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 ); + + if( filter_chain_AppendFromString( p_vout->p_vf2_chain, + p_vout->psz_vf2 ) < 0 ) + msg_Err( p_vout, "Video filter chain creation failed" ); + + free( p_vout->psz_vf2 ); + p_vout->psz_vf2 = NULL; } + vlc_mutex_unlock( &p_vout->vfilter_lock ); } + if( p_input ) { vlc_object_release( p_input ); @@ -1215,15 +1144,14 @@ static void RunThread( vout_thread_t *p_vout) * Error loop - wait until the thread destruction is requested */ if( p_vout->b_error ) - { ErrorThread( p_vout ); - } /* End of thread */ + CleanThread( p_vout ); EndThread( p_vout ); + vlc_mutex_unlock( &p_vout->change_lock ); - /* Destroy thread structures allocated by CreateThread */ - DestroyThread( p_vout ); + vlc_object_unlock( p_vout ); } /***************************************************************************** @@ -1236,23 +1164,47 @@ static void RunThread( vout_thread_t *p_vout) static void ErrorThread( vout_thread_t *p_vout ) { /* Wait until a `die' order */ - while( !p_vout->b_die ) + while( vlc_object_alive( p_vout ) ) + vlc_object_wait( p_vout ); +} + +/***************************************************************************** + * CleanThread: clean up after InitThread + ***************************************************************************** + * This function is called after a sucessful + * initialization. It frees all resources allocated by InitThread. + * XXX You have to enter it with change_lock taken. + *****************************************************************************/ +static void CleanThread( vout_thread_t *p_vout ) +{ + int i_index; /* index in heap */ + + if( !p_vout->b_direct ) + ChromaDestroy( p_vout ); + + /* Destroy all remaining pictures */ + for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++ ) { - /* Sleep a while */ - msleep( VOUT_IDLE_SLEEP ); + if ( p_vout->p_picture[i_index].i_type == MEMORY_PICTURE ) + { + free( p_vout->p_picture[i_index].p_data_orig ); + } } + + /* Destroy translation tables */ + if( !p_vout->b_error ) + p_vout->pf_end( p_vout ); } /***************************************************************************** * EndThread: thread destruction ***************************************************************************** - * This function is called when the thread ends after a sucessful - * initialization. It frees all resources allocated by InitThread. + * This function is called when the thread ends. + * It frees all resources not allocated by InitThread. + * XXX You have to enter it with change_lock taken. *****************************************************************************/ static void EndThread( vout_thread_t *p_vout ) { - int i_index; /* index in heap */ - #ifdef STATS { struct tms cpu_usage; @@ -1263,53 +1215,88 @@ static void EndThread( vout_thread_t *p_vout ) } #endif - if( !p_vout->b_direct ) - { - module_Unneed( p_vout, p_vout->chroma.p_module ); - } - - /* Destroy all remaining pictures */ - for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES + 1; i_index++ ) - { - if ( p_vout->p_picture[i_index].i_type == MEMORY_PICTURE ) - { - free( p_vout->p_picture[i_index].p_data_orig ); - } - } + /* FIXME does that function *really* need to be called inside the thread ? */ /* Destroy subpicture unit */ - spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), VLC_FALSE ); + spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false ); 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 ); +/* Thread helpers */ +static picture_t *ChromaGetPicture( filter_t *p_filter ) +{ + picture_t *p_pic = (picture_t *)p_filter->p_owner; + p_filter->p_owner = NULL; + return p_pic; +} - /* Release the change lock */ - vlc_mutex_unlock( &p_vout->change_lock ); +static void ChromaCopyRgbInfo( es_format_t *p_fmt, picture_heap_t *p_heap ) +{ + p_fmt->video.i_rmask = p_heap->i_rmask; + p_fmt->video.i_gmask = p_heap->i_gmask; + p_fmt->video.i_bmask = p_heap->i_bmask; + p_fmt->video.i_rrshift = p_heap->i_rrshift; + p_fmt->video.i_lrshift = p_heap->i_lrshift; + p_fmt->video.i_rgshift = p_heap->i_rgshift; + p_fmt->video.i_lgshift = p_heap->i_lgshift; + p_fmt->video.i_rbshift = p_heap->i_rbshift; + p_fmt->video.i_lbshift = p_heap->i_lbshift; } -/***************************************************************************** - * DestroyThread: thread destruction - ***************************************************************************** - * This function is called when the thread ends. It frees all ressources - * allocated by CreateThread. Status is available at this stage. - *****************************************************************************/ -static void DestroyThread( vout_thread_t *p_vout ) +static int ChromaCreate( vout_thread_t *p_vout ) { - /* Destroy the locks */ - vlc_mutex_destroy( &p_vout->picture_lock ); - vlc_mutex_destroy( &p_vout->change_lock ); + static const char typename[] = "chroma"; + filter_t *p_chroma; - /* Release the module */ - if( p_vout && p_vout->p_module ) + /* Choose the best module */ + p_chroma = p_vout->p_chroma = + vlc_custom_create( p_vout, sizeof(filter_t), VLC_OBJECT_GENERIC, + typename ); + + vlc_object_attach( p_chroma, p_vout ); + + /* TODO: Set the fmt_in and fmt_out stuff here */ + p_chroma->fmt_in.video = p_vout->fmt_render; + p_chroma->fmt_out.video = p_vout->fmt_out; + ChromaCopyRgbInfo( &p_chroma->fmt_in, &p_vout->render ); + ChromaCopyRgbInfo( &p_chroma->fmt_out, &p_vout->output ); + + p_chroma->p_module = module_Need( p_chroma, "video filter2", NULL, 0 ); + + if( p_chroma->p_module == NULL ) { - module_Unneed( p_vout, p_vout->p_module ); + msg_Err( p_vout, "no chroma module for %4.4s to %4.4s i=%dx%d o=%dx%d", + (char*)&p_vout->render.i_chroma, + (char*)&p_vout->output.i_chroma, + p_chroma->fmt_in.video.i_width, p_chroma->fmt_in.video.i_height, + p_chroma->fmt_out.video.i_width, p_chroma->fmt_out.video.i_height + ); + + vlc_object_release( p_vout->p_chroma ); + p_vout->p_chroma = NULL; + return VLC_EGENERIC; } + p_chroma->pf_vout_buffer_new = ChromaGetPicture; + return VLC_SUCCESS; +} + +static void ChromaDestroy( vout_thread_t *p_vout ) +{ + assert( !p_vout->b_direct ); + + if( !p_vout->p_chroma ) + return; + + module_Unneed( p_vout->p_chroma, p_vout->p_chroma->p_module ); + vlc_object_release( p_vout->p_chroma ); + p_vout->p_chroma = NULL; } + + /* following functions are local */ static int ReduceHeight( int i_ratio ) @@ -1406,20 +1393,6 @@ static void MaskToShift( int *pi_left, int *pi_right, uint32_t i_mask ) *pi_right = (8 - i_high + i_low); } -/***************************************************************************** - * vout_VarCallback: generic callback for intf variables - *****************************************************************************/ -int vout_VarCallback( vlc_object_t * p_this, const char * psz_variable, - vlc_value_t old_value, vlc_value_t new_value, - void * unused ) -{ - vout_thread_t * p_vout = (vout_thread_t *)p_this; - vlc_value_t val; - val.b_bool = VLC_TRUE; - var_Set( p_vout, "intf-change", val ); - return VLC_SUCCESS; -} - /***************************************************************************** * Helper thread for object variables callbacks. * Only used to avoid deadlocks when using the video embedded mode. @@ -1433,27 +1406,17 @@ typedef struct suxor_thread_t 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 ) + int val = var_GetInteger( p_this->p_input, "video-es" ); + if( val >= 0 ) { - vlc_value_t val_es; - val_es.i_int = -VIDEO_ES; - var_Set( p_this->p_input, "video-es", val_es ); - var_Set( p_this->p_input, "video-es", val ); + var_SetInteger( p_this->p_input, "video-es", -VIDEO_ES ); + var_SetInteger( p_this->p_input, "video-es", val ); } vlc_object_release( p_this->p_input ); -#ifdef WIN32 - CloseHandle( p_this->thread_id ); -#endif - - vlc_object_destroy( p_this ); + vlc_object_release( p_this ); } /***************************************************************************** @@ -1469,6 +1432,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; + (void)psz_cmd; (void)oldval; (void)p_data; var_Get( p_vout, "vout-filter", &val ); psz_filter = val.psz_string; @@ -1504,12 +1468,12 @@ static int DeinterlaceCallback( vlc_object_t *p_this, char const *psz_cmd, } vlc_object_release( p_input ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_vout, "intf-change", val ); val.psz_string = psz_filter; var_Set( p_vout, "vout-filter", val ); - if( psz_filter ) free( psz_filter ); + free( psz_filter ); return VLC_SUCCESS; } @@ -1520,6 +1484,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, 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 ); @@ -1529,7 +1494,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, return( VLC_EGENERIC ); } - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_vout, "intf-change", val ); /* Modify input as well because the vout might have to be restarted */ @@ -1542,13 +1507,15 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, var_Get( p_input, "video-es", &val ); if( val.i_int >= 0 ) { + static const char typename[] = "kludge"; suxor_thread_t *p_suxor = - vlc_object_create( p_vout, sizeof(suxor_thread_t) ); + vlc_custom_create( p_vout, sizeof(suxor_thread_t), + VLC_OBJECT_GENERIC, typename ); p_suxor->p_input = p_input; - p_vout->b_filter_change = VLC_TRUE; + p_vout->b_filter_change = true; vlc_object_yield( p_input ); vlc_thread_create( p_suxor, "suxor", SuxorRestartVideoES, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ); + VLC_THREAD_PRIORITY_LOW, false ); } vlc_object_release( p_input ); @@ -1559,80 +1526,81 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_cmd, /***************************************************************************** * 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++ ) - { - /* FIXME: this should be moved in a separate function */ - struct sout_cfg_t *p_cfg = - p_vout->p_vfilters_cfg[p_vout->i_vfilters_cfg]; - while( p_cfg ) - { - struct sout_cfg_t *p_next = p_cfg->p_next; - free( p_cfg->psz_name ); - free( p_cfg->psz_value ); - free( p_cfg ); - p_cfg = p_next; - } - /* */ - - 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 = sout_CfgCreate( - &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\n", - 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; - ParseVideoFilter2Chain( p_vout, newval.psz_string ); - p_vout->b_vfilter_change = VLC_TRUE; + vlc_mutex_lock( &p_vout->vfilter_lock ); + 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 ) +static void DisplayTitleOnOSD( vout_thread_t *p_vout ) { - int i; - for( i = 0; i < p_vout->i_vfilters; i++ ) + 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 ) { - vlc_object_detach( p_vout->pp_vfilters[i] ); - if( p_vout->pp_vfilters[i]->p_module ) + 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 ) ) { - module_Unneed( p_vout->pp_vfilters[i], - p_vout->pp_vfilters[i]->p_module ); + free( psz_name ); + psz_name = input_item_GetName( input_GetItem( p_input ) ); } - - free( p_vout->pp_vfilters[i]->p_owner ); - vlc_object_destroy( p_vout->pp_vfilters[i] ); + 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; + if( asprintf( &psz_string, "%s - %s", psz_name, psz_artist ) != -1 ) + { + 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 ); } - p_vout->i_vfilters = 0; } +