This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l2-compliance: show v4l2_window diffs Author: Hans Verkuil <hverkuil-ci...@xs4all.nl> Date: Wed Jul 17 15:19:54 2019 +0200 If S_FMT(G_FMT) returns a different overlay format, then show the differences. Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> utils/v4l2-compliance/v4l2-test-formats.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=2d10b5d6dfbb2c831332941c00633ea1688d72db diff --git a/utils/v4l2-compliance/v4l2-test-formats.cpp b/utils/v4l2-compliance/v4l2-test-formats.cpp index c762b3df8141..16a6fb88dc70 100644 --- a/utils/v4l2-compliance/v4l2-test-formats.cpp +++ b/utils/v4l2-compliance/v4l2-test-formats.cpp @@ -621,6 +621,8 @@ static bool matchFormats(const struct v4l2_format &f1, const struct v4l2_format { const struct v4l2_pix_format &pix1 = f1.fmt.pix; const struct v4l2_pix_format &pix2 = f2.fmt.pix; + const struct v4l2_window &win1 = f1.fmt.win; + const struct v4l2_window &win2 = f2.fmt.win; if (f1.type != f2.type) return false; @@ -638,7 +640,15 @@ static bool matchFormats(const struct v4l2_format &f1, const struct v4l2_format return false; case V4L2_BUF_TYPE_VIDEO_OVERLAY: case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: - return !memcmp(&f1.fmt.win, &f2.fmt.win, sizeof(f1.fmt.win)); + if (!memcmp(&f1.fmt.win, &f2.fmt.win, sizeof(f1.fmt.win))) + return true; + printf("\t\tG_FMT: %dx%d@%dx%d, %d, %x, %p, %d, %p, %x\n", + win1.w.width, win1.w.height, win1.w.left, win1.w.top, win1.field, + win1.chromakey, win1.clips, win1.clipcount, win1.bitmap, win1.global_alpha); + printf("\t\tTRY/S_FMT: %dx%d@%dx%d, %d, %x, %p, %d, %p, %x\n", + win2.w.width, win2.w.height, win2.w.left, win2.w.top, win2.field, + win2.chromakey, win2.clips, win2.clipcount, win2.bitmap, win2.global_alpha); + return false; case V4L2_BUF_TYPE_VBI_CAPTURE: case V4L2_BUF_TYPE_VBI_OUTPUT: return !memcmp(&f1.fmt.vbi, &f2.fmt.vbi, sizeof(f1.fmt.vbi)); _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
