X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fscale.c;h=d69a55ea80d5bf12f2d9de88147bf4d162bd6855;hb=cc8ed6374d126d968f1efbed23388cfc40bb3f22;hp=7b86ef4feeade8b1701efec361fa8d336e2b6554;hpb=66902e1ba79b6181caa26b3420a60831e4f7faf8;p=vlc diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c index 7b86ef4fee..d69a55ea80 100644 --- a/modules/video_filter/scale.c +++ b/modules/video_filter/scale.c @@ -1,26 +1,26 @@ /***************************************************************************** - * resize.c: video scaling module for YUVP/A, I420 and RGBA pictures + * scale.c: video scaling module for YUVP/A, I420 and RGBA pictures * Uses the low quality "nearest neighbour" algorithm. ***************************************************************************** - * Copyright (C) 2003-2007 the VideoLAN team + * Copyright (C) 2003-2007 VLC authors and VideoLAN * $Id$ * * Authors: Gildas Bazin * 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. *****************************************************************************/ /***************************************************************************** @@ -32,34 +32,22 @@ #include #include -#include -#include "vlc_filter.h" - -/***************************************************************************** - * filter_sys_t : filter descriptor - *****************************************************************************/ -struct filter_sys_t -{ - es_format_t fmt_in; - es_format_t fmt_out; -}; +#include /**************************************************************************** * Local prototypes ****************************************************************************/ static int OpenFilter ( vlc_object_t * ); -static void CloseFilter( vlc_object_t * ); - static picture_t *Filter( filter_t *, picture_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( N_("Video scaling filter") ); - set_capability( "video filter2", 10 ); - set_callbacks( OpenFilter, CloseFilter ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("Video scaling filter") ) + set_capability( "video filter2", 10 ) + set_callbacks( OpenFilter, NULL ) +vlc_module_end () /***************************************************************************** * OpenFilter: probe the filter and return score @@ -67,26 +55,19 @@ vlc_module_end(); static int OpenFilter( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t*)p_this; - filter_sys_t *p_sys; - if( ( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','P') && - p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','A') && - p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0') && - p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2') && - p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','G','B','A') ) || + if( ( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVP && + p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA && + p_filter->fmt_in.video.i_chroma != VLC_CODEC_I420 && + p_filter->fmt_in.video.i_chroma != VLC_CODEC_YV12 && + p_filter->fmt_in.video.i_chroma != VLC_CODEC_RGB32 && + p_filter->fmt_in.video.i_chroma != VLC_CODEC_RGBA ) || p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma ) { return VLC_EGENERIC; } - /* Allocate the memory needed to store the decoder's structure */ - if( ( p_filter->p_sys = p_sys = - (filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL ) - { - msg_Err( p_filter, "out of memory" ); - return VLC_EGENERIC; - } - + video_format_ScaleCropAr( &p_filter->fmt_out.video, &p_filter->fmt_in.video ); p_filter->pf_video_filter = Filter; msg_Dbg( p_filter, "%ix%i -> %ix%i", p_filter->fmt_in.video.i_width, @@ -96,17 +77,6 @@ static int OpenFilter( vlc_object_t *p_this ) return VLC_SUCCESS; } -/***************************************************************************** - * CloseFilter: clean up the filter - *****************************************************************************/ -static void CloseFilter( vlc_object_t *p_this ) -{ - filter_t *p_filter = (filter_t*)p_this; - filter_sys_t *p_sys = p_filter->p_sys; - - free( p_sys ); -} - /**************************************************************************** * Filter: the whole thing ****************************************************************************/ @@ -125,17 +95,18 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) (p_filter->fmt_out.video.i_width == 0) ) return NULL; + video_format_ScaleCropAr( &p_filter->fmt_out.video, &p_filter->fmt_in.video ); + /* Request output picture */ - p_pic_dst = p_filter->pf_vout_buffer_new( p_filter ); + p_pic_dst = filter_NewPicture( p_filter ); if( !p_pic_dst ) { - msg_Warn( p_filter, "can't get output picture" ); - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; } - if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('R','G','B','A') ) + if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_RGBA && + p_filter->fmt_in.video.i_chroma != VLC_CODEC_RGB32 ) { for( i_plane = 0; i_plane < p_pic_dst->i_planes; i_plane++ ) { @@ -226,13 +197,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) } } - p_pic_dst->date = p_pic->date; - p_pic_dst->b_force = p_pic->b_force; - p_pic_dst->i_nb_fields = p_pic->i_nb_fields; - p_pic_dst->b_progressive = p_pic->b_progressive; - p_pic_dst->b_top_field_first = p_pic->b_top_field_first; - - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); + picture_CopyProperties( p_pic_dst, p_pic ); + picture_Release( p_pic ); return p_pic_dst; }