summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-09-14 12:51:32 +0200
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-09-28 23:53:45 +0200
commitafe0ad41db8e27a60024b93ebc4ccdd6850aded0 (patch)
tree1356d4d0ea391d441ee25b543db914bdf41c6d38
parentaac96e34ba73a2dd63a12be446fe8db3c04db12f (diff)
libcamera: pipeline: rkisp1: Set number of planes based on format
The RkISP1 pipeline originally only supported NV formats which have 2 planes. When support for YUV formats was added the plane count on the output format was not made to reflect this. Instead of hard coding the plane count to 2 fetch the number of planes from the format information. Reported-by: Jacopo Mondi <jacopo@jmondi.org> Fixes: 2b1a908b5222e263 ("libcamera: camera: Add a validation API to the CameraConfiguration class") Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/libcamera/pipeline/rkisp1/rkisp1.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index a6fc3b8e..009d190d 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -667,10 +667,11 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
LOG(RkISP1, Debug) << "Resizer output pad configured with " << format.toString();
+ const PixelFormatInfo &info = PixelFormatInfo::info(cfg.pixelFormat);
V4L2DeviceFormat outputFormat = {};
outputFormat.fourcc = video_->toV4L2PixelFormat(cfg.pixelFormat);
outputFormat.size = cfg.size;
- outputFormat.planesCount = 2;
+ outputFormat.planesCount = info.numPlanes();
ret = video_->setFormat(&outputFormat);
if (ret)