Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / modules / video_filter / blendbench.c

diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c
index af19f901fa3f84ae10792ebdfd94aec31b8c0175..4efff565bd6a62eb2fd72b684493df58482445ca 100644 (file)
--- a/modules/video_filter/blendbench.c
+++ b/modules/video_filter/blendbench.c
@@ -4,7 +4,7 @@
  * 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
@@ -32,10 +32,10 @@
 #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
@@ -61,7 +61,7 @@ static picture_t *Filter( filter_t *, picture_t * );
 #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")
@@ -70,33 +70,33 @@ static picture_t *Filter( filter_t *, picture_t * );
 
 #define CFG_PREFIX "blendbench-"
 
-vlc_module_begin();
-    set_description( N_("Blending benchmark filter") );
-    set_shortname( N_("blendbench" ));
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
+vlc_module_begin ()
+    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_section( N_("Benchmarking"), NULL );
+    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 );
+    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 );
+    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();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()
 
 static const char *const ppsz_filter_options[] = {
     "loops", "alpha", "base-image", "base-chroma", "blend-image",
@@ -228,11 +228,10 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     vlc_object_attach( p_blend, p_filter );
     p_blend->fmt_out.video = p_sys->p_base_image->format;
     p_blend->fmt_in.video = p_sys->p_blend_image->format;
-    p_blend->p_module = module_need( p_blend, "video blending", 0, 0 );
+    p_blend->p_module = module_need( p_blend, "video blending", NULL, false );
     if( !p_blend->p_module )
     {
         picture_Release( p_pic );
-        vlc_object_detach( p_blend );
         vlc_object_release( p_blend );
         return NULL;
     }
@@ -246,7 +245,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     }
     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,
@@ -256,7 +255,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
     module_unneed( p_blend, p_blend->p_module );
 
-    vlc_object_detach( p_blend );
     vlc_object_release( p_blend );
 
     p_sys->b_done = true;