@@ -25,6 +25,7 @@
#include <libcamera/base/log.h>
#include <libcamera/camera.h>
+#include <libcamera/color_space.h>
#include <libcamera/control_ids.h>
#include <libcamera/request.h>
#include <libcamera/stream.h>
@@ -35,6 +36,7 @@
#include "libcamera/internal/converter.h"
#include "libcamera/internal/delayed_controls.h"
#include "libcamera/internal/device_enumerator.h"
+#include "libcamera/internal/formats.h"
#include "libcamera/internal/media_device.h"
#include "libcamera/internal/pipeline_handler.h"
#include "libcamera/internal/software_isp/software_isp.h"
@@ -1212,6 +1214,37 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()
status = Adjusted;
}
+ /*
+ * Best effort to fix the color space. If the color space is not set,
+ * set it according to the pixel format, which may not be correct (pixel
+ * formats and color spaces are different things, although somewhat
+ * related) but we don't have a better option at the moment. Then in any
+ * case, perform the standard pixel format based color space adjustment.
+ */
+ if (!cfg.colorSpace) {
+ const PixelFormatInfo &info = PixelFormatInfo::info(pixelFormat);
+ switch (info.colourEncoding) {
+ case PixelFormatInfo::ColourEncodingRGB:
+ cfg.colorSpace = ColorSpace::Srgb;
+ break;
+ case libcamera::PixelFormatInfo::ColourEncodingYUV:
+ cfg.colorSpace = ColorSpace::Sycc;
+ break;
+ default:
+ cfg.colorSpace = ColorSpace::Raw;
+ }
+ LOG(SimplePipeline, Debug)
+ << "Unspecified color space set to "
+ << cfg.colorSpace.value().toString();
+ status = Adjusted;
+ }
+ if (cfg.colorSpace->adjust(pixelFormat)) {
+ LOG(SimplePipeline, Debug)
+ << "Color space adjusted to "
+ << cfg.colorSpace.value().toString();
+ status = Adjusted;
+ }
+
if (!pipeConfig_->outputSizes.contains(cfg.size)) {
Size adjustedSize = pipeConfig_->captureSize;
/*
StreamConfiguration's should have colorSpace set. This is not the case in the simple pipeline. Let's set it there. This also fixes a crash in `cam' due to accessing an unset colorSpace. We set the colour spaces according to the pixel format. This is not completely correct because pixel formats and colour spaces are different, although not completely independent, things. But for the lack of a better practical option to determine the colour space, we use this. Signed-off-by: Milan Zamazal <mzamazal@redhat.com> --- src/libcamera/pipeline/simple/simple.cpp | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+)