[libcamera-devel,2/2] libcamera: pipeline: uvc: Try a default format against the device
diff mbox series

Message ID 20190503153403.8728-3-kieran.bingham@ideasonboard.com
State Superseded
Headers show
Series
  • V4L2Device Try format support
Related show

Commit Message

Kieran Bingham May 3, 2019, 3:34 p.m. UTC 
We can not predict a suitable default for a UVC camera as they are so
varied.

Take a starting point as a default configuration and test it against the
device with the tryFormat call. The camera will return the closest
supported format from that configuration.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/libcamera/pipeline/uvcvideo.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Patch
diff mbox series 

diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp
index 5d2f1c98fa36..9247dff33606 100644
--- a/src/libcamera/pipeline/uvcvideo.cpp
+++ b/src/libcamera/pipeline/uvcvideo.cpp
@@ -91,9 +91,16 @@  PipelineHandlerUVC::streamConfiguration(Camera *camera,
 	UVCCameraData *data = cameraData(camera);
 	CameraConfiguration config;
 	StreamConfiguration cfg{};
+	V4L2DeviceFormat format;
 
-	cfg.pixelFormat = V4L2_PIX_FMT_YUYV;
-	cfg.size = { 640, 480 };
+	format.fourcc = V4L2_PIX_FMT_YUYV;
+	format.size = { 1920, 1080 };
+
+	/* Ask the video device to confirm a suitable default configuration. */
+	data->video_->tryFormat(&format);
+
+	cfg.size = format.size;
+	cfg.pixelFormat = format.fourcc;
 	cfg.bufferCount = 4;
 
 	config[&data->stream_] = cfg;