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

tests: fix calculation of last pixel offset in video unit test

Browse source 
And check the right buffer (pix2) in one case.
This commit is contained in:
Tim-Philipp Müller 2011-12-06 20:30:55 +00:00
parent d59648a47f
commit b58b8b1ba5
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/check/libs/video.c
View file

@ -843,7 +843,11 @@ GST_START_TEST (test_overlay_composition)
/* get scaled pixbuf and touch last byte */ /* get scaled pixbuf and touch last byte */
pix1 = gst_video_overlay_rectangle_get_pixels_argb (rect1, &stride, pix1 = gst_video_overlay_rectangle_get_pixels_argb (rect1, &stride,
GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE); GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE);
fail_unless_equals_int (*(GST_BUFFER_DATA (pix1) + (h * stride + w - 1)), 0); fail_unless (GST_BUFFER_SIZE (pix1) > ((h - 1) * stride + (w * 4) - 1),
"size %u vs. last pixel offset %u", GST_BUFFER_SIZE (pix1),
((h - 1) * stride + (w * 4) - 1));
fail_unless_equals_int (*(GST_BUFFER_DATA (pix1) + ((h - 1) * stride +
(w * 4) - 1)), 0);
gst_video_overlay_rectangle_get_render_rectangle (rect2, &x, &y, &w, &h); gst_video_overlay_rectangle_get_render_rectangle (rect2, &x, &y, &w, &h);
fail_unless_equals_int (x, 50); fail_unless_equals_int (x, 50);
@ -854,7 +858,11 @@ GST_START_TEST (test_overlay_composition)
/* get scaled pixbuf and touch last byte */ /* get scaled pixbuf and touch last byte */
pix2 = gst_video_overlay_rectangle_get_pixels_argb (rect2, &stride, pix2 = gst_video_overlay_rectangle_get_pixels_argb (rect2, &stride,
GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE); GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE);
fail_unless_equals_int (*(GST_BUFFER_DATA (pix1) + (h * stride + w - 1)), 0); fail_unless (GST_BUFFER_SIZE (pix2) > ((h - 1) * stride + (w * 4) - 1),
"size %u vs. last pixel offset %u", GST_BUFFER_SIZE (pix1),
((h - 1) * stride + (w * 4) - 1));
fail_unless_equals_int (*(GST_BUFFER_DATA (pix2) + ((h - 1) * stride +
(w * 4) - 1)), 0);
/* get scaled pixbuf again, should be the same buffer as before (caching) */ /* get scaled pixbuf again, should be the same buffer as before (caching) */
pix1 = gst_video_overlay_rectangle_get_pixels_argb (rect2, &stride, pix1 = gst_video_overlay_rectangle_get_pixels_argb (rect2, &stride,
@ -873,7 +881,11 @@ GST_START_TEST (test_overlay_composition)
fail_unless_equals_int (h, 50); fail_unless_equals_int (h, 50);
/* touch last byte */ /* touch last byte */
fail_unless_equals_int (*(GST_BUFFER_DATA (pix1) + (h * stride + w - 1)), 0); fail_unless (GST_BUFFER_SIZE (pix1) > ((h - 1) * stride + (w * 4) - 1),
"size %u vs. last pixel offset %u", GST_BUFFER_SIZE (pix1),
((h - 1) * stride + (w * 4) - 1));
fail_unless_equals_int (*(GST_BUFFER_DATA (pix1) + ((h - 1) * stride +
(w * 4) - 1)), 0);
/* test attaching and retrieving of compositions to/from buffers */ /* test attaching and retrieving of compositions to/from buffers */
buf = gst_buffer_new (); buf = gst_buffer_new ();