diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-05-29 16:55:25 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-05-29 16:55:25 +0200 |
| commit | 332dae71981747841370a239b3b557d5ecb1afb9 (patch) | |
| tree | 1ac95ac9e8540b55a954e0826e545fce502910ef | |
| parent | 19b4c4f3358641585dac57ec11f7fff80efcb2dd (diff) | |
| download | gst-plugins-bad-332dae71981747841370a239b3b557d5ecb1afb9.tar.gz gst-plugins-bad-332dae71981747841370a239b3b557d5ecb1afb9.tar.bz2 gst-plugins-bad-332dae71981747841370a239b3b557d5ecb1afb9.zip | |
shapewipe: Divide the border value by two, otherwise we use a twice a wide border
| -rw-r--r-- | gst/shapewipe/gstshapewipe.c | 8 | ||||
| -rw-r--r-- | 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 3efe7cc9..69155990 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 a3aed085..1179aab3 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); |