Rpi/v6.6/streams

.github/workflows/gen_orig.yml

@@ -0,0 +1,34 @@
+name: Generate source release tarball
+run-name: Generating source release tarball
+on:
+  push:
+    tags: # vX.Y.Z+rptYYYMMDD
+      - 'v[0-9]+.[0-9]+.[0-9]+\+rpt[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]'
+  workflow_dispatch:
+jobs:
+  publish_tarball:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install dependencies
+        run: | # Local cmake needs to be removed for pybind11 to be detected
+          sudo rm -rf /usr/local/bin/cmake
+          pip3 install --user meson
+          sudo apt-get update
+          sudo apt-get install -y ninja-build pkgconf cmake libgtest-dev libyaml-dev python3 python3-dev pybind11-dev python3-jinja2 python3-ply python3-yaml
+      - name: Check out repository code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Required for 'git describe' to work
+      - name: Generate tarball
+        run: |
+          meson setup build -Dpycamera=enabled
+          meson dist --no-tests --include-subprojects -C build
+          mv build/meson-dist/*.tar.xz "build/meson-dist/libcamera-${GITHUB_REF_NAME:1}.tar.xz"
+      - name: Release tarball
+        uses: softprops/action-gh-release@v1
+        with:
+          files: build/meson-dist/*.tar.xz
+      - if: failure()
+        run: cat build/meson-logs/meson-log.txt

Documentation/Doxyfile-internal.in

@@ -25,6 +25,8 @@ EXCLUDE                = @TOP_SRCDIR@/include/libcamera/base/span.h \
                          @TOP_SRCDIR@/src/libcamera/device_enumerator_udev.cpp \
                          @TOP_SRCDIR@/src/libcamera/ipc_pipe_unixsocket.cpp \
                          @TOP_SRCDIR@/src/libcamera/pipeline/ \
+                         @TOP_SRCDIR@/src/libcamera/sensor/camera_sensor_legacy.cpp \
+                         @TOP_SRCDIR@/src/libcamera/sensor/camera_sensor_raw.cpp \
                          @TOP_SRCDIR@/src/libcamera/tracepoints.cpp \
                          @TOP_BUILDDIR@/include/libcamera/internal/tracepoints.h \
                          @TOP_BUILDDIR@/include/libcamera/ipa/soft_ipa_interface.h \

Documentation/guides/pipeline-handler.rst

@@ -186,7 +186,7 @@ to the libcamera build options in the top level ``meson_options.txt``.
 
    option('pipelines',
            type : 'array',
-           choices : ['ipu3', 'rkisp1', 'rpi/vc4', 'simple', 'uvcvideo', 'vimc', 'vivid'],
+           choices : ['ipu3', 'rkisp1', 'rpi/pisp', 'rpi/vc4', 'simple', 'uvcvideo', 'vimc', 'vivid'],
            description : 'Select which pipeline handlers to include')
 
 

README.rst

@@ -25,15 +25,47 @@ systems, including traditional Linux distributions, ChromeOS and Android.
 Getting Started
 ---------------
 
-To fetch the sources, build and install:
+Only build ``libcamera`` from scratch if you need custom behaviour or the latest features that have not yet reached ``apt`` repositories.
 
+If you run ``Raspberry Pi OS Lite``, begin by installing the following packages:
+
 .. code::
 
-  git clone https://git.libcamera.org/libcamera/libcamera.git
+  sudo apt install -y python-pip git python3-jinja2
+
+First, install the following ``libcamera`` dependencies:
+.. code::
+
+  sudo apt install -y libboost-dev
+  sudo apt install -y libgnutls28-dev openssl libtiff-dev pybind11-dev
+  sudo apt install -y qtbase5-dev libqt5core5a libqt5widgets
+  sudo apt install -y meson cmake
+  sudo apt install -y python3-yaml python3-ply
+  sudo apt install -y libglib2.0-dev libgstreamer-plugins-base1.0-dev
+
+Now we're ready to build ``libcamera`` itself.
+
+Download a local copy of Raspberry Pi's fork of ``libcamera`` from GitHub, before building and installing freshly-build binary:
+
+.. code::
+
+  git clone https://github.com/raspberrypi/libcamera.git
   cd libcamera
-  meson setup build
+  meson setup build --buildtype=release -Dpipelines=rpi/vc4,rpi/pisp -Dipas=rpi/vc4,rpi/pisp -Dv4l2=true -Dgstreamer=enabled -Dtest=false -Dlc-compliance=disabled -Dcam=disabled -Dqcam=disabled -Ddocumentation=disabled -Dpycamera=enabled
   ninja -C build install
 
+You can disable the ``gstreamer`` plugin by replacing ``-Dgstreamer=enabled`` with ``-Dgstreamer=disabled`` during the ``meson`` build configuration.
+If you disable ``gstreamer``, there is no need to install the ``libglib2.0-dev`` and ``libgstreamer-plugins-base1.0-dev`` dependencies.
+
+On devices with 1GB of memory or less, the build may exceed available memory. Append the ``-j 1`` flag to ``ninja`` commands to limit the build to a single process.
+This should prevent the build from exceeding available memory on devices like the Raspberry Pi Zero and the Raspberry Pi 3. 
+
+``libcamera`` does not yet have a stable binary interface. Always build ``rpicam-apps`` after you build ``libcamera``.
+
+You can find more informations at `Raspberry Pi libcamera documentation`_ pages.
+
+.. _Raspberry Pi libcamera documentation: https://www.raspberrypi.com/documentation/computers/camera_software.html
+
 Dependencies
 ~~~~~~~~~~~~
 

include/libcamera/internal/camera_sensor.h

@@ -9,19 +9,17 @@
 
 #include <memory>
 #include <string>
+#include <variant>
 #include <vector>
 
 #include <libcamera/base/class.h>
-#include <libcamera/base/log.h>
 
 #include <libcamera/control_ids.h>
 #include <libcamera/controls.h>
 #include <libcamera/geometry.h>
 #include <libcamera/orientation.h>
 #include <libcamera/transform.h>
 
-#include <libcamera/ipa/core_ipa_interface.h>
-
 #include "libcamera/internal/bayer_format.h"
 #include "libcamera/internal/v4l2_subdevice.h"
 
@@ -31,95 +29,100 @@ class CameraLens;
 class MediaEntity;
 class SensorConfiguration;
 
-struct CameraSensorProperties;
-
 enum class Orientation;
 
-class CameraSensor : protected Loggable
+struct IPACameraSensorInfo;
+
+class CameraSensor
 {
 public:
-	explicit CameraSensor(const MediaEntity *entity);
-	~CameraSensor();
+	virtual ~CameraSensor();
+
+	virtual const std::string &model() const = 0;
+	virtual const std::string &id() const = 0;
+
+	virtual const MediaEntity *entity() const = 0;
+	virtual V4L2Subdevice *device() = 0;
+
+	virtual CameraLens *focusLens() = 0;
 
-	int init();
+	virtual const std::vector<unsigned int> &mbusCodes() const = 0;
+	virtual std::vector<Size> sizes(unsigned int mbusCode) const = 0;
+	virtual Size resolution() const = 0;
 
-	const std::string &model() const { return model_; }
-	const std::string &id() const { return id_; }
+	virtual V4L2SubdeviceFormat
+	getFormat(const std::vector<unsigned int> &mbusCodes,
+		  const Size &size) const = 0;
+	virtual int setFormat(V4L2SubdeviceFormat *format,
+			      Transform transform = Transform::Identity) = 0;
+	virtual int tryFormat(V4L2SubdeviceFormat *format) const = 0;
 
-	const MediaEntity *entity() const { return entity_; }
-	V4L2Subdevice *device() { return subdev_.get(); }
+	virtual int applyConfiguration(const SensorConfiguration &config,
+				       Transform transform = Transform::Identity,
+				       V4L2SubdeviceFormat *sensorFormat = nullptr) = 0;
 
-	CameraLens *focusLens() { return focusLens_.get(); }
+	virtual V4L2Subdevice::Stream imageStream() const;
+	virtual std::optional<V4L2Subdevice::Stream> embeddedDataStream() const;
+	virtual V4L2SubdeviceFormat embeddedDataFormat() const;
+	virtual int setEmbeddedDataEnabled(bool enable);
 
-	const std::vector<unsigned int> &mbusCodes() const { return mbusCodes_; }
-	std::vector<Size> sizes(unsigned int mbusCode) const;
-	Size resolution() const;
+	virtual const ControlList &properties() const = 0;
+	virtual int sensorInfo(IPACameraSensorInfo *info) const = 0;
+	virtual Transform computeTransform(Orientation *orientation) const = 0;
+	virtual BayerFormat::Order bayerOrder(Transform t) const = 0;
 
-	V4L2SubdeviceFormat getFormat(const std::vector<unsigned int> &mbusCodes,
-				      const Size &size) const;
-	int setFormat(V4L2SubdeviceFormat *format,
-		      Transform transform = Transform::Identity);
-	int tryFormat(V4L2SubdeviceFormat *format) const;
+	virtual const ControlInfoMap &controls() const = 0;
+	virtual ControlList getControls(const std::vector<uint32_t> &ids) = 0;
+	virtual int setControls(ControlList *ctrls) = 0;
 
-	int applyConfiguration(const SensorConfiguration &config,
-			       Transform transform = Transform::Identity,
-			       V4L2SubdeviceFormat *sensorFormat = nullptr);
+	virtual const std::vector<controls::draft::TestPatternModeEnum> &
+	testPatternModes() const = 0;
+	virtual int setTestPatternMode(controls::draft::TestPatternModeEnum mode) = 0;
+};
+
+class CameraSensorFactoryBase
+{
+public:
+	CameraSensorFactoryBase(const char *name, int priority);
+	virtual ~CameraSensorFactoryBase() = default;
+
+	static std::unique_ptr<CameraSensor> create(MediaEntity *entity);
 
-	const ControlList &properties() const { return properties_; }
-	int sensorInfo(IPACameraSensorInfo *info) const;
-	Transform computeTransform(Orientation *orientation) const;
-	BayerFormat::Order bayerOrder(Transform t) const;
+	const std::string &name() const { return name_; }
+	int priority() const { return priority_; }
 
-	const ControlInfoMap &controls() const;
-	ControlList getControls(const std::vector<uint32_t> &ids);
-	int setControls(ControlList *ctrls);
+private:
+	LIBCAMERA_DISABLE_COPY_AND_MOVE(CameraSensorFactoryBase)
 
-	const std::vector<controls::draft::TestPatternModeEnum> &testPatternModes() const
+	static std::vector<CameraSensorFactoryBase *> &factories();
+
+	static void registerFactory(CameraSensorFactoryBase *factory);
+
+	virtual std::variant<std::unique_ptr<CameraSensor>, int>
+	match(MediaEntity *entity) const = 0;
+
+	std::string name_;
+	int priority_;
+};
+
+template<typename _CameraSensor>
+class CameraSensorFactory final : public CameraSensorFactoryBase
+{
+public:
+	CameraSensorFactory(const char *name, int priority)
+		: CameraSensorFactoryBase(name, priority)
 	{
-		return testPatternModes_;
 	}
-	int setTestPatternMode(controls::draft::TestPatternModeEnum mode);
-
-protected:
-	std::string logPrefix() const override;
 
 private:
-	LIBCAMERA_DISABLE_COPY(CameraSensor)
-
-	int generateId();
-	int validateSensorDriver();
-	void initVimcDefaultProperties();
-	void initStaticProperties();
-	void initTestPatternModes();
-	int initProperties();
-	int discoverAncillaryDevices();
-	int applyTestPatternMode(controls::draft::TestPatternModeEnum mode);
-
-	const MediaEntity *entity_;
-	std::unique_ptr<V4L2Subdevice> subdev_;
-	unsigned int pad_;
-
-	const CameraSensorProperties *staticProps_;
-
-	std::string model_;
-	std::string id_;
-
-	V4L2Subdevice::Formats formats_;
-	std::vector<unsigned int> mbusCodes_;
-	std::vector<Size> sizes_;
-	std::vector<controls::draft::TestPatternModeEnum> testPatternModes_;
-	controls::draft::TestPatternModeEnum testPatternMode_;
-
-	Size pixelArraySize_;
-	Rectangle activeArea_;
-	const BayerFormat *bayerFormat_;
-	bool supportFlips_;
-	bool flipsAlterBayerOrder_;
-	Orientation mountingOrientation_;
-
-	ControlList properties_;
-
-	std::unique_ptr<CameraLens> focusLens_;
+	std::variant<std::unique_ptr<CameraSensor>, int>
+	match(MediaEntity *entity) const override
+	{
+		return _CameraSensor::match(entity);
+	}
 };
 
+#define REGISTER_CAMERA_SENSOR(sensor, priority) \
+static CameraSensorFactory<sensor> global_##sensor##Factory{ #sensor, priority };
+
 } /* namespace libcamera */

