v4l2-compliance: add tests for VIDIOC_S_HW_FREQ_SEEK.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

diff --git a/utils/v4l2-compliance/v4l2-compliance.cpp b/utils/v4l2-compliance/v4l2-compliance.cpp
index 9de3df4e733bd28850c559407efa7aa7440f0045..1b4a81645e90cd3c6c377f3dda23363049778c08 100644 (file)
--- a/utils/v4l2-compliance/v4l2-compliance.cpp
+++ b/utils/v4l2-compliance/v4l2-compliance.cpp
@@ -565,6 +565,7 @@ int main(int argc, char **argv)
        printf("Input ioctls:\n");
        printf("\ttest VIDIOC_G/S_TUNER: %s\n", ok(testTuner(&node)));
        printf("\ttest VIDIOC_G/S_FREQUENCY: %s\n", ok(testTunerFreq(&node)));
+       printf("\ttest VIDIOC_S_HW_FREQ_SEEK: %s\n", ok(testTunerHwSeek(&node)));
        printf("\ttest VIDIOC_ENUMAUDIO: %s\n", ok(testEnumInputAudio(&node)));
        printf("\ttest VIDIOC_G/S/ENUMINPUT: %s\n", ok(testInput(&node)));
        printf("\ttest VIDIOC_G/S_AUDIO: %s\n", ok(testInputAudio(&node)));
@@ -618,7 +619,6 @@ int main(int argc, char **argv)
           VIDIOC_S/TRY_FMT
           VIDIOC_G/S_PARM
           VIDIOC_G/S_JPEGCOMP
-          VIDIOC_S_HW_FREQ_SEEK
           VIDIOC_(TRY_)ENCODER_CMD
           VIDIOC_G_ENC_INDEX
           VIDIOC_REQBUFS/QBUF/DQBUF/QUERYBUF

diff --git a/utils/v4l2-compliance/v4l2-compliance.h b/utils/v4l2-compliance/v4l2-compliance.h
index b22011cc33cc7ba3bcbc0c2b66f1d12305bd5ed6..46cabb6d28b1a12b02cce2c335aa704a240b0ffa 100644 (file)
--- a/utils/v4l2-compliance/v4l2-compliance.h
+++ b/utils/v4l2-compliance/v4l2-compliance.h
@@ -136,6 +136,7 @@ int testLogStatus(struct node *node);
 // Input ioctl tests
 int testTuner(struct node *node);
 int testTunerFreq(struct node *node);
+int testTunerHwSeek(struct node *node);
 int testEnumInputAudio(struct node *node);
 int testInput(struct node *node);
 int testInputAudio(struct node *node);

diff --git a/utils/v4l2-compliance/v4l2-test-input-output.cpp b/utils/v4l2-compliance/v4l2-test-input-output.cpp
index efb9bd090157a15d3b5a77095e410063a288088b..500d2ce330570c7d7312e328b1741d3933afe0c2 100644 (file)
--- a/utils/v4l2-compliance/v4l2-test-input-output.cpp
+++ b/utils/v4l2-compliance/v4l2-test-input-output.cpp
@@ -239,6 +239,40 @@ int testTunerFreq(struct node *node)
        return node->tuners ? 0 : ENOTTY;
 }
 
+int testTunerHwSeek(struct node *node)
+{
+       struct v4l2_hw_freq_seek seek;
+       int ret;
+
+       memset(&seek, 0, sizeof(seek));
+       seek.type = V4L2_TUNER_RADIO;
+       ret = doioctl(node, VIDIOC_S_HW_FREQ_SEEK, &seek);
+       if (!(node->caps & V4L2_CAP_HW_FREQ_SEEK) && ret != ENOTTY)
+               return fail("hw seek supported but capability not set\n");
+       if (!node->is_radio && ret != ENOTTY)
+               return fail("hw seek supported on a non-radio node?!\n");
+       if (!node->is_radio || !(node->caps & V4L2_CAP_HW_FREQ_SEEK))
+               return ENOTTY;
+       seek.type = V4L2_TUNER_ANALOG_TV;
+       ret = doioctl(node, VIDIOC_S_HW_FREQ_SEEK, &seek);
+       if (ret != EINVAL)
+               return fail("hw seek accepted TV tuner\n");
+       seek.type = V4L2_TUNER_RADIO;
+       seek.seek_upward = 1;
+       ret = doioctl(node, VIDIOC_S_HW_FREQ_SEEK, &seek);
+       if (ret == EINVAL) {
+               seek.wrap_around = 1;
+               ret = doioctl(node, VIDIOC_S_HW_FREQ_SEEK, &seek);
+       }
+       if (ret == EINVAL)
+               return fail("neither wrap_around value was accepted\n");
+       if (ret)
+               return fail("hw seek failed with error %d\n", ret);
+       if (check_0(seek.reserved, sizeof(seek.reserved)))
+               return fail("non-zero reserved fields\n");
+       return 0;
+}
+
 static int checkInput(struct node *node, const struct v4l2_input &descr, unsigned i)
 {
        __u32 mask = (1 << node->audio_inputs) - 1;