PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: pipeline: rkisp1: Don't hardcode NV12 in configureStreams()

Browse Source 
Use the pixel format requested by the application in the
RkISP1PipelineHandler::configureStreams() method instead of hardcoding
NV12. The streamsConfiguration() method still proposes NV12 by default.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart
2019-04-19 13:26:10 +03:00
parent 8bc88758d2
commit 8cf52e378d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View File

@@ -223,7 +223,7 @@ int PipelineHandlerRkISP1::configureStreams(Camera *camera,
V4L2DeviceFormat outputFormat = {};
outputFormat.width = cfg.width;
outputFormat.height = cfg.height;
outputFormat.fourcc = V4L2_PIX_FMT_NV12;
outputFormat.fourcc = cfg.pixelFormat;
outputFormat.planesCount = 2;
ret = video_->setFormat(&outputFormat);
@@ -232,12 +232,12 @@ int PipelineHandlerRkISP1::configureStreams(Camera *camera,
if (outputFormat.width != cfg.width ||
outputFormat.height != cfg.height ||
outputFormat.fourcc != V4L2_PIX_FMT_NV12) {
outputFormat.fourcc != cfg.pixelFormat) {
LOG(RkISP1, Error)
<< "Unable to configure capture in " << cfg.width
<< "x" << cfg.height << "-0x"
<< std::hex << std::setfill('0') << std::setw(8)
<< V4L2_PIX_FMT_NV12;
<< cfg.pixelFormat;
return -EINVAL;
}