# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_vout.h>
#define CFG_PREFIX "blendbench-"
vlc_module_begin();
- set_description( _("Blending benchmark filter") );
- set_shortname( _("blendbench" ));
+ set_description( N_("Blending benchmark filter") );
+ set_shortname( N_("blendbench" ));
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
set_capability( "video filter2", 0 );
set_callbacks( Create, Destroy );
vlc_module_end();
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
"loops", "alpha", "base-image", "base-chroma", "blend-image",
"blend-chroma", NULL
};
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys;
- char *psz_temp;
+ char *psz_temp, *psz_cmd;
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
psz_temp = var_CreateGetStringCommand( p_filter, CFG_PREFIX "base-chroma" );
p_sys->i_base_chroma = VLC_FOURCC( psz_temp[0], psz_temp[1],
psz_temp[2], psz_temp[3] );
+ psz_cmd = var_CreateGetStringCommand( p_filter, CFG_PREFIX "base-image" );
blendbench_LoadImage( p_this, &p_sys->p_base_image, p_sys->i_base_chroma,
- var_CreateGetStringCommand( p_filter, CFG_PREFIX "base-image" ),
- "Base" );
+ psz_cmd, "Base" );
+ free( psz_temp );
+ free( psz_cmd );
psz_temp = var_CreateGetStringCommand( p_filter,
CFG_PREFIX "blend-chroma" );
p_sys->i_blend_chroma = VLC_FOURCC( psz_temp[0], psz_temp[1],
psz_temp[2], psz_temp[3] );
+ psz_cmd = var_CreateGetStringCommand( p_filter, CFG_PREFIX "blend-image" );
blendbench_LoadImage( p_this, &p_sys->p_blend_image, p_sys->i_blend_chroma,
- var_CreateGetStringCommand( p_filter, CFG_PREFIX "blend-image" ),
- "Blend" );
+ psz_cmd, "Blend" );
+ free( psz_temp );
+ free( psz_cmd );
return VLC_SUCCESS;
}
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
- p_sys->p_base_image->pf_release( p_sys->p_base_image );
- p_sys->p_blend_image->pf_release( p_sys->p_blend_image );
+ picture_Release( p_sys->p_base_image );
+ picture_Release( p_sys->p_blend_image );
}
/*****************************************************************************
if( p_sys->b_done )
return p_pic;
- p_blend = vlc_object_create( p_filter, VLC_OBJECT_FILTER );
+ p_blend = vlc_object_create( p_filter, sizeof(filter_t) );
if( !p_blend )
{
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
return NULL;
}
vlc_object_attach( p_blend, p_filter );
p_blend->p_module = module_Need( p_blend, "video blending", 0, 0 );
if( !p_blend->p_module )
{
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
vlc_object_detach( p_blend );
vlc_object_release( p_blend );
return NULL;