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

libcamera: PixelFormat: Make constructor explicit

Browse source 
To achieve the goal of preventing unwanted conversion between a DRM and
a V4L2 FourCC, make the PixelFormat constructor that takes an integer
value explicit. All users of pixel formats flagged by the compiler
are fixed.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2020-03-16 10:07:26 +02:00 • committed by Niklas Söderlund
parent 8c0bbcd3d3
commit 718f5e99a9
9 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test/stream/stream_formats.cpp
View file

@ -55,40 +55,40 @@ protected:
{
/* Test discrete sizes */
StreamFormats discrete({
{ 1, { SizeRange(100, 100), SizeRange(200, 200) } },
{ 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(1),
if (testSizes("discrete 1", discrete.sizes(PixelFormat(1)),
{ Size(100, 100), Size(200, 200) }))
return TestFail;
if (testSizes("discrete 2", discrete.sizes(2),
if (testSizes("discrete 2", discrete.sizes(PixelFormat(2)),
{ Size(300, 300), Size(400, 400) }))
return TestFail;
/* Test range sizes */
StreamFormats range({
{ 1, { SizeRange(640, 480, 640, 480) } },
{ 2, { SizeRange(640, 480, 800, 600, 8, 8) } },
{ 3, { SizeRange(640, 480, 800, 600, 16, 16) } },
{ 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(1), { Size(640, 480) }))
if (testSizes("range 1", range.sizes(PixelFormat(1)), { Size(640, 480) }))
return TestFail;
if (testSizes("range 2", range.sizes(2), {
if (testSizes("range 2", range.sizes(PixelFormat(2)), {
Size(640, 480), Size(720, 480),
Size(720, 576), Size(768, 480),
Size(800, 600) }))
return TestFail;
if (testSizes("range 3", range.sizes(3), {
if (testSizes("range 3", range.sizes(PixelFormat(3)), {
Size(640, 480), Size(720, 480),
Size(720, 576), Size(768, 480) }))
return TestFail;
if (testSizes("range 4", range.sizes(4), {
if (testSizes("range 4", range.sizes(PixelFormat(4)), {
Size(1024, 768), Size(1280, 1024),
Size(2048, 1152), Size(2048, 1536),
Size(2560, 2048), Size(3200, 2048), }))