Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-19 18:35:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: v4l2_device: Rename dev_ to capture_

Browse source 
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:
Kieran Bingham 2019-02-13 17:03:00 +00:00
parent 819eb422b3
commit ff4e882399
6 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/v4l2_device/capture_async.cpp
View file

@ -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;

4
test/v4l2_device/double_open.cpp
View file

@ -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;
}

2
test/v4l2_device/request_buffers.cpp
View file

@ -21,7 +21,7 @@ protected:
pool_.createBuffers(bufferCount);
int ret = dev_->exportBuffers(&pool_);
int ret = capture_->exportBuffers(&pool_);
if (ret)
return TestFail;

6
test/v4l2_device/stream_on_off.cpp
View file

@ -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;

8
test/v4l2_device/v4l2_device_test.cpp
View file

@ -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_;
};

7
test/v4l2_device/v4l2_device_test.h
View file

@ -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_;
};