/*****************************************************************************
* blendbench.c : blending benchmark plugin for vlc
*****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2007 VLC authors and VideoLAN
* $Id$
*
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.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")
#define BLEND_CHROMA_LONGTEXT N_("Chroma which the blend image will be loaded" \
- "in")
+ " in")
#define CFG_PREFIX "blendbench-"
set_capability( "video filter2", 0 )
set_section( N_("Benchmarking"), NULL )
- add_integer( CFG_PREFIX "loops", 1000, NULL, LOOPS_TEXT,
+ add_integer( CFG_PREFIX "loops", 1000, LOOPS_TEXT,
LOOPS_LONGTEXT, false )
- add_integer_with_range( CFG_PREFIX "alpha", 128, 0, 255, NULL, ALPHA_TEXT,
+ add_integer_with_range( CFG_PREFIX "alpha", 128, 0, 255, ALPHA_TEXT,
ALPHA_LONGTEXT, false )
set_section( N_("Base image"), NULL )
- add_file( CFG_PREFIX "base-image", NULL, NULL, BASE_IMAGE_TEXT,
- BASE_IMAGE_LONGTEXT, false )
- add_string( CFG_PREFIX "base-chroma", "I420", NULL, BASE_CHROMA_TEXT,
+ add_loadfile( CFG_PREFIX "base-image", NULL, BASE_IMAGE_TEXT,
+ BASE_IMAGE_LONGTEXT, false )
+ add_string( CFG_PREFIX "base-chroma", "I420", BASE_CHROMA_TEXT,
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 )
- add_string( CFG_PREFIX "blend-chroma", "YUVA", NULL, BLEND_CHROMA_TEXT,
+ add_loadfile( CFG_PREFIX "blend-image", NULL, BLEND_IMAGE_TEXT,
+ BLEND_IMAGE_LONGTEXT, false )
+ add_string( CFG_PREFIX "blend-chroma", "YUVA", BLEND_CHROMA_TEXT,
BLEND_CHROMA_LONGTEXT, false )
set_callbacks( Create, Destroy )
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys;
char *psz_temp, *psz_cmd;
+ int i_ret;
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
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,
- psz_cmd, "Base" );
+ i_ret = blendbench_LoadImage( p_this, &p_sys->p_base_image,
+ p_sys->i_base_chroma, psz_cmd, "Base" );
free( psz_temp );
free( psz_cmd );
+ if( i_ret != VLC_SUCCESS )
+ {
+ free( p_sys );
+ return i_ret;
+ }
psz_temp = var_CreateGetStringCommand( p_filter,
CFG_PREFIX "blend-chroma" );
picture_Release( p_pic );
return NULL;
}
- 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", NULL, false );
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;
projects / vlc / blobdiff