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: add tests for QUERYSTD and QUERY_DV_PRESET Author: Hans Verkuil <[email protected]> Date: Fri Jan 21 18:08:56 2011 +0100 Signed-off-by: Hans Verkuil <[email protected]> utils/v4l2-compliance/v4l2-compliance.cpp | 2 +- utils/v4l2-compliance/v4l2-test-io-config.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=0c79f8b5a2d8c2d6b055532cf9b0ae2b1324491a diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp b/utils/v4l2-compliance/v4l2-compliance.cpp index ab69eb7..564a1d8 100644 --- a/utils/v4l2-compliance/v4l2-compliance.cpp +++ b/utils/v4l2-compliance/v4l2-compliance.cpp @@ -531,7 +531,7 @@ int main(int argc, char **argv) printf("Input/Output configuration ioctls:\n"); printf("\ttest VIDIOC_ENUM/S/G/QUERY_STD: %s\n", ok(testStd(&node))); - printf("\ttest VIDIOC_ENUM/S/G_DV_PRESETS: %s\n", ok(testPresets(&node))); + printf("\ttest VIDIOC_ENUM/S/G/QUERY_DV_PRESETS: %s\n", ok(testPresets(&node))); printf("\ttest VIDIOC_S/G_DV_TIMINGS: %s\n", ok(testCustomTimings(&node))); printf("\n"); diff --git a/utils/v4l2-compliance/v4l2-test-io-config.cpp b/utils/v4l2-compliance/v4l2-test-io-config.cpp index 26aa712..8102906 100644 --- a/utils/v4l2-compliance/v4l2-test-io-config.cpp +++ b/utils/v4l2-compliance/v4l2-test-io-config.cpp @@ -90,6 +90,11 @@ static int checkStd(struct node *node, bool has_std, v4l2_std_id mask) return fail("STD cap was not set, but standards can be enumerated\n"); if (std_mask & V4L2_STD_ATSC) return fail("STD mask contains ATSC standards. This is no longer supported\n"); + ret = doioctl(node, VIDIOC_QUERYSTD, &std); + if (!ret && !has_std) + return fail("STD cap was not set, but could still query standard\n"); + if (!ret && (std & ~std_mask)) + return fail("QUERYSTD gives back an unsupported standard\n"); return 0; } @@ -182,6 +187,9 @@ static int checkPresets(struct node *node, bool has_presets) return fail("PRESET cap set, but no presets can be enumerated\n"); if (i && !has_presets) return fail("PRESET cap was not set, but presets can be enumerated\n"); + ret = doioctl(node, VIDIOC_QUERY_DV_PRESET, &preset); + if (!ret && !has_presets) + return fail("PRESET cap was not set, but could still query preset\n"); return 0; } _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
