[libcamera-devel,v3,3/3] libcamera: stream_option: use format name to set cam/qcam format

Message ID 20200727151820.24466-4-kgupta@es.iitr.ac.in
State Superseded
Headers show
Series
  • Enable formats lookup based on name
Related show

Commit Message

Kaaira Gupta July 27, 2020, 3:18 p.m. UTC
Replace hex input for pixel formats with their format names, for input in
cam and qcam.
Hence, remove the todo.

Signed-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in>
---
 src/cam/stream_options.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch

diff --git a/src/cam/stream_options.cpp b/src/cam/stream_options.cpp
index bd12c8f..4168e5d 100644
--- a/src/cam/stream_options.cpp
+++ b/src/cam/stream_options.cpp
@@ -19,7 +19,7 @@  StreamKeyValueParser::StreamKeyValueParser()
 		  ArgumentRequired);
 	addOption("height", OptionInteger, "Height in pixels",
 		  ArgumentRequired);
-	addOption("pixelformat", OptionInteger, "Pixel format",
+	addOption("pixelformat", OptionString, "Pixel format name",
 		  ArgumentRequired);
 }
 
@@ -95,9 +95,8 @@  int StreamKeyValueParser::updateConfiguration(CameraConfiguration *config,
 			cfg.size.height = opts["height"];
 		}
 
-		/* \todo Translate 4CC string to pixelformat with modifier. */
 		if (opts.isSet("pixelformat"))
-			cfg.pixelFormat = PixelFormat(opts["pixelformat"]);
+			cfg.pixelFormat = PixelFormat::fromString(opts["pixelformat"].toString());
 	}
 
 	return 0;