[libcamera-devel,v2,5/6] libcamera: ipu3: Set pipe_mode based on stream configuration

Message ID 20190610164052.30741-6-jacopo@jmondi.org
State Superseded
Headers show
Series
  • Add support for V4L2 Controls
Related show

Commit Message

Jacopo Mondi June 10, 2019, 4:40 p.m. UTC
Set the ImgU pipe_mode control based on the active stream configuration.
Use 'Video' pipe mode unless the viewfinder stream is not active.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/libcamera/pipeline/ipu3/ipu3.cpp | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

Patch

diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 05005c42106b..b3e7fb0e9c64 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -22,6 +22,7 @@ 
 #include "media_device.h"
 #include "pipeline_handler.h"
 #include "utils.h"
+#include "v4l2_controls.h"
 #include "v4l2_device.h"
 #include "v4l2_subdevice.h"
 
@@ -29,6 +30,8 @@  namespace libcamera {
 
 LOG_DEFINE_CATEGORY(IPU3)
 
+#define IPU3_PIPE_MODE_CTRL	0x009819c1
+
 class ImgUDevice
 {
 public:
@@ -536,6 +539,7 @@  int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
 	 * the configuration of the active one for that purpose (there should
 	 * be at least one active stream in the configuration request).
 	 */
+	unsigned int pipeMode = 0;
 	if (!outStream->active_) {
 		ret = imgu->configureOutput(outStream->device_, config->at(0));
 		if (ret)
@@ -546,6 +550,12 @@  int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
 		ret = imgu->configureOutput(vfStream->device_, config->at(0));
 		if (ret)
 			return ret;
+
+		/*
+		 * \todo: This works as long as only two concurrent streams
+		 * per pipe are supported.
+		 */
+		pipeMode = 1;
 	}
 
 	/*
@@ -559,6 +569,25 @@  int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
 	if (ret)
 		return ret;
 
+	/* Apply the "pipe_mode" control to the ImgU subdevice. */
+	V4L2Controls ctrls;
+	ctrls.set(IPU3_PIPE_MODE_CTRL, pipeMode);
+	ret = imgu->imgu_->setControls(ctrls);
+	if (ret) {
+		LOG(IPU3, Error) << "Unable to set pipe_mode control";
+		return ret;
+	}
+
+	std::vector<unsigned int> ctrlId = { IPU3_PIPE_MODE_CTRL, };
+	ret = imgu->imgu_->getControls(ctrlId, &ctrls);
+	if (ret) {
+		LOG(IPU3, Error) << "Unable to get pipe_mode control value";
+		return ret;
+	}
+
+	pipeMode = ctrls.getInt(IPU3_PIPE_MODE_CTRL);
+	LOG(IPU3, Debug) << "ImgU pipe mode set to: "
+			 << (pipeMode ? "'Still Capture'" : "'Video'");
 	return 0;
 }