X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Falphamask.c;h=a9f17c23e0bfdc2e9fafa1133ae4813ddcfecc83;hb=056a2b9a08b01403b0111797372a042abab33953;hp=58cacbfa51717f7002ea16f14c183340d804ceb3;hpb=42bb236284b09355d8bfde47fb4915dd1f07aa68;p=vlc diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c index 58cacbfa51..a9f17c23e0 100644 --- a/modules/video_filter/alphamask.c +++ b/modules/video_filter/alphamask.c @@ -1,24 +1,24 @@ /***************************************************************************** * alphamask.c : Alpha layer mask video filter for vlc ***************************************************************************** - * Copyright (C) 2007 the VideoLAN team + * Copyright (C) 2007 VLC authors and VideoLAN * $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 + * 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. *****************************************************************************/ /***************************************************************************** @@ -31,17 +31,17 @@ #include #include -#include #include #include +#include #define ALPHAMASK_HELP N_( \ "Use an image's alpha channel as a transparency mask." ) #define MASK_TEXT N_("Transparency mask") #define MASK_LONGTEXT N_( \ - "Alpha blending transparency mask. Use's a png alpha channel.") + "Alpha blending transparency mask. Uses a png alpha channel.") #define CFG_PREFIX "alphamask-" @@ -59,20 +59,19 @@ static int MaskCallback( vlc_object_t *, char const *, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Alpha mask video filter") ); - set_shortname( N_("Alpha mask" )); - set_help( ALPHAMASK_HELP ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); - set_capability( "video filter2", 0 ); - add_shortcut( "alphamask" ); - add_shortcut( "mask" ); - set_callbacks( Create, Destroy ); - - add_string( CFG_PREFIX "mask", NULL, NULL, MASK_TEXT, - MASK_LONGTEXT, false ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Alpha mask video filter") ) + set_shortname( N_("Alpha mask" )) + set_help( ALPHAMASK_HELP ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) + set_capability( "video filter2", 0 ) + add_shortcut( "alphamask", "mask" ) + set_callbacks( Create, Destroy ) + + add_loadfile( CFG_PREFIX "mask", NULL, MASK_TEXT, + MASK_LONGTEXT, false ) +vlc_module_end () static const char *const ppsz_filter_options[] = { "mask", NULL @@ -90,10 +89,10 @@ static int Create( vlc_object_t *p_this ) filter_sys_t *p_sys; char *psz_string; - if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','A') ) + if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA ) { msg_Err( p_filter, - "Unsupported input chroma \"%4s\". " + "Unsupported input chroma \"%4.4s\". " "Alphamask can only use \"YUVA\".", (char*)&p_filter->fmt_in.video.i_chroma ); return VLC_EGENERIC; @@ -108,12 +107,8 @@ static int Create( vlc_object_t *p_this ) config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options, p_filter->p_cfg ); - vlc_mutex_init( &p_sys->mask_lock ); psz_string = var_CreateGetStringCommand( p_filter, CFG_PREFIX "mask" ); - var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback, - p_filter ); - p_sys->p_mask = NULL; if( psz_string && *psz_string ) { LoadMask( p_filter, psz_string ); @@ -121,8 +116,13 @@ static int Create( vlc_object_t *p_this ) msg_Err( p_filter, "Error while loading mask (%s).", psz_string ); } + else + p_sys->p_mask = NULL; free( psz_string ); + vlc_mutex_init( &p_sys->mask_lock ); + var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback, + p_filter ); p_filter->pf_video_filter = Filter; return VLC_SUCCESS; @@ -133,11 +133,14 @@ static void Destroy( vlc_object_t *p_this ) filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys = p_filter->p_sys; + var_DelCallback( p_filter, CFG_PREFIX "mask", MaskCallback, + p_filter ); + vlc_mutex_destroy( &p_sys->mask_lock ); - if( p_filter->p_sys->p_mask ) - p_filter->p_sys->p_mask->pf_release( p_filter->p_sys->p_mask ); + if( p_sys->p_mask ) + picture_Release( p_sys->p_mask ); - free( p_filter->p_sys ); + free( p_sys ); } static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) @@ -152,7 +155,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) || p_mask->i_visible_lines != p_apic->i_visible_lines ) { - msg_Warn( p_filter, + msg_Err( p_filter, "Mask size (%d x %d) and image size (%d x %d) " "don't match. The mask will not be applied.", p_mask->i_visible_pitch, @@ -162,31 +165,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) } else { - if( p_mask->i_pitch != p_apic->i_pitch - || p_mask->i_lines != p_apic->i_lines ) - { - /* visible plane sizes match ... but not the underlying - * buffer. I'm not sure that this can happen, - * but better safe than sorry. */ - int i_line; - int i_lines = p_mask->i_visible_lines; - uint8_t *p_src = p_mask->p_pixels; - uint8_t *p_dst = p_apic->p_pixels; - int i_src_pitch = p_mask->i_pitch; - int i_dst_pitch = p_apic->i_pitch; - int i_visible_pitch = p_mask->i_visible_pitch; - for( i_line = 0; i_line < i_lines; i_line++, - p_src += i_src_pitch, p_dst += i_dst_pitch ) - { - vlc_memcpy( p_dst, p_src, i_visible_pitch ); - } - } - else - { - /* plane sizes match */ - vlc_memcpy( p_apic->p_pixels, p_mask->p_pixels, - p_mask->i_pitch * p_mask->i_lines ); - } + plane_CopyPixels( p_apic, p_mask ); } vlc_mutex_unlock( &p_sys->mask_lock ); return p_pic; @@ -199,12 +178,14 @@ static void LoadMask( filter_t *p_filter, const char *psz_filename ) video_format_t fmt_in, fmt_out; memset( &fmt_in, 0, sizeof( video_format_t ) ); memset( &fmt_out, 0, sizeof( video_format_t ) ); - fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); + fmt_out.i_chroma = VLC_CODEC_YUVA; if( p_filter->p_sys->p_mask ) - p_filter->p_sys->p_mask->pf_release( p_filter->p_sys->p_mask ); + picture_Release( p_filter->p_sys->p_mask ); p_image = image_HandlerCreate( p_filter ); + char *psz_url = vlc_path2uri( psz_filename, NULL ); p_filter->p_sys->p_mask = - image_ReadUrl( p_image, psz_filename, &fmt_in, &fmt_out ); + image_ReadUrl( p_image, psz_url, &fmt_in, &fmt_out ); + free( psz_url ); image_HandlerDelete( p_image ); } @@ -236,7 +217,7 @@ static int MaskCallback( vlc_object_t *p_this, char const *psz_var, } else if( p_sys->p_mask ) { - p_sys->p_mask->pf_release( p_sys->p_mask ); + picture_Release( p_sys->p_mask ); p_sys->p_mask = NULL; } vlc_mutex_unlock( &p_sys->mask_lock );