mirror of
https://git.libcamera.org/libcamera/libcamera.git
synced 2025-07-22 16:15:09 +03:00
test: v4l2_device: Rename dev_ to capture_
Change the variable name globally throughout the tests. Repair the V4L2DeviceTest constructor style, as checkstyle complained. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
parent
819eb422b3
commit
ff4e882399
6 changed files with 21 additions and 18 deletions
|
@ -26,7 +26,7 @@ public:
|
||||||
frames++;
|
frames++;
|
||||||
|
|
||||||
/* Requeue the buffer for further use. */
|
/* Requeue the buffer for further use. */
|
||||||
dev_->queueBuffer(buffer);
|
capture_->queueBuffer(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -40,19 +40,19 @@ protected:
|
||||||
|
|
||||||
pool_.createBuffers(bufferCount);
|
pool_.createBuffers(bufferCount);
|
||||||
|
|
||||||
ret = dev_->exportBuffers(&pool_);
|
ret = capture_->exportBuffers(&pool_);
|
||||||
if (ret)
|
if (ret)
|
||||||
return TestFail;
|
return TestFail;
|
||||||
|
|
||||||
dev_->bufferReady.connect(this, &CaptureAsyncTest::receiveBuffer);
|
capture_->bufferReady.connect(this, &CaptureAsyncTest::receiveBuffer);
|
||||||
|
|
||||||
/* Queue all the buffers to the device. */
|
/* Queue all the buffers to the device. */
|
||||||
for (Buffer &b : pool_.buffers()) {
|
for (Buffer &b : pool_.buffers()) {
|
||||||
if (dev_->queueBuffer(&b))
|
if (capture_->queueBuffer(&b))
|
||||||
return TestFail;
|
return TestFail;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = dev_->streamOn();
|
ret = capture_->streamOn();
|
||||||
if (ret)
|
if (ret)
|
||||||
return TestFail;
|
return TestFail;
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ protected:
|
||||||
|
|
||||||
std::cout << "Processed " << frames << " frames" << std::endl;
|
std::cout << "Processed " << frames << " frames" << std::endl;
|
||||||
|
|
||||||
ret = dev_->streamOff();
|
ret = capture_->streamOff();
|
||||||
if (ret)
|
if (ret)
|
||||||
return TestFail;
|
return TestFail;
|
||||||
|
|
||||||
|
|
|
@ -22,10 +22,10 @@ protected:
|
||||||
* Expect failure: The device has already been opened by the
|
* Expect failure: The device has already been opened by the
|
||||||
* V4L2DeviceTest base class
|
* V4L2DeviceTest base class
|
||||||
*/
|
*/
|
||||||
ret = dev_->open();
|
ret = capture_->open();
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
std::cout << "Double open erroneously succeeded" << std::endl;
|
std::cout << "Double open erroneously succeeded" << std::endl;
|
||||||
dev_->close();
|
capture_->close();
|
||||||
return TestFail;
|
return TestFail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ protected:
|
||||||
|
|
||||||
pool_.createBuffers(bufferCount);
|
pool_.createBuffers(bufferCount);
|
||||||
|
|
||||||
int ret = dev_->exportBuffers(&pool_);
|
int ret = capture_->exportBuffers(&pool_);
|
||||||
if (ret)
|
if (ret)
|
||||||
return TestFail;
|
return TestFail;
|
||||||
|
|
||||||
|
|
|
@ -16,15 +16,15 @@ protected:
|
||||||
|
|
||||||
pool_.createBuffers(bufferCount);
|
pool_.createBuffers(bufferCount);
|
||||||
|
|
||||||
int ret = dev_->exportBuffers(&pool_);
|
int ret = capture_->exportBuffers(&pool_);
|
||||||
if (ret)
|
if (ret)
|
||||||
return TestFail;
|
return TestFail;
|
||||||
|
|
||||||
ret = dev_->streamOn();
|
ret = capture_->streamOn();
|
||||||
if (ret)
|
if (ret)
|
||||||
return TestFail;
|
return TestFail;
|
||||||
|
|
||||||
ret = dev_->streamOff();
|
ret = capture_->streamOff();
|
||||||
if (ret)
|
if (ret)
|
||||||
return TestFail;
|
return TestFail;
|
||||||
|
|
||||||
|
|
|
@ -52,16 +52,16 @@ int V4L2DeviceTest::init()
|
||||||
if (!entity)
|
if (!entity)
|
||||||
return TestSkip;
|
return TestSkip;
|
||||||
|
|
||||||
dev_ = new V4L2Device(entity);
|
capture_ = new V4L2Device(entity);
|
||||||
if (!dev_)
|
if (!capture_)
|
||||||
return TestFail;
|
return TestFail;
|
||||||
|
|
||||||
return dev_->open();
|
return capture_->open();
|
||||||
}
|
}
|
||||||
|
|
||||||
void V4L2DeviceTest::cleanup()
|
void V4L2DeviceTest::cleanup()
|
||||||
{
|
{
|
||||||
media_->release();
|
media_->release();
|
||||||
|
|
||||||
delete dev_;
|
delete capture_;
|
||||||
};
|
};
|
||||||
|
|
|
@ -22,7 +22,10 @@ using namespace libcamera;
|
||||||
class V4L2DeviceTest : public Test
|
class V4L2DeviceTest : public Test
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
V4L2DeviceTest() : dev_(nullptr){};
|
V4L2DeviceTest()
|
||||||
|
: capture_(nullptr)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
int init();
|
int init();
|
||||||
|
@ -30,7 +33,7 @@ protected:
|
||||||
|
|
||||||
std::unique_ptr<DeviceEnumerator> enumerator_;
|
std::unique_ptr<DeviceEnumerator> enumerator_;
|
||||||
std::shared_ptr<MediaDevice> media_;
|
std::shared_ptr<MediaDevice> media_;
|
||||||
V4L2Device *dev_;
|
V4L2Device *capture_;
|
||||||
BufferPool pool_;
|
BufferPool pool_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue