NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

test: v4l2_videodevice: Switch to FrameBuffer interface

Browse source 
The V4L2VideoDevice class can now operate using a FrameBuffer interface,
switch all test cases to use it.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund 2019-12-18 18:47:45 +01:00
parent cadae67e45
commit f0d928b56e
6 changed files with 48 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

44
test/v4l2_videodevice/v4l2_m2mdevice.cpp
View file

@ -29,7 +29,7 @@ public:
{
}
void outputBufferComplete(Buffer *buffer)
void outputBufferComplete(FrameBuffer *buffer)
{
cout << "Received output buffer" << endl;
@ -39,7 +39,7 @@ public:
vim2m_->output()->queueBuffer(buffer);
}
void receiveCaptureBuffer(Buffer *buffer)
void receiveCaptureBuffer(FrameBuffer *buffer)
{
cout << "Received capture buffer" << endl;
@ -112,39 +112,31 @@ protected:
return TestFail;
}
capturePool_.createBuffers(bufferCount);
outputPool_.createBuffers(bufferCount);
ret = capture->exportBuffers(&capturePool_);
if (ret) {
ret = capture->exportBuffers(bufferCount, &captureBuffers_);
if (ret < 0) {
cerr << "Failed to export Capture Buffers" << endl;
return TestFail;
}
ret = output->exportBuffers(&outputPool_);
if (ret) {
ret = output->exportBuffers(bufferCount, &outputBuffers_);
if (ret < 0) {
cerr << "Failed to export Output Buffers" << endl;
return TestFail;
}
capture->bufferReady.connect(this, &V4L2M2MDeviceTest::receiveCaptureBuffer);
output->bufferReady.connect(this, &V4L2M2MDeviceTest::outputBufferComplete);
capture->frameBufferReady.connect(this, &V4L2M2MDeviceTest::receiveCaptureBuffer);
output->frameBufferReady.connect(this, &V4L2M2MDeviceTest::outputBufferComplete);
std::vector<std::unique_ptr<Buffer>> captureBuffers;
captureBuffers = capture->queueAllBuffers();
if (captureBuffers.empty()) {
cerr << "Failed to queue all Capture Buffers" << endl;
return TestFail;
for (const std::unique_ptr<FrameBuffer> &buffer : captureBuffers_) {
if (capture->queueBuffer(buffer.get())) {
std::cout << "Failed to queue capture buffer" << std::endl;
return TestFail;
}
}
/* We can't "queueAllBuffers()" on an output device, so we do it manually */
std::vector<std::unique_ptr<Buffer>> outputBuffers;
for (unsigned int i = 0; i < outputPool_.count(); ++i) {
Buffer *buffer = new Buffer(i);
outputBuffers.emplace_back(buffer);
ret = output->queueBuffer(buffer);
if (ret) {
cerr << "Failed to queue output buffer" << i << endl;
for (const std::unique_ptr<FrameBuffer> &buffer : outputBuffers_) {
if (output->queueBuffer(buffer.get())) {
std::cout << "Failed to queue output buffer" << std::endl;
return TestFail;
}
}
@ -202,8 +194,8 @@ private:
std::shared_ptr<MediaDevice> media_;
V4L2M2MDevice *vim2m_;
BufferPool capturePool_;
BufferPool outputPool_;
std::vector<std::unique_ptr<FrameBuffer>> captureBuffers_;
std::vector<std::unique_ptr<FrameBuffer>> outputBuffers_;
unsigned int outputFrames_;
unsigned int captureFrames_;