From 495873298ce0f8fa01d7647c316270626029162f Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 25 Feb 2015 11:38:17 +0100 Subject: [PATCH] video-converter: don't overwrite border alpha Let border alpha and image alpha be independent. --- gst-libs/gst/video/video-converter.c | 11 ----------- gst-libs/gst/video/video-converter.h | 5 ++--- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/gst-libs/gst/video/video-converter.c b/gst-libs/gst/video/video-converter.c index 849b2c8..b596e57 100644 --- a/gst-libs/gst/video/video-converter.c +++ b/gst-libs/gst/video/video-converter.c @@ -1916,7 +1916,6 @@ gst_video_converter_new (GstVideoInfo * in_info, GstVideoInfo * out_info, GstLineCache *prev; const GstVideoFormatInfo *fin, *fout, *finfo; gdouble alpha_value; - guint8 av255; g_return_val_if_fail (in_info != NULL, NULL); g_return_val_if_fail (out_info != NULL, NULL); @@ -1984,16 +1983,6 @@ gst_video_converter_new (GstVideoInfo * in_info, GstVideoInfo * out_info, alpha_value = GET_OPT_ALPHA_VALUE (convert); convert->alpha_value = 255 * alpha_value; - if (CHECK_ALPHA_SET (convert)) { - av255 = CLAMP (convert->alpha_value, 0, 255); - } else { - av255 = convert->border_argb >> 24; - if (CHECK_ALPHA_MULT (convert)) { - av255 = (av255 * convert->alpha_value) / 255; - av255 = CLAMP (av255, 0, 255); - } - } - convert->border_argb = (av255 << 24) | (convert->border_argb & 0x00ffffff); convert->alpha_mode = convert_get_alpha_mode (convert); convert->unpack_format = in_info->finfo->unpack_format; diff --git a/gst-libs/gst/video/video-converter.h b/gst-libs/gst/video/video-converter.h index f7cea87..e69d4c0 100644 --- a/gst-libs/gst/video/video-converter.h +++ b/gst-libs/gst/video/video-converter.h @@ -153,9 +153,8 @@ G_BEGIN_DECLS * GST_VIDEO_CONVERTER_OPT_BORDER_ARGB: * * #G_TYPE_UINT, the border color to use if #GST_VIDEO_CONVERTER_OPT_FILL_BORDER - * is set to %TRUE. - * Default 0xff000000 and the alpha component is influenced by - * #GST_VIDEO_CONVERTER_OPT_ALPHA_VALUE and #GST_VIDEO_CONVERTER_OPT_ALPHA_MODE. + * is set to %TRUE. The color is in ARGB format. + * Default 0xff000000 */ #define GST_VIDEO_CONVERTER_OPT_BORDER_ARGB "GstVideoConverter.border-argb" /** -- 2.7.4