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 multi and single plane caps
Author:  Hans Verkuil <[email protected]>
Date:    Mon Oct 1 10:35:54 2012 +0200

Either multiplanar caps should be used or single planar, but not both.

Signed-off-by: Hans Verkuil <[email protected]>
(cherry picked from commit f1d4a75587ddd31a0af0ba1614269b252bfa19c2)

Signed-off-by: Gregor Jasny <[email protected]>

 utils/v4l2-compliance/v4l2-compliance.cpp |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

---

http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=d6b34e774a51fcf168cb643aba2b20169427943a

diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp 
b/utils/v4l2-compliance/v4l2-compliance.cpp
index 8cb1e10..b839fde 100644
--- a/utils/v4l2-compliance/v4l2-compliance.cpp
+++ b/utils/v4l2-compliance/v4l2-compliance.cpp
@@ -263,6 +263,10 @@ static int testCap(struct node *node)
                        V4L2_CAP_RDS_OUTPUT;
        const __u32 m2m_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE;
        const __u32 io_caps = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
+       const __u32 mplane_caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE | 
V4L2_CAP_VIDEO_OUTPUT_MPLANE |
+               V4L2_CAP_VIDEO_M2M_MPLANE;
+       const __u32 splane_caps = V4L2_CAP_VIDEO_CAPTURE | 
V4L2_CAP_VIDEO_OUTPUT |
+               V4L2_CAP_VIDEO_M2M;
 
        memset(&vcap, 0xff, sizeof(vcap));
        // Must always be there
@@ -316,6 +320,8 @@ static int testCap(struct node *node)
                fail_on_test(!(dcaps & io_caps));
        else
                fail_on_test(dcaps & io_caps);
+       // having both mplane and splane caps is not allowed (at least for now)
+       fail_on_test((dcaps & mplane_caps) && (dcaps & splane_caps));
 
        return 0;
 }

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to