diff options
| -rw-r--r-- | test/v4l2_device/capture_async.cpp | 12 | ||||
| -rw-r--r-- | test/v4l2_device/double_open.cpp | 4 | ||||
| -rw-r--r-- | test/v4l2_device/request_buffers.cpp | 2 | ||||
| -rw-r--r-- | test/v4l2_device/stream_on_off.cpp | 6 | ||||
| -rw-r--r-- | test/v4l2_device/v4l2_device_test.cpp | 8 | ||||
| -rw-r--r-- | test/v4l2_device/v4l2_device_test.h | 7 |
6 files changed, 21 insertions, 18 deletions
diff --git a/test/v4l2_device/capture_async.cpp b/test/v4l2_device/capture_async.cpp index 511368d6..2a41b11e 100644 --- a/test/v4l2_device/capture_async.cpp +++ b/test/v4l2_device/capture_async.cpp @@ -26,7 +26,7 @@ public: frames++; /* Requeue the buffer for further use. */ - dev_->queueBuffer(buffer); + capture_->queueBuffer(buffer); } protected: @@ -40,19 +40,19 @@ protected: pool_.createBuffers(bufferCount); - ret = dev_->exportBuffers(&pool_); + ret = capture_->exportBuffers(&pool_); if (ret) return TestFail; - dev_->bufferReady.connect(this, &CaptureAsyncTest::receiveBuffer); + capture_->bufferReady.connect(this, &CaptureAsyncTest::receiveBuffer); /* Queue all the buffers to the device. */ for (Buffer &b : pool_.buffers()) { - if (dev_->queueBuffer(&b)) + if (capture_->queueBuffer(&b)) return TestFail; } - ret = dev_->streamOn(); + ret = capture_->streamOn(); if (ret) return TestFail; @@ -75,7 +75,7 @@ protected: std::cout << "Processed " << frames << " frames" << std::endl; - ret = dev_->streamOff(); + ret = capture_->streamOff(); if (ret) return TestFail; diff --git a/test/v4l2_device/double_open.cpp b/test/v4l2_device/double_open.cpp index ca2b2014..7ec80a60 100644 --- a/test/v4l2_device/double_open.cpp +++ b/test/v4l2_device/double_open.cpp @@ -22,10 +22,10 @@ protected: * Expect failure: The device has already been opened by the * V4L2DeviceTest base class */ - ret = dev_->open(); + ret = capture_->open(); if (!ret) { std::cout << "Double open erroneously succeeded" << std::endl; - dev_->close(); + capture_->close(); return TestFail; } diff --git a/test/v4l2_device/request_buffers.cpp b/test/v4l2_device/request_buffers.cpp index 26d7d952..938d4f85 100644 --- a/test/v4l2_device/request_buffers.cpp +++ b/test/v4l2_device/request_buffers.cpp @@ -21,7 +21,7 @@ protected: pool_.createBuffers(bufferCount); - int ret = dev_->exportBuffers(&pool_); + int ret = capture_->exportBuffers(&pool_); if (ret) return TestFail; diff --git a/test/v4l2_device/stream_on_off.cpp b/test/v4l2_device/stream_on_off.cpp index 861d8d69..ea1b3f5b 100644 --- a/test/v4l2_device/stream_on_off.cpp +++ b/test/v4l2_device/stream_on_off.cpp @@ -16,15 +16,15 @@ protected: pool_.createBuffers(bufferCount); - int ret = dev_->exportBuffers(&pool_); + int ret = capture_->exportBuffers(&pool_); if (ret) return TestFail; - ret = dev_->streamOn(); + ret = capture_->streamOn(); if (ret) return TestFail; - ret = dev_->streamOff(); + ret = capture_->streamOff(); if (ret) return TestFail; diff --git a/test/v4l2_device/v4l2_device_test.cpp b/test/v4l2_device/v4l2_device_test.cpp index a2a7ba82..2bdf8cfe 100644 --- a/test/v4l2_device/v4l2_device_test.cpp +++ b/test/v4l2_device/v4l2_device_test.cpp @@ -52,16 +52,16 @@ int V4L2DeviceTest::init() if (!entity) return TestSkip; - dev_ = new V4L2Device(entity); - if (!dev_) + capture_ = new V4L2Device(entity); + if (!capture_) return TestFail; - return dev_->open(); + return capture_->open(); } void V4L2DeviceTest::cleanup() { media_->release(); - delete dev_; + delete capture_; }; diff --git a/test/v4l2_device/v4l2_device_test.h b/test/v4l2_device/v4l2_device_test.h index 43539655..c476d3c0 100644 --- a/test/v4l2_device/v4l2_device_test.h +++ b/test/v4l2_device/v4l2_device_test.h @@ -22,7 +22,10 @@ using namespace libcamera; class V4L2DeviceTest : public Test { public: - V4L2DeviceTest() : dev_(nullptr){}; + V4L2DeviceTest() + : capture_(nullptr) + { + } protected: int init(); @@ -30,7 +33,7 @@ protected: std::unique_ptr<DeviceEnumerator> enumerator_; std::shared_ptr<MediaDevice> media_; - V4L2Device *dev_; + V4L2Device *capture_; BufferPool pool_; }; |