From: Antoine Cellerier Date: Sun, 24 Aug 2008 14:30:56 +0000 (+0200) Subject: Remove useless and unfinished seamcarving resizer plugin. (We don't want experimentat... X-Git-Tag: 0.9.0~25 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0792400da0476e0a5cf370f210b73c27729223d0;p=vlc Remove useless and unfinished seamcarving resizer plugin. (We don't want experimentations in a release do we? :p) --- diff --git a/configure.ac b/configure.ac index 83430cdf6a..49331eb53f 100644 --- a/configure.ac +++ b/configure.ac @@ -1141,7 +1141,6 @@ VLC_ADD_PLUGIN([noise]) VLC_ADD_PLUGIN([grain]) VLC_ADD_PLUGIN([extract]) VLC_ADD_PLUGIN([sharpen]) -VLC_ADD_PLUGIN([seamcarving]) VLC_ADD_PLUGIN([croppadd]) VLC_ADD_PLUGIN([canvas]) VLC_ADD_PLUGIN([blendbench]) diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake index 03dfc554ff..0b626a1ddf 100644 --- a/extras/buildsystem/cmake/include/config.cmake +++ b/extras/buildsystem/cmake/include/config.cmake @@ -388,7 +388,7 @@ set( VLC_COMPILER "${CMAKE_C_COMPILER}" ) vlc_enable_modules(dummy logger memcpy) vlc_enable_modules(mpgv mpga m4v m4a h264 vc1 demux_cdg cdg ps pva avi mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta) vlc_enable_modules(cvdsub svcdsub spudec subsdec subsusf t140 dvbsub cc mpeg_audio lpcm a52 dts cinepak flac) -vlc_enable_modules(deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving) +vlc_enable_modules(deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen) vlc_enable_modules(converter_fixed mono) vlc_enable_modules(trivial_resampler ugly_resampler) vlc_enable_modules(trivial_channel_mixer trivial_mixer) diff --git a/modules/LIST b/modules/LIST index 70e75a52f7..f0988bcbc0 100644 --- a/modules/LIST +++ b/modules/LIST @@ -276,7 +276,6 @@ $Id$ * screen: a input module that takes screenshots of the primary monitor * screensaver: screensaver disabling module * sdl_image: SDL-based image decoder - * seamcarving: Seam Carving for Content-Aware Image Resizing video filter * sharpen: Sharpen video filter * shout: Shoutcast services discovery * showintf: shows the main interface diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index 2268d9a84e..11643b87ba 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -36,7 +36,6 @@ SOURCES_bluescreen = bluescreen.c SOURCES_alphamask = alphamask.c SOURCES_gaussianblur = gaussianblur.c SOURCES_grain = grain.c -SOURCES_seamcarving = seamcarving.c SOURCES_croppadd = croppadd.c SOURCES_canvas = canvas.c SOURCES_blendbench = blendbench.c diff --git a/modules/video_filter/seamcarving.c b/modules/video_filter/seamcarving.c deleted file mode 100644 index cd0edac3dd..0000000000 --- a/modules/video_filter/seamcarving.c +++ /dev/null @@ -1,363 +0,0 @@ -/***************************************************************************** - * seamcarving.c: "Seam Carving for Content-Aware Image Resizing" - * Based on paper by Shai Avidan and Ariel Shamir. - ***************************************************************************** - * Copyright (C) 2007 the VideoLAN team - * $Id$ - * - * Authors: Antoine Cellerier - * - * 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 - * (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. - * - * 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. - *****************************************************************************/ - -/***************************************************************************** - * Preamble - *****************************************************************************/ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include - -#include "vlc_filter.h" -#include "filter_picture.h" - -#include - -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int Create ( vlc_object_t * ); -static void Destroy ( vlc_object_t * ); - -static picture_t *Filter( filter_t *, picture_t * ); -static int CropCallback( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, - void * ); - -static void FilterSeamCarving( filter_t *, picture_t *, picture_t * ); - -/***************************************************************************** - * Module descriptor - *****************************************************************************/ - -#define FILTER_PREFIX "seamcarving-" - -vlc_module_begin(); - set_description( N_("Seam Carving video filter") ); - set_shortname( N_( "Seam Carving" )); - set_capability( "video filter2", 0 ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); - - set_callbacks( Create, Destroy ); -vlc_module_end(); - -struct filter_sys_t -{ - int *p_energy; - int *p_grad; - - int i_crop; -}; - -static int Create( vlc_object_t *p_this ) -{ - filter_t *p_filter = (filter_t *)p_this; - - /* Allocate structure */ - p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); - if( p_filter->p_sys == NULL ) - return VLC_ENOMEM; - - p_filter->pf_video_filter = Filter; - p_filter->p_sys->p_energy = NULL; - p_filter->p_sys->p_grad = NULL; - p_filter->p_sys->i_crop = 0; - - var_Create( p_filter, "crop", VLC_VAR_INTEGER|VLC_VAR_ISCOMMAND ); - var_AddCallback( p_filter, "crop", CropCallback, p_filter->p_sys ); - - return VLC_SUCCESS; -} - -static void Destroy( vlc_object_t *p_this ) -{ - filter_t *p_filter = (filter_t *)p_this; - - free( p_filter->p_sys->p_energy ); - free( p_filter->p_sys->p_grad ); - - free( p_filter->p_sys ); -} - -static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) -{ - picture_t *p_outpic; - - if( !p_pic ) return NULL; - - p_outpic = p_filter->pf_vout_buffer_new( p_filter ); - if( !p_outpic ) - { - msg_Warn( p_filter, "can't get output picture" ); - picture_Release( p_pic ); - return NULL; - } - - FilterSeamCarving( p_filter, p_pic, p_outpic ); - - return CopyInfoAndRelease( p_outpic, p_pic ); -} - -static inline int my_min3( int a, int b, int c ); -static inline int my_min( int a, int b ); -static int RemoveVerticalSeam( filter_t *p_filter, picture_t *p_inpic, picture_t *p_outpic, int i_src_visible ); - -//#define DRAW_GRADIENT -//#define DRAW_ENERGY -//#define DRAW_SEAM - -static void FilterSeamCarving( filter_t *p_filter, picture_t *p_inpic, - picture_t *p_outpic ) -{ - const int i_src_pitch = p_inpic->p[Y_PLANE].i_pitch; - const int i_num_lines = p_inpic->p[Y_PLANE].i_visible_lines; - - int i_src_visible = p_inpic->p[Y_PLANE].i_visible_pitch; - - if( !p_filter->p_sys->p_energy ) - p_filter->p_sys->p_energy = (int*)malloc(i_src_pitch * i_num_lines * sizeof(int)); - if( !p_filter->p_sys->p_grad ) - p_filter->p_sys->p_grad = (int*)malloc(i_src_pitch * i_num_lines * sizeof(int)); - -//#if defined( DRAW_GRADIENT ) || defined( DRAW_ENERGY ) || defined( DRAW_SEAM ) - vlc_memcpy( p_outpic->p[Y_PLANE].p_pixels, p_inpic->p[Y_PLANE].p_pixels, - p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch ); -//#else -// vlc_memset( p_outpix, 0x80, -// p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch ); -//#endif - vlc_memset( p_outpic->p[U_PLANE].p_pixels, 0x80, - p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch ); - vlc_memset( p_outpic->p[V_PLANE].p_pixels, 0x80, - p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); - -#if defined( DRAW_GRADIENT ) || defined( DRAW_ENERGY ) || defined( DRAW_SEAM ) - i_src_visible = RemoveVerticalSeam( p_filter, p_outpic, p_outpic, i_src_visible ); -#else - static int j = 1; - static int k = 1; - int i; - if( p_filter->p_sys->i_crop != 0 ) - j = p_filter->p_sys->i_crop; - for( i = 0; i < j; i++ ) - i_src_visible = RemoveVerticalSeam( p_filter, p_outpic, p_outpic, i_src_visible ); - int y; - for( y = 0; y < p_outpic->p[Y_PLANE].i_lines; y++ ) - vlc_memset( p_outpic->p[Y_PLANE].p_pixels + y*p_outpic->p[Y_PLANE].i_pitch + i_src_visible, 0x00, p_outpic->p[Y_PLANE].i_pitch - i_src_visible ); - j += k; - if( j == 100 ) k = -1; - if( j == 1 ) k = 1; -#endif -} - -static int ComputeGradient( filter_t *p_filter, picture_t *p_inpic, int i_src_visible ) -{ - int x, y; - const int i_src_pitch = p_inpic->p[Y_PLANE].i_pitch; - const int i_num_lines = p_inpic->p[Y_PLANE].i_visible_lines; - - const uint8_t *p_inpix = p_inpic->p[Y_PLANE].p_pixels; - int *p_grad = p_filter->p_sys->p_grad; - - for( y = 1; y < i_num_lines - 1; - y++, p_grad += i_src_pitch ) - { - /* Compute line y's gradient */ -#define GRADx( x ) \ - ( \ - abs( \ - ( p_inpix[(y-1)*i_src_pitch+x-1] \ - - p_inpix[(y+1)*i_src_pitch+x-1] ) \ - + ( ( p_inpix[(y-1)*i_src_pitch+x] \ - - p_inpix[(y+1)*i_src_pitch+x] ) <<1 ) \ - + ( p_inpix[(y-1)*i_src_pitch+x+1] \ - - p_inpix[(y+1)*i_src_pitch+x+1] ) \ - ) \ - + \ - abs( \ - ( p_inpix[(y-1)*i_src_pitch+x-1] \ - - p_inpix[(y-1)*i_src_pitch+x+1] ) \ - + ( ( p_inpix[y*i_src_pitch+x-1] \ - - p_inpix[y*i_src_pitch+x+1] ) <<1 ) \ - + ( p_inpix[(y+1)*i_src_pitch+x-1] \ - - p_inpix[(y+1)*i_src_pitch+x+1] ) \ - ) \ - ) - for( x = 1; x < i_src_visible - 1; x++ ) - { - p_grad[x] = GRADx( x ); -#ifdef DRAW_GRADIENT - p_outpix[y*i_src_pitch+x] = p_grad[x]>>3; -#endif - } - } - return 0; -} - -static int RemoveVerticalSeam( filter_t *p_filter, picture_t *p_inpic, picture_t *p_outpic, int i_src_visible ) -{ - int x, y; - const int i_src_pitch = p_inpic->p[Y_PLANE].i_pitch; - const int i_num_lines = p_inpic->p[Y_PLANE].i_visible_lines; - - uint8_t *p_outpix = p_outpic->p[Y_PLANE].p_pixels; - - int *p_energy = p_filter->p_sys->p_energy; - int *p_grad = p_filter->p_sys->p_grad; - - ComputeGradient( p_filter, p_inpic, i_src_visible ); - - /** Compute the image's energy (using a sobel gradient as the base energy - ** function) */ - /* Set the first energy line to 0 */ - memset( p_energy, 0, i_src_pitch*sizeof(int)); - - int *p_energy_prev = p_energy; - for( y = 1; y < i_num_lines - 1; - y++, p_energy_prev = p_energy, p_energy += i_src_pitch, - p_grad += i_src_pitch ) - { - /* Compute line y's minimum energy value for paths ending on - * each x */ - x = 1; - p_energy[x] = my_min( p_energy_prev[x ]+p_grad[x ], - p_energy_prev[x+1]+p_grad[x+1] ); - for( x = 2; x < i_src_visible - 2; x++ ) - { - p_energy[x] = my_min3( p_energy_prev[x-1]+p_grad[x-1], - p_energy_prev[x ]+p_grad[x ], - p_energy_prev[x+1]+p_grad[x+1] ); - } - p_energy[x] = my_min( p_energy_prev[x-1]+p_grad[x-1], - p_energy_prev[x ]+p_grad[x ] ); - -#ifdef DRAW_ENERGY - int max = p_energy[1]; - for( x = 1; x < i_src_visible - 1; x++ ) - if( p_energy[x] > max ) max = p_energy[x]; - for( x = 1; x < i_src_visible - 1; x++ ) - p_outpix[y*i_src_pitch+x] = p_energy[x]*0xff/max; -#endif - } - - /* Find the minimum energy point on the last line */ - y--; - p_energy -= i_src_pitch; - p_grad -= i_src_pitch; - - int m = p_energy[1]; - int xmin = 1; - for( x = 1; x < i_src_visible - 1; x++ ) - { - if( p_energy[x] < m ) - { - m = p_energy[x]; - xmin = x; - } - } - -#ifdef DRAW_SEAM - p_outpix[y*i_src_pitch+xmin] = 0xff; - p_outpix[(y+1)*i_src_pitch+xmin] = 0xff; -#else - memmove( p_outpix+y*i_src_pitch+xmin, p_outpix+y*i_src_pitch+xmin+1, i_src_pitch-(xmin+1) ); - memmove( p_outpix+(y+1)*i_src_pitch+xmin, p_outpix+(y+1)*i_src_pitch+xmin+1, i_src_pitch-(xmin+1) ); -#endif - - p_energy -= i_src_pitch; - for( ; y>1; y--, p_energy -= i_src_pitch, p_grad -= i_src_pitch ) - { - if( m != p_energy[xmin]+p_grad[xmin] ) - { - if( xmin > 1 && m == p_energy[xmin-1]+p_grad[xmin-1] ) - { - xmin--; - } - else if( xmin < i_src_visible - 2 && m == p_energy[xmin+1]+p_grad[xmin+1] ) - { - xmin++; - } - else - { - printf("Alarm! %d\n" ,y); - //assert( 0 ); - } - } - m = p_energy[xmin]; -#ifdef DRAW_SEAM - p_outpix[y*i_src_pitch+xmin] = 0xff; -#else - memmove( p_outpix+y*i_src_pitch+xmin, p_outpix+y*i_src_pitch+xmin+1, i_src_pitch-(xmin+1) ); -#endif - } -#ifdef DRAW_SEAM - p_outpix[y*i_src_pitch+xmin] = 0xff; -#else - memmove( p_outpix+y*i_src_pitch+xmin, p_outpix+y*i_src_pitch+xmin+1, i_src_pitch-(xmin+1) ); -#endif - y--; -#ifdef DRAW_SEAM - p_outpix[y*i_src_pitch+xmin] = 0xff; -#else - memmove( p_outpix+y*i_src_pitch+xmin, p_outpix+y*i_src_pitch+xmin+1, i_src_pitch-(xmin+1) ); -#endif - -#if defined( DRAW_SEAM ) - return i_src_visible; -#else - return i_src_visible-1; -#endif -} - -static inline int my_min3( int a, int b, int c ) -{ - if( a < b ) - { - if( a < c ) return a; - return c; - } - if( b < c ) return b; - return c; -} -static inline int my_min( int a, int b ) -{ - return a < b ? a : b; -} - -static int CropCallback( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, - void *p_data ) -{ - VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval); - filter_sys_t *p_sys = (filter_sys_t *)p_data; - p_sys->i_crop = newval.i_int; - return VLC_SUCCESS; -}