From 88f4bd4efd6aee60684696c720dcd0d2d50d6216 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 29 May 2009 16:55:25 +0200 Subject: [PATCH] [MOVED FROM BAD 04/29] shapewipe: Divide the border value by two, otherwise we use a twice a wide border --- gst/shapewipe/gstshapewipe.c | 8 ++++---- tests/examples/shapewipe/shapewipe-example.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gst/shapewipe/gstshapewipe.c b/gst/shapewipe/gstshapewipe.c index 3efe7cc92..69155990f 100644 --- a/gst/shapewipe/gstshapewipe.c +++ b/gst/shapewipe/gstshapewipe.c @@ -556,8 +556,8 @@ gst_shape_wipe_blend_16 (GstShapeWipe * self, GstBuffer * inbuf, guint i, j; guint mask_increment = GST_ROUND_UP_2 (self->width) - self->width; gfloat position = self->mask_position; - gfloat low = MAX (0.0, position - self->mask_border); - gfloat high = MIN (1.0, position + self->mask_border); + gfloat low = MAX (0.0, position - (self->mask_border / 2.0)); + gfloat high = MIN (1.0, position + (self->mask_border / 2.0)); for (i = 0; i < self->height; i++) { for (j = 0; j < self->width; j++) { @@ -602,8 +602,8 @@ gst_shape_wipe_blend_8 (GstShapeWipe * self, GstBuffer * inbuf, guint i, j; guint mask_increment = GST_ROUND_UP_4 (self->width) - self->width; gfloat position = self->mask_position; - gfloat low = MAX (0.0, position - self->mask_border); - gfloat high = MIN (1.0, position + self->mask_border); + gfloat low = MAX (0.0, position - (self->mask_border / 2.0)); + gfloat high = MIN (1.0, position + (self->mask_border / 2.0)); for (i = 0; i < self->height; i++) { for (j = 0; j < self->width; j++) { diff --git a/tests/examples/shapewipe/shapewipe-example.c b/tests/examples/shapewipe/shapewipe-example.c index a3aed0852..1179aab3c 100644 --- a/tests/examples/shapewipe/shapewipe-example.c +++ b/tests/examples/shapewipe/shapewipe-example.c @@ -67,7 +67,7 @@ main (gint argc, gchar ** argv) pipeline_string = g_strdup_printf - ("videotestsrc ! video/x-raw-yuv,width=640,height=480 ! shapewipe name=shape border=0.01 ! videomixer name=mixer ! ffmpegcolorspace ! autovideosink filesrc location=%s ! typefind ! decodebin2 ! ffmpegcolorspace ! videoscale ! queue ! shape.mask_sink videotestsrc pattern=snow ! video/x-raw-yuv,width=640,height=480 ! queue ! mixer.", + ("videotestsrc ! video/x-raw-yuv,width=640,height=480 ! shapewipe name=shape border=0.05 ! videomixer name=mixer ! ffmpegcolorspace ! autovideosink filesrc location=%s ! typefind ! decodebin2 ! ffmpegcolorspace ! videoscale ! queue ! shape.mask_sink videotestsrc pattern=snow ! video/x-raw-yuv,width=640,height=480 ! queue ! mixer.", argv[1]); pipeline = gst_parse_launch (pipeline_string, NULL); -- 2.34.1