diff options
Diffstat (limited to 'test/v4l2_videodevice/v4l2_videodevice_test.cpp')
| -rw-r--r-- | test/v4l2_videodevice/v4l2_videodevice_test.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp index 93b9e72d..9fbd24cc 100644 --- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp +++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp @@ -9,10 +9,10 @@ #include <linux/media-bus-format.h> -#include "v4l2_videodevice_test.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" -#include "device_enumerator.h" -#include "media_device.h" +#include "v4l2_videodevice_test.h" using namespace std; using namespace libcamera; @@ -60,9 +60,12 @@ int V4L2VideoDeviceTest::init() if (capture_->getFormat(&format)) return TestFail; + format.size.width = 640; + format.size.height = 480; + if (driver_ == "vimc") { - sensor_ = new CameraSensor(media_->getEntityByName("Sensor A")); - if (sensor_->init()) + sensor_ = CameraSensorFactoryBase::create(media_->getEntityByName("Sensor A")); + if (!sensor_) return TestFail; debayer_ = new V4L2Subdevice(media_->getEntityByName("Debayer A")); @@ -72,7 +75,7 @@ int V4L2VideoDeviceTest::init() format.fourcc = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8); V4L2SubdeviceFormat subformat = {}; - subformat.mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8; + subformat.code = MEDIA_BUS_FMT_SBGGR8_1X8; subformat.size = format.size; if (sensor_->setFormat(&subformat)) @@ -82,8 +85,6 @@ int V4L2VideoDeviceTest::init() return TestFail; } - format.size.width = 640; - format.size.height = 480; if (capture_->setFormat(&format)) return TestFail; @@ -97,6 +98,5 @@ void V4L2VideoDeviceTest::cleanup() capture_->close(); delete debayer_; - delete sensor_; delete capture_; } |