From 9fa7934239f259af8b86ea3395baa3b30e3a0d33 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 13 Feb 2019 11:12:11 +0000 Subject: test: v4l2_device: Use VIVID capture stream Utilise the VIVID capture device for testing the V4L2Device objects. Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- test/v4l2_device/v4l2_device_test.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'test') diff --git a/test/v4l2_device/v4l2_device_test.cpp b/test/v4l2_device/v4l2_device_test.cpp index 18d014ca..a2a7ba82 100644 --- a/test/v4l2_device/v4l2_device_test.cpp +++ b/test/v4l2_device/v4l2_device_test.cpp @@ -39,22 +39,22 @@ int V4L2DeviceTest::init() return TestFail; } - DeviceMatch dm("uvcvideo"); - media_ = std::move(enumerator_->search(dm)); + DeviceMatch dm("vivid"); + dm.add("vivid-000-vid-cap"); + + media_ = enumerator_->search(dm); if (!media_) return TestSkip; media_->acquire(); - for (MediaEntity *entity : media_->entities()) { - if (entity->flags() & MEDIA_ENT_FL_DEFAULT) { - dev_ = new V4L2Device(entity); - break; - } - } + MediaEntity *entity = media_->getEntityByName("vivid-000-vid-cap"); + if (!entity) + return TestSkip; + dev_ = new V4L2Device(entity); if (!dev_) - return TestSkip; + return TestFail; return dev_->open(); } -- cgit v1.2.1