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

libcamera: pipeline: simple: Rename Configuration::pixelFormat

Browse Source 
The Configuration::pixelFormat field stores the pixel format at the
output of the capture part of the pipeline. Rename it to captureFormat,
to match the related captureSize field.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Phi-Bang Nguyen <pnguyen@baylibre.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2020-12-24 17:54:07 +02:00
parent f05d08a93f
commit 7b29587840
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/pipeline/simple/simple.cpp
+6 -5
View File
@@ -157,7 +157,7 @@ public:
struct Configuration {
uint32_t code;
PixelFormat pixelFormat;
PixelFormat captureFormat;
Size captureSize;
SizeRange outputSizes;
};
@@ -379,7 +379,7 @@ int SimpleCameraData::init()
Configuration config;
config.code = code;
config.pixelFormat = pixelFormat;
config.captureFormat = pixelFormat;
config.captureSize = format.size;
if (!converter) {
@@ -551,7 +551,8 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()
status = Adjusted;
}
needConversion_ = cfg.pixelFormat != pipeConfig.pixelFormat
/* \todo Create a libcamera core class to group format and size */
needConversion_ = cfg.pixelFormat != pipeConfig.captureFormat
|| cfg.size != pipeConfig.captureSize;
cfg.bufferCount = 3;
@@ -656,7 +657,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)
return ret;
/* Configure the video node. */
V4L2PixelFormat videoFormat = video->toV4L2PixelFormat(pipeConfig.pixelFormat);
V4L2PixelFormat videoFormat = video->toV4L2PixelFormat(pipeConfig.captureFormat);
V4L2DeviceFormat captureFormat;
captureFormat.fourcc = videoFormat;
@@ -686,7 +687,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)
if (useConverter_) {
StreamConfiguration inputCfg;
inputCfg.pixelFormat = pipeConfig.pixelFormat;
inputCfg.pixelFormat = pipeConfig.captureFormat;
inputCfg.size = pipeConfig.captureSize;
inputCfg.stride = captureFormat.planes[0].bpl;
inputCfg.bufferCount = cfg.bufferCount;