From 0eb1861c07349c3cfee95b3ce8531539631bc46d Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Fri, 28 Jun 2024 10:39:33 +0200 Subject: libcamera: pispbe: Use uppercase formats identifiers The mainline kernel driver uses uppercase for macros that identify an image format. Adjust the libcamera implementation to use the same ids. Signed-off-by: Jacopo Mondi --- src/libcamera/pipeline/rpi/pisp/pisp.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcamera/pipeline/rpi/pisp/pisp.cpp b/src/libcamera/pipeline/rpi/pisp/pisp.cpp index dd0e76a8..09cc0178 100644 --- a/src/libcamera/pipeline/rpi/pisp/pisp.cpp +++ b/src/libcamera/pipeline/rpi/pisp/pisp.cpp @@ -1856,7 +1856,7 @@ int PiSPCameraData::configureCfe() input.format = image; input.format.format = PISP_IMAGE_FORMAT_BPS_16; - if (PISP_IMAGE_FORMAT_compressed(image.format)) { + if (PISP_IMAGE_FORMAT_COMPRESSED(image.format)) { pisp_compress_config compress; compress.offset = DefaultCompressionOffset; compress.mode = (image.format & PISP_IMAGE_FORMAT_COMPRESSION_MASK) / @@ -1935,7 +1935,7 @@ int PiSPCameraData::configureBe(const std::optional &yuvColorSpace) global.bayer_order = toPiSPBayerOrder(cfeFormat.fourcc); ispOutputTotal_ = 1; /* Config buffer */ - if (PISP_IMAGE_FORMAT_compressed(inputFormat.format)) { + if (PISP_IMAGE_FORMAT_COMPRESSED(inputFormat.format)) { pisp_decompress_config decompress; decompress.offset = DefaultCompressionOffset; decompress.mode = (inputFormat.format & PISP_IMAGE_FORMAT_COMPRESSION_MASK) @@ -1999,7 +1999,7 @@ int PiSPCameraData::configureBe(const std::optional &yuvColorSpace) be_->SetTdnOutputFormat(tdnFormat); be_->SetTdnInputFormat(tdnFormat); - if (PISP_IMAGE_FORMAT_compressed(tdnFormat.format)) { + if (PISP_IMAGE_FORMAT_COMPRESSED(tdnFormat.format)) { pisp_decompress_config tdnDecompress; pisp_compress_config tdnCompress; @@ -2018,7 +2018,7 @@ int PiSPCameraData::configureBe(const std::optional &yuvColorSpace) be_->SetStitchOutputFormat(stitchFormat); be_->SetStitchInputFormat(stitchFormat); - if (PISP_IMAGE_FORMAT_compressed(stitchFormat.format)) { + if (PISP_IMAGE_FORMAT_COMPRESSED(stitchFormat.format)) { pisp_decompress_config stitchDecompress; pisp_compress_config stitchCompress; -- cgit v1.2.1