#ifdef HAVE_LIBSWSCALE_SWSCALE_H
# include <libswscale/swscale.h>
+# include <libavcodec/avcodec.h>
#elif defined(HAVE_FFMPEG_SWSCALE_H)
# include <ffmpeg/swscale.h>
+# include <ffmpeg/avcodec.h>
#endif
/* Gruikkkkkkkkkk!!!!! */
-#include "../codec/avcodec/chroma.h"
+#include "../codec/avcodec/avcodec.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", 1000 );
- 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_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;
};
static picture_t *Filter( filter_t *, picture_t * );
static int Init( filter_t * );
static void Clean( filter_t * );
-static int GetParameters( int *pi_fmti, int *pi_fmto, bool *pb_has_a, bool *pb_add_a, int *pi_sws_flags,
- const video_format_t *p_fmti,
+typedef struct
+{
+ int i_fmti;
+ int i_fmto;
+ bool b_has_a;
+ bool b_add_a;
+ int i_sws_flags;
+ bool b_copy;
+} ScalerConfiguration;
+
+static int GetParameters( ScalerConfiguration *,
+ 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, NULL, NULL, NULL, NULL,
+ 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 int GetParameters( int *pi_fmti, int *pi_fmto, bool *pb_has_a, bool *pb_add_a, int *pi_sws_flags,
- const video_format_t *p_fmti,
+static int GetParameters( ScalerConfiguration *p_cfg,
+ 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;
+ 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 )
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 )
+
+ if( p_fmti->i_chroma == VLC_FOURCC( 'Y', 'U', 'V', 'A' ) )
{
- /* 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;
- }
+ i_fmti = PIX_FMT_YUV444P;
+ b_has_ai = true;
+ }
+ else if( p_fmti->i_chroma == VLC_FOURCC( 'R', 'G', 'B', 'A' ) )
+ {
+ i_fmti = PIX_FMT_BGR32;
+ b_has_ai = true;
}
- if( pi_fmti )
- *pi_fmti = i_fmti;
- if( pi_fmto )
- *pi_fmto = i_fmto;
- if( pb_has_a )
- *pb_has_a = b_has_a;
- if( pb_add_a )
- *pb_add_a = b_add_a;
- if( pi_sws_flags )
- *pi_sws_flags = i_sws_flags;
+ if( p_fmto->i_chroma == VLC_FOURCC( 'Y', 'U', 'V', 'A' ) )
+ {
+ i_fmto = PIX_FMT_YUV444P;
+ b_has_ao = true;
+ }
+ else if( p_fmto->i_chroma == VLC_FOURCC( 'R', 'G', 'B', 'A' ) )
+ {
+ i_fmto = PIX_FMT_BGR32;
+ b_has_ao = true;
+ }
+
+ if( p_cfg )
+ {
+ p_cfg->i_fmti = i_fmti;
+ 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->i_sws_flags = i_sws_flags;
+ }
if( i_fmti < 0 || i_fmto < 0 )
return VLC_EGENERIC;
Clean( p_filter );
/* Init with new parameters */
- int i_fmt_in, i_fmt_out;
- bool b_has_a;
- bool b_add_a;
- int i_sws_flags;
- if( GetParameters( &i_fmt_in, &i_fmt_out, &b_has_a, &b_add_a, &i_sws_flags,
- p_fmti, p_fmto, p_sys->i_sws_flags ) )
+ ScalerConfiguration cfg;
+ if( GetParameters( &cfg, p_fmti, p_fmto, p_sys->i_sws_flags ) )
{
msg_Err( p_filter, "format not supported" );
return VLC_EGENERIC;
const unsigned i_fmti_width = p_fmti->i_width * p_sys->i_extend_factor;
const unsigned i_fmto_width = p_fmto->i_width * p_sys->i_extend_factor;
- for( int n = 0; n < (b_has_a ? 2 : 1); n++ )
+ for( int n = 0; n < (cfg.b_has_a ? 2 : 1); n++ )
{
- const int i_fmti = n == 0 ? i_fmt_in : PIX_FMT_GRAY8;
- const int i_fmto = n == 0 ? i_fmt_out : PIX_FMT_GRAY8;
+ const int i_fmti = n == 0 ? cfg.i_fmti : PIX_FMT_GRAY8;
+ const int i_fmto = n == 0 ? cfg.i_fmto : PIX_FMT_GRAY8;
struct SwsContext *ctx;
ctx = sws_getContext( i_fmti_width, p_fmti->i_height, i_fmti,
i_fmto_width, p_fmto->i_height, i_fmto,
- i_sws_flags | p_sys->i_cpu_mask,
+ cfg.i_sws_flags | p_sys->i_cpu_mask,
p_sys->p_src_filter, p_sys->p_dst_filter, 0 );
if( n == 0 )
p_sys->ctx = ctx;
}
if( !p_sys->ctx ||
- ( b_has_a && ( !p_sys->ctxA || !p_sys->p_src_a || !p_sys->p_dst_a ) ) ||
+ ( cfg.b_has_a && ( !p_sys->ctxA || !p_sys->p_src_a || !p_sys->p_dst_a ) ) ||
( p_sys->i_extend_factor != 1 && ( !p_sys->p_src_e || !p_sys->p_dst_e ) ) )
{
msg_Err( p_filter, "could not init SwScaler and/or allocate memory" );
return VLC_EGENERIC;
}
- p_sys->b_add_a = b_add_a;
+ 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;
{
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,
+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 )
{
+ uint8_t palette[AVPALETTE_SIZE];
+
uint8_t *src[3]; int src_stride[3];
uint8_t *dst[3]; int dst_stride[3];
GetPixels( src, src_stride, p_src, i_plane_start, i_plane_count );
+ if( p_filter->fmt_in.video.i_chroma == VLC_FOURCC( 'R', 'G', 'B', 'P' ) )
+ {
+ 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( dst, dst_stride, p_dst, i_plane_start, i_plane_count );
#if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)
CopyPad( p_src, p_pic );
}
- Convert( p_sys->ctx, p_dst, p_src, p_fmti->i_height, 0, 3 );
+ if( p_sys->b_copy )
+ picture_CopyPixels( p_dst, p_src );
+ else
+ Convert( p_filter, p_sys->ctx, p_dst, p_src, p_fmti->i_height, 0, 3 );
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_FOURCC( 'R', 'G', 'B', 'A' ) )
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 );
+ if( p_fmto->i_chroma == VLC_FOURCC( 'R', 'G', 'B', 'A' ) )
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 );
}
- if( p_sys->b_add_a )
+ 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' ) )