[libcamera-devel,v3,4/8] libcamera: pipeline: vimc: Remove internal usage of ImageFormats
diff mbox series

Message ID 20200318033200.3042855-5-niklas.soderlund@ragnatech.se
State Accepted
Headers show
Series
  • libcamera: PixelFormat: Turn into a class
Related show

Commit Message

Niklas Söderlund March 18, 2020, 3:31 a.m. UTC 
There is no need to use the ImageFormats helper to generate a map of
PixelFormat to sizes, use std::map directly.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/pipeline/vimc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch
diff mbox series 

diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp
index de2458afff3a4784..04cad94e739e9ae9 100644
--- a/src/libcamera/pipeline/vimc.cpp
+++ b/src/libcamera/pipeline/vimc.cpp
@@ -172,17 +172,17 @@  CameraConfiguration *PipelineHandlerVimc::generateConfiguration(Camera *camera,
 	if (roles.empty())
 		return config;
 
-	ImageFormats formats;
+	std::map<PixelFormat, std::vector<SizeRange>> formats;
 
 	for (PixelFormat pixelformat : pixelformats) {
 		/* The scaler hardcodes a x3 scale-up ratio. */
 		std::vector<SizeRange> sizes{
 			SizeRange{ 48, 48, 4096, 2160 }
 		};
-		formats.addFormat(pixelformat, sizes);
+		formats[pixelformat] = sizes;
 	}
 
-	StreamConfiguration cfg(formats.data());
+	StreamConfiguration cfg(formats);
 
 	cfg.pixelFormat = DRM_FORMAT_BGR888;
 	cfg.size = { 1920, 1080 };