#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <assert.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_vout.h>
#include <vlc_filter.h>
+#include <vlc_cpu.h>
#ifdef HAVE_LIBSWSCALE_SWSCALE_H
# include <libswscale/swscale.h>
# include <ffmpeg/swscale.h>
#endif
+#include "../codec/avcodec/chroma.h" // Chroma Avutil <-> VLC conversion
+
/* Gruikkkkkkkkkk!!!!! */
-#include "../codec/avcodec/chroma.h"
+#undef AVPALETTE_SIZE
+#define AVPALETTE_SIZE (256 * sizeof(uint32_t))
/*****************************************************************************
* Module descriptor
N_("Area"), N_("Luma bicubic / chroma bilinear"), N_("Gauss"),
N_("SincR"), N_("Lanczos"), N_("Bicubic spline") };
-vlc_module_begin();
- set_description( N_("Video scaling filter") );
- set_capability( "video filter2", 55 );
- 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, 0 );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Video scaling filter") )
+ set_shortname( N_("Swscale" ) )
+ set_capability( "video filter2", 150 )
+ 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 )
+vlc_module_end ()
/* Version checking */
#if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)
picture_t *p_src_e;
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 * );
bool b_has_a;
bool b_add_a;
int i_sws_flags;
+ bool b_copy;
+ bool b_swap_uvi;
+ bool b_swap_uvo;
} ScalerConfiguration;
static int GetParameters( ScalerConfiguration *,
- const video_format_t *p_fmti,
+ const video_format_t *p_fmti,
const video_format_t *p_fmto,
int i_sws_flags_default );
* (change it to true to try) */
#define ALLOW_YUVP (false)
/* SwScaler does not like too small picture */
-#define MINIMUM_WIDTH (16)
+#define MINIMUM_WIDTH (32)
/* XXX is it always 3 even for BIG_ENDIAN (blend.c seems to think so) ? */
#define OFFSET_A (3)
int i_sws_mode;
- float sws_lum_gblur = 0.0, sws_chr_gblur = 0.0;
- int sws_chr_vshift = 0, sws_chr_hshift = 0;
- float sws_chr_sharpen = 0.0, sws_lum_sharpen = 0.0;
-
if( GetParameters( NULL,
&p_filter->fmt_in.video,
&p_filter->fmt_out.video, 0 ) )
- {
return VLC_EGENERIC;
- }
/* */
p_filter->pf_video_filter = Filter;
default: p_sys->i_sws_flags = SWS_BICUBIC; i_sws_mode = 2; break;
}
- p_sys->p_src_filter =
- sws_getDefaultFilter( sws_lum_gblur, sws_chr_gblur,
- sws_lum_sharpen, sws_chr_sharpen,
- sws_chr_hshift, sws_chr_vshift, 0 );
+ p_sys->p_src_filter = NULL;
p_sys->p_dst_filter = NULL;
/* Misc init */
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_fmti,
const video_format_t *p_fmto,
int i_sws_flags_default )
{
- int i_fmti = GetFfmpegChroma( p_fmti->i_chroma );
- int i_fmto = GetFfmpegChroma( p_fmto->i_chroma );
+ int i_fmti = -1;
+ int i_fmto = -1;
- bool b_has_a = false;
- bool b_add_a = false;
+ 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 );
if( p_fmti->i_chroma == p_fmto->i_chroma )
{
- if( p_fmti->i_chroma == VLC_FOURCC( 'Y', 'U', 'V', 'P' ) && ALLOW_YUVP )
+ if( p_fmti->i_chroma == VLC_CODEC_YUVP && ALLOW_YUVP )
{
i_fmti = i_fmto = PIX_FMT_GRAY8;
i_sws_flags = SWS_POINT;
}
- else if( p_fmti->i_chroma == VLC_FOURCC( 'Y', 'U', 'V', 'A' ) )
- {
- i_fmti = i_fmto = PIX_FMT_YUV444P;
- b_has_a = true;
- }
- else if( p_fmti->i_chroma == VLC_FOURCC( 'R', 'G', 'B', 'A' ) )
- {
- i_fmti = i_fmto = PIX_FMT_RGBA32;
- b_has_a = true;
- }
}
- if( i_fmti >= 0 && i_fmto < 0 )
+
+ 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 );
+
+ /* FIXME TODO removed when ffmpeg is fixed
+ * Without SWS_ACCURATE_RND the quality is really bad for some conversions */
+ switch( i_fmto )
{
- /* Special case: injecting dummy alpha plane */
- switch( p_fmto->i_chroma )
- {
- case VLC_FOURCC( 'Y', 'U', 'V', 'A' ):
- i_fmto = PIX_FMT_YUV444P;
- b_add_a = true;
- break;
- case VLC_FOURCC( 'R', 'G', 'B', 'A' ):
- i_fmto = PIX_FMT_RGBA32;
- b_add_a = true;
- break;
- default:
- break;
- }
+ case PIX_FMT_ARGB:
+ case PIX_FMT_RGBA:
+ case PIX_FMT_ABGR:
+ i_sws_flags |= SWS_ACCURATE_RND;
+ break;
}
if( p_cfg )
{
p_cfg->i_fmti = i_fmti;
p_cfg->i_fmto = i_fmto;
- p_cfg->b_has_a = b_has_a;
- p_cfg->b_add_a = b_add_a;
+ 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_swap_uvi = b_swap_uvi;
+ p_cfg->b_swap_uvo = b_swap_uvo;
p_cfg->i_sws_flags = i_sws_flags;
}
}
if( p_sys->ctxA )
{
- p_sys->p_src_a = picture_New( VLC_FOURCC( 'G', 'R', 'E', 'Y' ), i_fmti_width, p_fmti->i_height, 0 );
- p_sys->p_dst_a = picture_New( VLC_FOURCC( 'G', 'R', 'E', 'Y' ), 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 );
}
p_sys->b_add_a = cfg.b_add_a;
+ 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;
#if 0
msg_Dbg( p_filter, "%ix%i chroma: %4.4s -> %ix%i chroma: %4.4s extend by %d",
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;
{
plane_t *d = &p_dst->p[0];
const plane_t *s = &p_src->p[0];
-
+
for( unsigned y = 0; y < i_height; y++ )
for( unsigned x = 0; x < i_width; x++ )
d->p_pixels[y*d->i_pitch+x] = s->p_pixels[y*s->i_pitch+4*x+OFFSET_A];
{
plane_t *d = &p_dst->p[0];
const plane_t *s = &p_src->p[0];
-
+
for( unsigned y = 0; y < i_height; y++ )
for( unsigned x = 0; x < i_width; x++ )
d->p_pixels[y*d->i_pitch+4*x+OFFSET_A] = s->p_pixels[y*s->i_pitch+x];
}
}
-static void Convert( struct SwsContext *ctx,
- picture_t *p_dst, picture_t *p_src, int i_height, int i_plane_start, int i_plane_count )
+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,
+ bool b_swap_uvi, bool b_swap_uvo )
{
- uint8_t *src[3]; int src_stride[3];
- uint8_t *dst[3]; int dst_stride[3];
+ uint8_t palette[AVPALETTE_SIZE];
+
+ 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, b_swap_uvi );
+ if( p_filter->fmt_in.video.i_chroma == VLC_CODEC_RGBP )
+ {
+ memset( palette, 0, sizeof(palette) );
+ if( p_filter->fmt_in.video.p_palette )
+ memcpy( palette, p_filter->fmt_in.video.p_palette->palette,
+ __MIN( sizeof(video_palette_t), AVPALETTE_SIZE ) );
+ src[1] = palette;
+ src_stride[1] = 4;
+ }
- GetPixels( src, src_stride, p_src, i_plane_start, i_plane_count );
- 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,
CopyPad( p_src, p_pic );
}
- Convert( p_sys->ctx, p_dst, p_src, p_fmti->i_height, 0, 3 );
+ 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,
+ p_sys->b_swap_uvi, p_sys->b_swap_uvo );
if( p_sys->ctxA )
{
- if( p_fmto->i_chroma == VLC_FOURCC( 'R', 'G', 'B', 'A' ) )
- {
- /* We extract the A plane to rescale it, and then we reinject it. */
+ /* We extract the A plane to rescale it, and then we reinject it. */
+ if( p_fmti->i_chroma == VLC_CODEC_RGBA )
ExtractA( p_sys->p_src_a, p_src, p_fmti->i_width * p_sys->i_extend_factor, p_fmti->i_height );
+ else
+ plane_CopyPixels( p_sys->p_src_a->p, p_src->p+A_PLANE );
- Convert( 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
- {
- Convert( p_sys->ctxA, p_dst, p_src, p_fmti->i_height, 3, 1 );
- }
+ plane_CopyPixels( p_dst->p+A_PLANE, p_sys->p_dst_a->p );
}
else if( p_sys->b_add_a )
{
/* We inject a complete opaque alpha plane */
- if( p_fmto->i_chroma == VLC_FOURCC( 'R', 'G', 'B', 'A' ) )
+ if( p_fmto->i_chroma == VLC_CODEC_RGBA )
FillA( &p_dst->p[0], OFFSET_A );
else
FillA( &p_dst->p[A_PLANE], 0 );
projects / vlc / blobdiff