PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: geometry: Construct SizeRange from Size

Browse Source 
The SizeRange constructors take minimum and maximum width and height
values as separate arguments. We have a Size class to convey size
information, use it in the constructors, and update the callers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2020-03-15 02:56:20 +02:00
parent 4ff18e9506
commit a69414529f
7 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/v4l2_videodevice.cpp
+10 -10
View File
@@ -971,20 +971,20 @@ std::vector<SizeRange> V4L2VideoDevice::enumSizes(unsigned int pixelFormat)
switch (frameSize.type) {
case V4L2_FRMSIZE_TYPE_DISCRETE:
sizes.emplace_back(frameSize.discrete.width,
frameSize.discrete.height);
sizes.emplace_back(Size{ frameSize.discrete.width,
frameSize.discrete.height });
break;
case V4L2_FRMSIZE_TYPE_CONTINUOUS:
sizes.emplace_back(frameSize.stepwise.min_width,
frameSize.stepwise.min_height,
frameSize.stepwise.max_width,
frameSize.stepwise.max_height);
sizes.emplace_back(Size{ frameSize.stepwise.min_width,
frameSize.stepwise.min_height },
Size{ frameSize.stepwise.max_width,
frameSize.stepwise.max_height });
break;
case V4L2_FRMSIZE_TYPE_STEPWISE:
sizes.emplace_back(frameSize.stepwise.min_width,
frameSize.stepwise.min_height,
frameSize.stepwise.max_width,
frameSize.stepwise.max_height,
sizes.emplace_back(Size{ frameSize.stepwise.min_width,
frameSize.stepwise.min_height },
Size{ frameSize.stepwise.max_width,
frameSize.stepwise.max_height },
frameSize.stepwise.step_width,
frameSize.stepwise.step_height);
break;