[vlc-commits] avcodec: drop deprecated deinterlacing filter
Rémi Denis-Courmont
git at videolan.org
Sat Mar 9 20:39:33 CET 2013
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 9 21:08:56 2013 +0200| [c1fd92f27460e85d3d23988e97c54de5a4b26058] | committer: Rémi Denis-Courmont
avcodec: drop deprecated deinterlacing filter
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1fd92f27460e85d3d23988e97c54de5a4b26058
---
modules/codec/Modules.am | 1 -
modules/codec/avcodec/avcodec.c | 7 --
modules/codec/avcodec/deinterlace.c | 152 -----------------------------------
3 files changed, 160 deletions(-)
diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 7ee27b2..98e7494 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -96,7 +96,6 @@ libavcodec_plugin_la_SOURCES = \
avcodec/subtitle.c \
avcodec/audio.c \
avcodec/cpu.c \
- avcodec/deinterlace.c \
avcodec/fourcc.c \
avcodec/chroma.c avcodec/chroma.h \
avcodec/va.h \
diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index bfd54c3..19ba42c 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -239,13 +239,6 @@ vlc_module_begin ()
ENC_PROFILE_TEXT, ENC_PROFILE_LONGTEXT, true )
#endif /* ENABLE_SOUT */
- /* video filter submodule */
- add_submodule ()
- set_capability( "video filter2", 0 )
- set_callbacks( OpenDeinterlace, CloseDeinterlace )
- set_description( N_("FFmpeg deinterlace video filter") )
- add_shortcut( "ffmpeg-deinterlace" )
-
#ifdef MERGE_FFMPEG
add_submodule ()
# include "../../demux/avformat/avformat.c"
diff --git a/modules/codec/avcodec/deinterlace.c b/modules/codec/avcodec/deinterlace.c
deleted file mode 100644
index ac230be..0000000
--- a/modules/codec/avcodec/deinterlace.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*****************************************************************************
- * deinterlace.c: video filter doing chroma conversion and resizing
- * using the libavcodec library
- *****************************************************************************
- * Copyright (C) 1999-2001 VLC authors and VideoLAN
- * $Id$
- *
- * Authors: Gildas Bazin <gbazin at videolan.org>
- *
- * 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 Lesser General Public License for more details.
- *
- * 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_codec.h>
-#include <vlc_filter.h>
-
-#include <libavcodec/avcodec.h>
-
-#include "avcodec.h"
-#include "avcommon.h"
-
-static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic );
-
-/*****************************************************************************
- * filter_sys_t : filter descriptor
- *****************************************************************************/
-struct filter_sys_t
-{
- bool b_resize;
- bool b_convert;
- bool b_resize_first;
- bool b_enable_croppadd;
-
- es_format_t fmt_in;
- int i_src_ffmpeg_chroma;
- es_format_t fmt_out;
- int i_dst_ffmpeg_chroma;
-
- AVPicture tmp_pic;
-};
-
-/*****************************************************************************
- * OpenDeinterlace: probe the filter and return score
- *****************************************************************************/
-int OpenDeinterlace( vlc_object_t *p_this )
-{
- filter_t *p_filter = (filter_t*)p_this;
- filter_sys_t *p_sys;
-
- /* libavcodec needs to be initialized for some chroma conversions */
- vlc_init_avcodec();
-
- /* Check if the input format */
- int pix_fmt;
- p_filter->fmt_in.video.i_chroma = p_filter->fmt_in.i_codec; /* XXX ahem */
- if( GetFfmpegChroma( &pix_fmt, &p_filter->fmt_in.video ) != VLC_SUCCESS )
- {
- msg_Err( p_filter, "Unsupported chroma type %4.4s",
- (char *)&p_filter->fmt_in.video.i_chroma );
- return VLC_EGENERIC;
- }
-
- /* Allocate the memory needed to store the decoder's structure */
- p_sys = malloc( sizeof(*p_sys) );
- if( unlikely(p_sys == NULL) )
- return VLC_ENOMEM;
-
- /* Misc init */
- p_sys->i_src_ffmpeg_chroma = pix_fmt;
- p_filter->p_sys = p_sys;
- p_filter->pf_video_filter = Deinterlace;
- msg_Dbg( p_filter, "deinterlacing" );
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * CloseDeinterlace: clean up the filter
- *****************************************************************************/
-void CloseDeinterlace( 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 );
-}
-
-/*****************************************************************************
- * Do the processing here
- *****************************************************************************/
-static picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic )
-{
- filter_sys_t *p_sys = p_filter->p_sys;
- AVPicture src_pic, dest_pic;
- picture_t *p_pic_dst;
- int i, i_res = -1;
-
- /* Request output picture */
- p_pic_dst = filter_NewPicture( p_filter );
- if( !p_pic_dst )
- {
- picture_Release( p_pic );
- return NULL;
- }
-
- /* Prepare the AVPictures for the conversion */
- for( i = 0; i < p_pic->i_planes; i++ )
- {
- src_pic.data[i] = p_pic->p[i].p_pixels;
- src_pic.linesize[i] = p_pic->p[i].i_pitch;
- }
- for( i = 0; i < p_pic_dst->i_planes; i++ )
- {
- dest_pic.data[i] = p_pic_dst->p[i].p_pixels;
- dest_pic.linesize[i] = p_pic_dst->p[i].i_pitch;
- }
-
- i_res = avpicture_deinterlace( &dest_pic, &src_pic, p_sys->i_src_ffmpeg_chroma,
- p_filter->fmt_in.video.i_width,
- p_filter->fmt_in.video.i_height );
- if( i_res == -1 )
- {
- msg_Err( p_filter, "deinterlacing picture failed" );
- filter_DeletePicture( p_filter, p_pic_dst );
- picture_Release( p_pic );
- return NULL;
- }
-
- picture_CopyProperties( p_pic_dst, p_pic );
- p_pic_dst->b_progressive = true;
- picture_Release( p_pic );
- return p_pic_dst;
-}
More information about the vlc-commits
mailing list