/* Gruikkkkkkkkkk!!!!! */
#include "../codec/avcodec/chroma.h"
+#define AVPALETTE_SIZE (256 * sizeof(uint32_t))
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
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 );
+ change_integer_list( pi_mode_values, ppsz_mode_descriptions, NULL );
vlc_module_end();
/* Version checking */
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 * );
bool b_has_a;
bool b_add_a;
int i_sws_flags;
+ bool b_copy;
} ScalerConfiguration;
static int GetParameters( ScalerConfiguration *,
* (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)
}
else if( p_fmti->i_chroma == VLC_FOURCC( 'R', 'G', 'B', 'A' ) )
{
- i_fmti = PIX_FMT_RGBA32;
+ i_fmti = PIX_FMT_BGR32;
b_has_ai = true;
}
}
else if( p_fmto->i_chroma == VLC_FOURCC( 'R', 'G', 'B', 'A' ) )
{
- i_fmti = PIX_FMT_RGBA32;
+ i_fmto = PIX_FMT_BGR32;
b_has_ao = true;
}
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_width && p_fmto->i_height;
p_cfg->i_sws_flags = i_sws_flags;
}
}
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;
}
}
-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 )
{
/* We extract the A plane to rescale it, and then we reinject it. */
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