mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

video-converter: don't overwrite border alpha

Browse source 
Let border alpha and image alpha be independent.
This commit is contained in:
Wim Taymans 2015-02-25 11:38:17 +01:00
parent c4f071546d
commit 495873298c
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst-libs/gst/video/video-converter.c
View file

@ -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;

5
gst-libs/gst/video/video-converter.h
View file

@ -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"
/**