This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: v4l2-compliance: prohibit the use of V4L2_BUF_TYPE_PRIVATE. Author: Hans Verkuil <[email protected]> Date: Mon Oct 1 10:44:41 2012 +0200 It is no longer allowed to use this buffer type. Signed-off-by: Hans Verkuil <[email protected]> (cherry picked from commit fea2269c3e52893ee7717b085e22478413a59527) Signed-off-by: Gregor Jasny <[email protected]> utils/v4l2-compliance/v4l2-test-formats.cpp | 41 +++++++++----------------- 1 files changed, 14 insertions(+), 27 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=752361f802551f8cb6f1010175d15712731f715e diff --git a/utils/v4l2-compliance/v4l2-test-formats.cpp b/utils/v4l2-compliance/v4l2-test-formats.cpp index 73c0f6a..29e3900 100644 --- a/utils/v4l2-compliance/v4l2-test-formats.cpp +++ b/utils/v4l2-compliance/v4l2-test-formats.cpp @@ -289,13 +289,9 @@ int testEnumFormats(struct node *node) } ret = testEnumFormatsType(node, V4L2_BUF_TYPE_PRIVATE); - if (ret && ret != ENOTTY) - return ret; - if (!ret) { - supported = true; - warn("Buffer type PRIVATE allowed!\n"); - } - + if (ret != ENOTTY && ret != EINVAL) + return fail("Buffer type PRIVATE allowed!\n"); + ret = testEnumFrameSizes(node, 0x20202020); if (ret != ENOTTY) return fail("Accepted framesize for invalid format\n"); @@ -516,16 +512,11 @@ int testGetFormats(struct node *node) } } - memset(&fmt, 0xff, sizeof(fmt)); + memset(&fmt, 0, sizeof(fmt)); fmt.type = V4L2_BUF_TYPE_PRIVATE; ret = doioctl(node, VIDIOC_G_FMT, &fmt); - ret = testFormatsType(node, ret, V4L2_BUF_TYPE_PRIVATE, fmt); - if (ret && ret != ENOTTY) - return ret; - if (!ret) { - supported = true; - warn("Buffer type PRIVATE allowed!\n"); - } + if (ret != ENOTTY && ret != EINVAL) + return fail("Buffer type PRIVATE allowed!\n"); return supported ? 0 : ENOTTY; } @@ -575,11 +566,11 @@ int testTryFormats(struct node *node) buftype2s(type).c_str()); } - memset(&fmt, 0xff, sizeof(fmt)); + memset(&fmt, 0, sizeof(fmt)); fmt.type = V4L2_BUF_TYPE_PRIVATE; ret = doioctl(node, VIDIOC_TRY_FMT, &fmt); - if (!ret) - warn("Buffer type PRIVATE allowed!\n"); + if (ret != ENOTTY && ret != EINVAL) + return fail("Buffer type PRIVATE allowed!\n"); return node->valid_buftypes ? 0 : ENOTTY; } @@ -736,11 +727,11 @@ int testSetFormats(struct node *node) return fail("%s: S_FMT(G_FMT) != G_FMT\n", buftype2s(type).c_str()); } - memset(&fmt, 0xff, sizeof(fmt)); + memset(&fmt, 0, sizeof(fmt)); fmt.type = V4L2_BUF_TYPE_PRIVATE; ret = doioctl(node, VIDIOC_S_FMT, &fmt); - if (!ret) - warn("Buffer type PRIVATE allowed!\n"); + if (ret != ENOTTY && ret != EINVAL) + return fail("Buffer type PRIVATE allowed!\n"); if (!node->valid_buftypes) return ENOTTY; @@ -918,11 +909,7 @@ int testParm(struct node *node) } ret = testParmType(node, V4L2_BUF_TYPE_PRIVATE); - if (ret && ret != ENOTTY) - return ret; - if (!ret) { - supported = true; - warn("Buffer type PRIVATE allowed!\n"); - } + if (ret != ENOTTY && ret != EINVAL) + return fail("Buffer type PRIVATE allowed!\n"); return supported ? 0 : ENOTTY; } _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