include/libcamera/internal/v4l2_pixelformat.h

@@ -49,6 +49,8 @@ class V4L2PixelFormat
 	static const std::vector<V4L2PixelFormat> &
 	fromPixelFormat(const PixelFormat &pixelFormat);
 
+	bool isGenericLineBasedMetadata() const;
+
 private:
 	uint32_t fourcc_;
 };

include/libcamera/internal/v4l2_videodevice.h

@@ -12,6 +12,7 @@
 #include <memory>
 #include <optional>
 #include <ostream>
+#include <queue>
 #include <stdint.h>
 #include <string>
 #include <unordered_set>
@@ -266,6 +267,8 @@ class V4L2VideoDevice : public V4L2Device
 	void bufferAvailable();
 	FrameBuffer *dequeueBuffer();
 
+	int queueToDevice(FrameBuffer *buffer);
+
 	void watchdogExpired();
 
 	template<typename T>
@@ -281,6 +284,7 @@ class V4L2VideoDevice : public V4L2Device
 
 	V4L2BufferCache *cache_;
 	std::map<unsigned int, FrameBuffer *> queuedBuffers_;
+	std::queue<FrameBuffer *> pendingBuffersToQueue_;
 
 	EventNotifier *fdBufferNotifier_;
 

include/libcamera/ipa/meson.build

