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

v4l2: camera: Merge getStreamConfig() with open()

Browse source 
The V4L2CameraProxy always calls V4L2Camera::getStreamConfig() right
after V4L2Camera::open(), and never afterwards. Simplify the code by
returning the initial configuration from V4L2Camera::open() and removing
V4L2Camera::getStreamConfig().

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2020-01-05 04:35:25 +02:00
parent 852b9d0a76
commit 3bd1985545
3 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/v4l2/v4l2_camera.cpp
View file

@ -28,7 +28,7 @@ V4L2Camera::~V4L2Camera()
close();
}
int V4L2Camera::open()
int V4L2Camera::open(StreamConfiguration *streamConfig)
{
if (camera_->acquire() < 0) {
LOG(V4L2Compat, Error) << "Failed to acquire camera";
@ -43,6 +43,7 @@ int V4L2Camera::open()
bufferAllocator_ = new FrameBufferAllocator(camera_);
*streamConfig = config_->at(0);
return 0;
}
@ -64,11 +65,6 @@ void V4L2Camera::unbind()
efd_ = -1;
}
void V4L2Camera::getStreamConfig(StreamConfiguration *streamConfig)
{
*streamConfig = config_->at(0);
}
std::vector<V4L2Camera::Buffer> V4L2Camera::completedBuffers()
{
std::vector<Buffer> v;