* Copyright (C) 2007 the VideoLAN team
* $Id$
*
- * Author: SÃ\83¸ren BÃ\83¸g <avacore@videolan.org>
+ * Author: Søren Bøg <avacore@videolan.org>
*
* 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
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
-#include <vlc_vout.h>
+#include <vlc_modules.h>
-#include "vlc_filter.h"
-#include "vlc_image.h"
+#include <vlc_filter.h>
+#include <vlc_image.h>
/*****************************************************************************
* Local prototypes
#define BASE_CHROMA_TEXT N_("Chroma for the base image")
#define BASE_CHROMA_LONGTEXT N_("Chroma which the base image will be loaded in")
-#define BLEND_IMAGE_TEXT N_("Image which will be blended.")
+#define BLEND_IMAGE_TEXT N_("Image which will be blended")
#define BLEND_IMAGE_LONGTEXT N_("The image blended onto the base image")
#define BLEND_CHROMA_TEXT N_("Chroma for the blend image")
vlc_module_begin ()
set_description( N_("Blending benchmark filter") )
- set_shortname( N_("blendbench" ))
+ set_shortname( N_("Blendbench" ))
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VFILTER )
set_capability( "video filter2", 0 )
set_section( N_("Benchmarking"), NULL )
add_integer( CFG_PREFIX "loops", 1000, NULL, LOOPS_TEXT,
- LOOPS_LONGTEXT, false );
+ LOOPS_LONGTEXT, false )
add_integer_with_range( CFG_PREFIX "alpha", 128, 0, 255, NULL, ALPHA_TEXT,
- ALPHA_LONGTEXT, false );
+ ALPHA_LONGTEXT, false )
set_section( N_("Base image"), NULL )
add_file( CFG_PREFIX "base-image", NULL, NULL, BASE_IMAGE_TEXT,
- BASE_IMAGE_LONGTEXT, false );
+ BASE_IMAGE_LONGTEXT, false )
add_string( CFG_PREFIX "base-chroma", "I420", NULL, BASE_CHROMA_TEXT,
- BASE_CHROMA_LONGTEXT, false );
+ BASE_CHROMA_LONGTEXT, false )
set_section( N_("Blend image"), NULL )
add_file( CFG_PREFIX "blend-image", NULL, NULL, BLEND_IMAGE_TEXT,
- BLEND_IMAGE_LONGTEXT, false );
+ BLEND_IMAGE_LONGTEXT, false )
add_string( CFG_PREFIX "blend-chroma", "YUVA", NULL, BLEND_CHROMA_TEXT,
- BLEND_CHROMA_LONGTEXT, false );
+ BLEND_CHROMA_LONGTEXT, false )
set_callbacks( Create, Destroy )
vlc_module_end ()
if( !p_blend->p_module )
{
picture_Release( p_pic );
- vlc_object_detach( p_blend );
vlc_object_release( p_blend );
return NULL;
}
}
time = mdate() - time;
- msg_Info( p_filter, "Blended %d images in %f sec.", p_sys->i_loops,
+ msg_Info( p_filter, "Blended %d images in %f sec", p_sys->i_loops,
time / 1000000.0f );
msg_Info( p_filter, "Speed is: %f images/second, %f pixels/second",
(float) p_sys->i_loops / time * 1000000,
module_unneed( p_blend, p_blend->p_module );
- vlc_object_detach( p_blend );
vlc_object_release( p_blend );
p_sys->b_done = true;