@@ -65,6 +65,7 @@ libcamera_ipa_headers += custom_target('core_ipa_serializer_h',
 pipeline_ipa_mojom_mapping = {
     'ipu3': 'ipu3.mojom',
     'rkisp1': 'rkisp1.mojom',
+    'rpi/pisp': 'raspberrypi.mojom',
     'rpi/vc4': 'raspberrypi.mojom',
     'simple': 'soft.mojom',
     'vimc': 'vimc.mojom',

include/libcamera/meson.build

@@ -36,6 +36,7 @@ controls_map = {
     'controls': {
         'draft': 'control_ids_draft.yaml',
         'core': 'control_ids_core.yaml',
+        'rpi/pisp': 'control_ids_rpi.yaml',
         'rpi/vc4': 'control_ids_rpi.yaml',
     },
 

include/linux/README

@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: CC0-1.0
 
-Files in this directory are imported from next-media-rkisp1-20240814-14-ga043ea54bbb9 of the Linux kernel. Do not
+Files in this directory are imported from v6.12-rc1-56-g8d8fdc8a8809 of the Linux kernel. Do not
 modify them manually.

include/linux/media-bus-format.h

@@ -183,4 +183,8 @@
 #define MEDIA_BUS_FMT_META_20			0x8006
 #define MEDIA_BUS_FMT_META_24			0x8007
 
+/* Specific metadata formats. Next is 0x9003. */
+#define MEDIA_BUS_FMT_CCS_EMBEDDED		0x9001
+#define MEDIA_BUS_FMT_OV2740_EMBEDDED		0x9002
+
 #endif /* __LINUX_MEDIA_BUS_FORMAT_H */

include/linux/media.h

@@ -206,6 +206,7 @@ struct media_entity_desc {
 #define MEDIA_PAD_FL_SINK			(1U << 0)
 #define MEDIA_PAD_FL_SOURCE			(1U << 1)
 #define MEDIA_PAD_FL_MUST_CONNECT		(1U << 2)
+#define MEDIA_PAD_FL_INTERNAL			(1U << 3)
 
 struct media_pad_desc {
 	__u32 entity;		/* entity ID */

include/linux/v4l2-controls.h

@@ -180,7 +180,7 @@ enum v4l2_colorfx {
 
 /* The base for the bcm2835-isp driver controls.
  * We reserve 16 controls for this driver. */
-#define V4L2_CID_USER_BCM2835_ISP_BASE		(V4L2_CID_USER_BASE + 0x10e0)
+#define V4L2_CID_USER_BCM2835_ISP_BASE		(V4L2_CID_USER_BASE + 0x11d0)
 /*
  * The base for Allegro driver controls.
  * We reserve 16 controls for this driver.

include/linux/v4l2-subdev.h

@@ -204,6 +204,11 @@ struct v4l2_subdev_capability {
  * on a video node.
  */
 #define V4L2_SUBDEV_ROUTE_FL_ACTIVE		(1U << 0)
+/*
+ * Is the route immutable? The ACTIVE flag of an immutable route may not be
+ * unset.
+ */
+#define V4L2_SUBDEV_ROUTE_FL_IMMUTABLE		(1U << 1)
 
 /**
  * struct v4l2_subdev_route - A route inside a subdev