X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffilter_avdeinterlace.c;h=d4afa3509506cc3ae59f800a485af44fe6530aef;hb=bb2674a23b551cbc146d40ff7a122c87856b49ff;hp=f1d1a3f3a6ceb4600c884d4fdbf765d99c01b27c;hpb=1f8135566477df29f2b62528f9bf18359c0ab971;p=melted diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c index f1d1a3f..d4afa35 100644 --- a/src/modules/avformat/filter_avdeinterlace.c +++ b/src/modules/avformat/filter_avdeinterlace.c @@ -3,33 +3,35 @@ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited * Author: Charles Yates * - * 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 library 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, + * This library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "filter_avdeinterlace.h" - +#include #include #include #include // ffmpeg Header files -#include +#include #ifdef USE_MMX #include "mmx.h" +#else +#define MAX_NEG_CROP 1024 +extern uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP]; #endif #ifdef USE_MMX @@ -79,15 +81,19 @@ movd_r2m(mm1,dst[0]); #endif +#if LIBAVUTIL_VERSION_INT < (50<<16) +#define PIX_FMT_YUYV422 PIX_FMT_YUV422 +#endif + /* filter parameters: [-1 4 2 4 -1] // 8 */ -static void deinterlace_line(uint8_t *dst, +static inline void deinterlace_line(uint8_t *dst, const uint8_t *lum_m4, const uint8_t *lum_m3, const uint8_t *lum_m2, const uint8_t *lum_m1, const uint8_t *lum, int size) { #ifndef USE_MMX - uint8_t *cm = cropTbl + MAX_NEG_CROP; + uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int sum; for(;size > 0;size--) { @@ -126,11 +132,11 @@ static void deinterlace_line(uint8_t *dst, } #endif } -static void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *lum_m2, uint8_t *lum_m1, uint8_t *lum, +static inline void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *lum_m2, uint8_t *lum_m1, uint8_t *lum, int size) { #ifndef USE_MMX - uint8_t *cm = cropTbl + MAX_NEG_CROP; + uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int sum; for(;size > 0;size--) { @@ -172,7 +178,7 @@ static void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t * /* deinterlacing : 2 temporal taps, 3 spatial taps linear filter. The top field is copied as is, but the bottom field is deinterlaced against the top field. */ -static void deinterlace_bottom_field(uint8_t *dst, int dst_wrap, +static inline void deinterlace_bottom_field(uint8_t *dst, int dst_wrap, const uint8_t *src1, int src_wrap, int width, int height) { @@ -201,7 +207,7 @@ static void deinterlace_bottom_field(uint8_t *dst, int dst_wrap, deinterlace_line(dst,src_m2,src_m1,src_0,src_0,src_0,width); } -static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap, +static inline void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap, int width, int height) { uint8_t *src_m1, *src_0, *src_p1, *src_p2; @@ -235,14 +241,14 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src, if (pix_fmt != PIX_FMT_YUV420P && pix_fmt != PIX_FMT_YUV422P && - pix_fmt != PIX_FMT_YUV422 && + pix_fmt != PIX_FMT_YUYV422 && pix_fmt != PIX_FMT_YUV444P && pix_fmt != PIX_FMT_YUV411P) return -1; if ((width & 3) != 0 || (height & 3) != 0) return -1; - if ( pix_fmt != PIX_FMT_YUV422 ) + if ( pix_fmt != PIX_FMT_YUYV422 ) { for(i=0;i<3;i++) { if (i == 1) { @@ -274,11 +280,11 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src, else { if (src == dst) { deinterlace_bottom_field_inplace(dst->data[0], dst->linesize[0], - width, height); + width<<1, height); } else { deinterlace_bottom_field(dst->data[0],dst->linesize[0], src->data[0], src->linesize[0], - width, height); + width<<1, height); } } @@ -294,35 +300,33 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src, static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable ) { int error = 0; - + int deinterlace = mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "consumer_deinterlace" ); + + // Determine if we need a writable version or not + if ( deinterlace && !writable ) + writable = !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" ); + + // Get the input image + error = mlt_frame_get_image( this, image, format, width, height, writable ); + // Check that we want progressive and we aren't already progressive - if ( *format == mlt_image_yuv422 && - !mlt_properties_get_int( mlt_frame_properties( this ), "progressive" ) && - mlt_properties_get_int( mlt_frame_properties( this ), "consumer_deinterlace" ) ) + if ( deinterlace && *format == mlt_image_yuv422 && *image != NULL && !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" ) ) { // Create a picture AVPicture *output = mlt_pool_alloc( sizeof( AVPicture ) ); - // Get the input image - error = mlt_frame_get_image( this, image, format, width, height, 1 ); - // Fill the picture if ( *format == mlt_image_yuv422 ) { - avpicture_fill( output, *image, PIX_FMT_YUV422, *width, *height ); - mlt_avpicture_deinterlace( output, output, PIX_FMT_YUV422, *width, *height ); + avpicture_fill( output, *image, PIX_FMT_YUYV422, *width, *height ); + mlt_avpicture_deinterlace( output, output, PIX_FMT_YUYV422, *width, *height ); } // Free the picture mlt_pool_release( output ); // Make sure that others know the frame is deinterlaced - mlt_properties_set_int( mlt_frame_properties( this ), "progressive", 1 ); - } - else - { - // Get the input image - error = mlt_frame_get_image( this, image, format, width, height, writable ); + mlt_properties_set_int( MLT_FRAME_PROPERTIES( this ), "progressive", 1 ); } return error;