X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fswscale.c;h=91562ceca707b77dc95d84807d133e01bf63b3ef;hb=6053dcfa7c2b2065d9166bb9247028ec87bccc2a;hp=fee512755f2dfef8c2965bc4c45ccd1304146e02;hpb=74e5a0727b83ea8bd5ee87dbce7596b990ef14c1;p=vlc diff --git a/modules/video_filter/swscale.c b/modules/video_filter/swscale.c index fee512755f..91562ceca7 100644 --- a/modules/video_filter/swscale.c +++ b/modules/video_filter/swscale.c @@ -1,25 +1,25 @@ /***************************************************************************** * swscale.c: scaling and chroma conversion using libswscale ***************************************************************************** - * Copyright (C) 1999-2008 the VideoLAN team + * Copyright (C) 1999-2008 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * Gildas Bazin * - * 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. *****************************************************************************/ /***************************************************************************** @@ -28,23 +28,23 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include #include #include #include +#include -#ifdef HAVE_LIBSWSCALE_SWSCALE_H -# include -# include -#elif defined(HAVE_FFMPEG_SWSCALE_H) -# include -# include +#include + +#ifdef __APPLE__ +# include #endif +#include "../codec/avcodec/chroma.h" // Chroma Avutil <-> VLC conversion + /* Gruikkkkkkkkkk!!!!! */ -#include "../codec/avcodec/avcodec.h" #undef AVPALETTE_SIZE - #define AVPALETTE_SIZE (256 * sizeof(uint32_t)) /***************************************************************************** @@ -70,8 +70,8 @@ vlc_module_begin () set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_VFILTER ) set_callbacks( OpenScaler, CloseScaler ) - add_integer( "swscale-mode", 2, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, true ) - change_integer_list( pi_mode_values, ppsz_mode_descriptions, NULL ) + add_integer( "swscale-mode", 2, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, true ) + change_integer_list( pi_mode_values, ppsz_mode_descriptions ) vlc_module_end () /* Version checking */ @@ -80,8 +80,6 @@ vlc_module_end () * Local prototypes ****************************************************************************/ -void *( *swscale_fast_memcpy )( void *, const void *, size_t ); - /** * Internal swscale filter structure. */ @@ -103,6 +101,8 @@ struct filter_sys_t picture_t *p_dst_e; bool b_add_a; bool b_copy; + bool b_swap_uvi; + bool b_swap_uvo; }; static picture_t *Filter( filter_t *, picture_t * ); @@ -117,6 +117,8 @@ typedef struct bool b_add_a; int i_sws_flags; bool b_copy; + bool b_swap_uvi; + bool b_swap_uvo; } ScalerConfiguration; static int GetParameters( ScalerConfiguration *, @@ -156,9 +158,6 @@ static int OpenScaler( vlc_object_t *p_this ) if( ( p_filter->p_sys = p_sys = malloc(sizeof(filter_sys_t)) ) == NULL ) return VLC_ENOMEM; - /* FIXME pointer assignment may not be atomic */ - swscale_fast_memcpy = vlc_memcpy; - /* Set CPU capabilities */ p_sys->i_cpu_mask = GetSwsCpuMask(); @@ -230,20 +229,21 @@ static void CloseScaler( vlc_object_t *p_this ) *****************************************************************************/ static int GetSwsCpuMask(void) { - const unsigned int i_cpu = vlc_CPU(); int i_sws_cpu = 0; - if( i_cpu & CPU_CAPABILITY_MMX ) +#if defined(__i386__) || defined(__x86_64__) + if( vlc_CPU_MMX() ) i_sws_cpu |= SWS_CPU_CAPS_MMX; #if (LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)) - if( i_cpu & CPU_CAPABILITY_MMXEXT ) + if( vlc_CPU_MMXEXT() ) i_sws_cpu |= SWS_CPU_CAPS_MMX2; #endif - if( i_cpu & CPU_CAPABILITY_3DNOW ) + if( vlc_CPU_3dNOW() ) i_sws_cpu |= SWS_CPU_CAPS_3DNOW; - - if( i_cpu & CPU_CAPABILITY_ALTIVEC ) +#elif defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) + if( vlc_CPU_ALTIVEC() ) i_sws_cpu |= SWS_CPU_CAPS_ALTIVEC; +#endif return i_sws_cpu; } @@ -254,6 +254,31 @@ static bool IsFmtSimilar( const video_format_t *p_fmt1, const video_format_t *p_ p_fmt1->i_height == p_fmt2->i_height; } +static void FixParameters( int *pi_fmt, bool *pb_has_a, bool *pb_swap_uv, vlc_fourcc_t fmt ) +{ + switch( fmt ) + { + case VLC_CODEC_YUVA: + *pi_fmt = PIX_FMT_YUV444P; + *pb_has_a = true; + break; + case VLC_CODEC_RGBA: + *pi_fmt = PIX_FMT_BGR32; + *pb_has_a = true; + break; + case VLC_CODEC_YV12: + *pi_fmt = PIX_FMT_YUV420P; + *pb_swap_uv = true; + break; + case VLC_CODEC_YV9: + *pi_fmt = PIX_FMT_YUV410P; + *pb_swap_uv = true; + break; + default: + break; + } +} + static int GetParameters( ScalerConfiguration *p_cfg, const video_format_t *p_fmti, const video_format_t *p_fmto, @@ -265,9 +290,11 @@ static int GetParameters( ScalerConfiguration *p_cfg, bool b_has_ai = false; bool b_has_ao = false; int i_sws_flags = i_sws_flags_default; + bool b_swap_uvi = false; + bool b_swap_uvo = false; - GetFfmpegChroma( &i_fmti, *p_fmti ); - GetFfmpegChroma( &i_fmto, *p_fmto ); + GetFfmpegChroma( &i_fmti, p_fmti ); + GetFfmpegChroma( &i_fmto, p_fmto ); if( p_fmti->i_chroma == p_fmto->i_chroma ) { @@ -278,28 +305,10 @@ static int GetParameters( ScalerConfiguration *p_cfg, } } - if( p_fmti->i_chroma == VLC_CODEC_YUVA ) - { - i_fmti = PIX_FMT_YUV444P; - b_has_ai = true; - } - else if( p_fmti->i_chroma == VLC_CODEC_RGBA ) - { - i_fmti = PIX_FMT_BGR32; - b_has_ai = true; - } - - if( p_fmto->i_chroma == VLC_CODEC_YUVA ) - { - i_fmto = PIX_FMT_YUV444P; - b_has_ao = true; - } - else if( p_fmto->i_chroma == VLC_CODEC_RGBA ) - { - i_fmto = PIX_FMT_BGR32; - b_has_ao = true; - } + FixParameters( &i_fmti, &b_has_ai, &b_swap_uvi, p_fmti->i_chroma ); + FixParameters( &i_fmto, &b_has_ao, &b_swap_uvo, p_fmto->i_chroma ); +#if !defined (__ANDROID__) && !defined(TARGET_OS_IPHONE) /* FIXME TODO removed when ffmpeg is fixed * Without SWS_ACCURATE_RND the quality is really bad for some conversions */ switch( i_fmto ) @@ -310,6 +319,7 @@ static int GetParameters( ScalerConfiguration *p_cfg, i_sws_flags |= SWS_ACCURATE_RND; break; } +#endif if( p_cfg ) { @@ -317,7 +327,11 @@ static int GetParameters( ScalerConfiguration *p_cfg, p_cfg->i_fmto = i_fmto; p_cfg->b_has_a = b_has_ai && b_has_ao; p_cfg->b_add_a = (!b_has_ai) && b_has_ao; - p_cfg->b_copy = i_fmti == i_fmto && p_fmti->i_width == p_fmto->i_width && p_fmti->i_height == p_fmto->i_height; + p_cfg->b_copy = i_fmti == i_fmto && + p_fmti->i_width == p_fmto->i_width && + p_fmti->i_height == p_fmto->i_height; + p_cfg->b_swap_uvi = b_swap_uvi; + p_cfg->b_swap_uvo = b_swap_uvo; p_cfg->i_sws_flags = i_sws_flags; } @@ -331,7 +345,7 @@ static int Init( filter_t *p_filter ) { filter_sys_t *p_sys = p_filter->p_sys; const video_format_t *p_fmti = &p_filter->fmt_in.video; - const video_format_t *p_fmto = &p_filter->fmt_out.video; + video_format_t *p_fmto = &p_filter->fmt_out.video; if( IsFmtSimilar( p_fmti, &p_sys->fmt_in ) && IsFmtSimilar( p_fmto, &p_sys->fmt_out ) && @@ -378,16 +392,18 @@ static int Init( filter_t *p_filter ) } if( p_sys->ctxA ) { - p_sys->p_src_a = picture_New( VLC_CODEC_GREY, i_fmti_width, p_fmti->i_height, 0 ); - p_sys->p_dst_a = picture_New( VLC_CODEC_GREY, i_fmto_width, p_fmto->i_height, 0 ); + p_sys->p_src_a = picture_New( VLC_CODEC_GREY, i_fmti_width, p_fmti->i_height, 0, 1 ); + p_sys->p_dst_a = picture_New( VLC_CODEC_GREY, i_fmto_width, p_fmto->i_height, 0, 1 ); } if( p_sys->i_extend_factor != 1 ) { - p_sys->p_src_e = picture_New( p_fmti->i_chroma, i_fmti_width, p_fmti->i_height, 0 ); - p_sys->p_dst_e = picture_New( p_fmto->i_chroma, i_fmto_width, p_fmto->i_height, 0 ); + p_sys->p_src_e = picture_New( p_fmti->i_chroma, i_fmti_width, p_fmti->i_height, 0, 1 ); + p_sys->p_dst_e = picture_New( p_fmto->i_chroma, i_fmto_width, p_fmto->i_height, 0, 1 ); - memset( p_sys->p_src_e->p[0].p_pixels, 0, p_sys->p_src_e->p[0].i_pitch * p_sys->p_src_e->p[0].i_lines ); - memset( p_sys->p_dst_e->p[0].p_pixels, 0, p_sys->p_dst_e->p[0].i_pitch * p_sys->p_dst_e->p[0].i_lines ); + if( p_sys->p_src_e ) + memset( p_sys->p_src_e->p[0].p_pixels, 0, p_sys->p_src_e->p[0].i_pitch * p_sys->p_src_e->p[0].i_lines ); + if( p_sys->p_dst_e ) + memset( p_sys->p_dst_e->p[0].p_pixels, 0, p_sys->p_dst_e->p[0].i_pitch * p_sys->p_dst_e->p[0].i_lines ); } if( !p_sys->ctx || @@ -403,7 +419,10 @@ static int Init( filter_t *p_filter ) p_sys->b_copy = cfg.b_copy; p_sys->fmt_in = *p_fmti; p_sys->fmt_out = *p_fmto; + p_sys->b_swap_uvi = cfg.b_swap_uvi; + p_sys->b_swap_uvo = cfg.b_swap_uvo; + video_format_ScaleCropAr( p_fmto, p_fmti ); #if 0 msg_Dbg( p_filter, "%ix%i chroma: %4.4s -> %ix%i chroma: %4.4s extend by %d", p_fmti->i_width, p_fmti->i_height, (char *)&p_fmti->i_chroma, @@ -441,17 +460,20 @@ static void Clean( filter_t *p_filter ) p_sys->p_dst_e = NULL; } -static void GetPixels( uint8_t *pp_pixel[3], int pi_pitch[3], +static void GetPixels( uint8_t *pp_pixel[4], int pi_pitch[4], const picture_t *p_picture, - int i_plane_start, int i_plane_count ) + int i_plane_start, int i_plane_count, + bool b_swap_uv ) { + assert( !b_swap_uv || i_plane_count >= 3 ); int n; for( n = 0; n < __MIN(i_plane_count, p_picture->i_planes-i_plane_start ); n++ ) { - pp_pixel[n] = p_picture->p[i_plane_start+n].p_pixels; - pi_pitch[n] = p_picture->p[i_plane_start+n].i_pitch; + const int nd = ( b_swap_uv && n >= 1 && n <= 2 ) ? (3 - n) : n; + pp_pixel[nd] = p_picture->p[i_plane_start+n].p_pixels; + pi_pitch[nd] = p_picture->p[i_plane_start+n].i_pitch; } - for( ; n < 3; n++ ) + for( ; n < 4; n++ ) { pp_pixel[n] = NULL; pi_pitch[n] = 0; @@ -499,15 +521,24 @@ static void CopyPad( picture_t *p_dst, const picture_t *p_src ) } } +static void SwapUV( picture_t *p_dst, const picture_t *p_src ) +{ + picture_t tmp = *p_src; + tmp.p[1] = p_src->p[2]; + tmp.p[2] = p_src->p[1]; + + picture_CopyPixels( p_dst, &tmp ); +} static void Convert( filter_t *p_filter, struct SwsContext *ctx, - picture_t *p_dst, picture_t *p_src, int i_height, int i_plane_start, int i_plane_count ) + picture_t *p_dst, picture_t *p_src, int i_height, int i_plane_start, int i_plane_count, + bool b_swap_uvi, bool b_swap_uvo ) { uint8_t palette[AVPALETTE_SIZE]; - uint8_t *src[3]; int src_stride[3]; - uint8_t *dst[3]; int dst_stride[3]; + uint8_t *src[4]; int src_stride[4]; + uint8_t *dst[4]; int dst_stride[4]; - GetPixels( src, src_stride, p_src, i_plane_start, i_plane_count ); + GetPixels( src, src_stride, p_src, i_plane_start, i_plane_count, b_swap_uvi ); if( p_filter->fmt_in.video.i_chroma == VLC_CODEC_RGBP ) { memset( palette, 0, sizeof(palette) ); @@ -518,7 +549,7 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, src_stride[1] = 4; } - GetPixels( dst, dst_stride, p_dst, i_plane_start, i_plane_count ); + GetPixels( dst, dst_stride, p_dst, i_plane_start, i_plane_count, b_swap_uvo ); #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) sws_scale( ctx, src, src_stride, 0, i_height, @@ -567,10 +598,13 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) CopyPad( p_src, p_pic ); } - if( p_sys->b_copy ) + if( p_sys->b_copy && p_sys->b_swap_uvi == p_sys->b_swap_uvo ) picture_CopyPixels( p_dst, p_src ); + else if( p_sys->b_copy ) + SwapUV( p_dst, p_src ); else - Convert( p_filter, p_sys->ctx, p_dst, p_src, p_fmti->i_height, 0, 3 ); + Convert( p_filter, p_sys->ctx, p_dst, p_src, p_fmti->i_height, 0, 3, + p_sys->b_swap_uvi, p_sys->b_swap_uvo ); if( p_sys->ctxA ) { /* We extract the A plane to rescale it, and then we reinject it. */ @@ -579,7 +613,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) else plane_CopyPixels( p_sys->p_src_a->p, p_src->p+A_PLANE ); - Convert( p_filter, p_sys->ctxA, p_sys->p_dst_a, p_sys->p_src_a, p_fmti->i_height, 0, 1 ); + Convert( p_filter, p_sys->ctxA, p_sys->p_dst_a, p_sys->p_src_a, p_fmti->i_height, 0, 1, false, false ); if( p_fmto->i_chroma == VLC_CODEC_RGBA ) InjectA( p_dst, p_sys->p_dst_a, p_fmto->i_width * p_sys->i_extend_factor, p_fmto->i_height ); else