From: Kunal Joshi <kunal1.joshi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Kunal Joshi <kunal1.joshi@intel.com>,
ville.syrjala@intel.com, petri.latvala@intel.com,
daniel.vetter@intel.com
Subject: [igt-dev] [PATCH i-g-t v3 1/3] lib/igt_chamelium Added chamelium_frame_match_or_dump which returns bool that the captured frame matches
Date: Tue, 21 Jan 2020 11:24:13 +0530 [thread overview]
Message-ID: <1579586055-27583-2-git-send-email-kunal1.joshi@intel.com> (raw)
In-Reply-To: <1579586055-27583-1-git-send-email-kunal1.joshi@intel.com>
Added chamelium_frame_match_or_dump which returns bool that the captured
frame matches with reference framebuffer.
(v2)
Removed previously added function chamelium_assert_frame_dump_eq.
(v3)
No change.
Signed-off-by: Kunal Joshi <kunal1.joshi@intel.com>
Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
Suggested-by: Uma Shankar <uma.shankar@intel.com>
---
lib/igt_chamelium.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/igt_chamelium.h | 5 +++++
2 files changed, 70 insertions(+)
diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c
index 9971f51..db1f2b6 100644
--- a/lib/igt_chamelium.c
+++ b/lib/igt_chamelium.c
@@ -1632,6 +1632,71 @@ void chamelium_assert_frame_match_or_dump(struct chamelium *chamelium,
}
/**
+ * chamelium_assert_frame_match_or_dump:
+ * @chamelium: The chamelium instance the frame dump belongs to
+ * @frame: The chamelium frame dump to match
+ * @fb: pointer to an #igt_fb structure
+ * @check: the type of frame matching check to use
+ *
+ * Returns bool that the provided captured frame matches the reference
+ * frame from the framebuffer. If they do not, this saves the reference
+ * and captured frames to a png file.
+ */
+bool chamelium_frame_match_or_dump(struct chamelium *chamelium,
+ struct chamelium_port *port,
+ const struct chamelium_frame_dump *frame,
+ struct igt_fb *fb,
+ enum chamelium_check check)
+{
+ cairo_surface_t *reference;
+ cairo_surface_t *capture;
+ igt_crc_t *reference_crc;
+ igt_crc_t *capture_crc;
+ bool match;
+
+ /* Grab the reference frame from framebuffer */
+ reference = igt_get_cairo_surface(chamelium->drm_fd, fb);
+
+ /* Grab the captured frame from chamelium */
+ capture = convert_frame_dump_argb32(frame);
+
+ switch (check) {
+ case CHAMELIUM_CHECK_ANALOG:
+ match = igt_check_analog_frame_match(reference, capture);
+ break;
+ case CHAMELIUM_CHECK_CHECKERBOARD:
+ match = igt_check_checkerboard_frame_match(reference, capture);
+ break;
+ default:
+ igt_assert(false);
+ }
+
+ if (!match && igt_frame_dump_is_enabled()) {
+ reference_crc = malloc(sizeof(igt_crc_t));
+ igt_assert(reference_crc);
+
+ /* Calculate the reference frame CRC. */
+ chamelium_do_calculate_fb_crc(reference, reference_crc);
+
+ /* Get the captured frame CRC from the Chamelium. */
+ capture_crc = chamelium_get_crc_for_area(chamelium, port, 0, 0,
+ 0, 0);
+ igt_assert(capture_crc);
+
+ compared_frames_dump(reference, capture, reference_crc,
+ capture_crc);
+
+ free(reference_crc);
+ free(capture_crc);
+ }
+
+ cairo_surface_destroy(reference);
+ cairo_surface_destroy(capture);
+
+ return match;
+}
+
+/**
* chamelium_analog_frame_crop:
* @chamelium: The Chamelium instance to use
* @dump: The chamelium frame dump to crop
diff --git a/lib/igt_chamelium.h b/lib/igt_chamelium.h
index 08705a9..d03c924 100644
--- a/lib/igt_chamelium.h
+++ b/lib/igt_chamelium.h
@@ -204,6 +204,11 @@ void chamelium_assert_frame_match_or_dump(struct chamelium *chamelium,
const struct chamelium_frame_dump *frame,
struct igt_fb *fb,
enum chamelium_check check);
+bool chamelium_frame_match_or_dump(struct chamelium *chamelium,
+ struct chamelium_port *port,
+ const struct chamelium_frame_dump *frame,
+ struct igt_fb *fb,
+ enum chamelium_check check);
void chamelium_crop_analog_frame(struct chamelium_frame_dump *dump, int width,
int height);
void chamelium_destroy_frame_dump(struct chamelium_frame_dump *dump);
--
2.7.4
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2020-01-21 12:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-21 5:54 [igt-dev] [PATCH i-g-t v3 0/3] validate color tests using chamelium Kunal Joshi
2020-01-21 5:54 ` Kunal Joshi [this message]
2020-01-21 13:29 ` [igt-dev] [PATCH i-g-t v3 1/3] lib/igt_chamelium Added chamelium_frame_match_or_dump which returns bool that the captured frame matches Petri Latvala
2020-01-22 3:01 ` Kunal Joshi
2020-01-22 10:34 ` Petri Latvala
2020-01-21 5:54 ` [igt-dev] [PATCH i-g-t v3 3/3] tests/kms_color_chamelium: add subtests to validate color Kunal Joshi
2020-01-21 13:51 ` Petri Latvala
2020-01-23 7:00 ` Kunal Joshi
[not found] ` <1579586055-27583-3-git-send-email-kunal1.joshi@intel.com>
2020-01-21 13:42 ` [igt-dev] [PATCH i-g-t v3 2/3] lib/igt_color Moved kms_color functions to lib/igt_color to git avoid code duplication Petri Latvala
2020-01-21 13:43 ` [igt-dev] ✓ Fi.CI.BAT: success for validate color tests using chamelium. (rev3) Patchwork
2020-01-22 12:10 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1579586055-27583-2-git-send-email-kunal1.joshi@intel.com \
--to=kunal1.joshi@intel.com \
--cc=daniel.vetter@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=petri.latvala@intel.com \
--cc=ville.syrjala@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox