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

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

12
test/stream/stream_formats.cpp
View file

@ -55,8 +55,8 @@ protected:
{
/* Test discrete sizes */
StreamFormats discrete({
{ PixelFormat(1), { SizeRange(100, 100), SizeRange(200, 200) } },
{ PixelFormat(2), { SizeRange(300, 300), SizeRange(400, 400) } },
{ PixelFormat(1), { SizeRange({ 100, 100 }), SizeRange({ 200, 200 }) } },
{ PixelFormat(2), { SizeRange({ 300, 300 }), SizeRange({ 400, 400 }) } },
});
if (testSizes("discrete 1", discrete.sizes(PixelFormat(1)),
@ -68,10 +68,10 @@ protected:
/* Test range sizes */
StreamFormats range({
{ PixelFormat(1), { SizeRange(640, 480, 640, 480) } },
{ PixelFormat(2), { SizeRange(640, 480, 800, 600, 8, 8) } },
{ PixelFormat(3), { SizeRange(640, 480, 800, 600, 16, 16) } },
{ PixelFormat(4), { SizeRange(128, 128, 4096, 4096, 128, 128) } },
{ PixelFormat(1), { SizeRange({ 640, 480 }, { 640, 480 }) } },
{ PixelFormat(2), { SizeRange({ 640, 480 }, { 800, 600 }, 8, 8) } },
{ PixelFormat(3), { SizeRange({ 640, 480 }, { 800, 600 }, 16, 16) } },
{ PixelFormat(4), { SizeRange({ 128, 128 }, { 4096, 4096 }, 128, 128) } },
});
if (testSizes("range 1", range.sizes(PixelFormat(1)), { Size(640, 480) }))