Libcamera apps improvements #1205

vivien · 2023-07-27T17:29:28Z

This branch contains a few changes for the rpi-libcamera-apps package.

It fixes a runtime issue with the raspberrypi machine, adds support for DRM, and makes the package hardware-agnostic as it should be.

vivien · 2023-07-27T18:16:51Z

@kraj @agherzan It seems like meta-multimedia isn't included in your CI.

agherzan

It looks like this broke yocto-check-layer. meta-multimedia was never a dependency of this layer. Any idea why this MR requires it?

vivien · 2023-07-29T16:03:20Z

The error is ERROR: Nothing PROVIDES 'libcamera' (but /work/recipes-multimedia/libcamera-apps/libcamera-apps_git.bb DEPENDS on or otherwise requires it). and libcamera is part of meta-multimedia. I have no idea how the CI handled changes targeting rpi-libcamera-apps before.

kraj · 2023-07-29T16:28:32Z

The error is ERROR: Nothing PROVIDES 'libcamera' (but /work/recipes-multimedia/libcamera-apps/libcamera-apps_git.bb DEPENDS on or otherwise requires it). and libcamera is part of meta-multimedia. I have no idea how the CI handled changes targeting rpi-libcamera-apps before.

I think the dependency on meta-multimedia should be added here.

kraj · 2023-08-01T19:03:54Z

I think this recipe can be made conditional. There are couple of ways.

Remove it from parsing if multimedia layer is absent

python() {
    if 'multimedia-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
        raise bb.parse.SkipRecipe('Requires meta-multimedia to be present.')
}

or use the dynamic-layers technique, which means move the recipe into

dynamic-layers/multimedia-layer/recipes-multimedia

I think second approach is better.

agherzan · 2023-08-02T09:58:11Z

I also vote for dynamic layers, but I remember that when that was introduced, there was a "chicken and the egg" with this.

shr-project · 2023-08-02T14:33:06Z

There is a dynamic-layer directory for this already as that's where libcamera bbappend is in:

meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera

Adding libcamera-apps there as well makes sense to me.
Does this PR fix:

rpi-libcamera-apps/1.1.2+gitAUTOINC+12098520a3-r0/git/core/libcamera_app.hpp:55:40: error: 'StreamRoles' in namespace 'libcamera' does not name a type; did you mean 'StreamRole'?
   55 |         using StreamRoles = libcamera::StreamRoles;
      |                                        ^~~~~~~~~~~
      |                                        StreamRole

?

I've just noticed it in my world builds.

shr-project · 2023-08-02T14:37:04Z

rpi-libcamera-apps/1.1.2+gitAUTOINC+12098520a3-r0/git/core/libcamera_app.hpp:55:40: error: 'StreamRoles' in namespace 'libcamera' does not name a type; did you mean 'StreamRole'?
   55 |         using StreamRoles = libcamera::StreamRoles;
      |                                        ^~~~~~~~~~~
      |                                        StreamRole

?

I've just noticed it in my world builds.

We need to bump SRCREV to get a fix for current libcamera from meta-oe:
raspberrypi/rpicam-apps@3d9ac10

shr-project · 2023-08-02T21:33:25Z

Thanks for update, I've tried to build it for rpi4-64 and fails with:

aarch64-oe-linux-g++: error: unrecognized command-line option '-mfpu=neon-fp-armv8'

Because even for aarch64 rpi4-64 it sets cpu to armv8-neon now (as raspberrypi4-64 OVERRIDES contain raspberrypi4 as well).

recipes-multimedia/libcamera-apps/rpi-libcamera-apps_git.bb

With armv8-neon being enforced for all ARM based machines, running any libcamera app on raspberrypi (e.g. Raspberry Pi B Rev 2) results in Illegal Instruction. To fix this, set armv8-neon for 32bit raspberrypi3 and raspberrypi4 but defaults to TARGET_ARCH for other non-aarch64 machines. Fixes: f162192 ("rpi-libcamera-apps: fix flags used in aarch64 builds") Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

The 'opencv' PACKAGECONFIG entry was missing the build dependency. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

Add a 'drm' PACKAGECONFIG entry in order to provide support for a DRM preview window while running the libcamera apps. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

The 'tensorflow-lite' PACKAGECONFIG entry was missing the corresponding build dependency. In order to be consistent with the build macros, replace the feature with a 'tflite' package config entry. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

Even though the libcamera apps are a rewrite of the rpicam apps and maintained by the raspberry folks, switching to libcamera makes the code hardware agnostic and thus could be compiled and used on various machines featuring a camera device supported by a libcamera pipeline. For this reason, do not enforce COMPATIBLE_MACHINE. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

The libcamera-apps project is written in a hardware-agnostic manner thanks to libcamera, and thus isn't specific to the rpi SoC family. Moreover, the project is correctly named libcamera-apps and not rpi-libcamera-apps, so rename the recipe in order to reflect that. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

Move the libcamera-apps recipe to dynamic-layers/multimedia-layer alongside with its libcamera dependency. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

Bump libcamera to 3d9ac10 to get a fix for the current libcamera from meta-openembedded/meta-multimedia for the following issue: error: 'StreamRoles' in namespace 'libcamera' does not name a type; did you mean 'StreamRole'? 55 | using StreamRoles = libcamera::StreamRoles; | ^~~~~~~~~~~ | StreamRole Reported-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

shr-project · 2023-08-02T23:36:22Z

Thanks, now it built OK in my world builds. LGTM

Next achievement is for switching the build to meson as CMake files were removed in latest:
raspberrypi/rpicam-apps@9e17265 :)

CMake is removed in upstream libcamera-apps as of 9e17265, thus switch to meson to build the package from now on. Add PACKAGECONFIG entries and neon flags matching the settings project meson.build as described in the official documentation https://www.raspberrypi.com/documentation/computers/camera_software.html#building-libcamera-apps Default to "drm" for PACKAGECONFIG as it is the only option enabled in both recommended meson setup for Raspberry Pi OS and Raspberry Pi OS Lite. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

Now that the libcamera package from meta-multimedia has support for flicker controls and libcamera-apps uses meson, we can bump the package to its latest revision. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

vivien · 2023-08-03T05:45:08Z

bec7182 requires openembedded/meta-openembedded#727 to be merged first.

agherzan · 2023-08-04T12:46:53Z

bec7182 requires openembedded/meta-openembedded#727 to be merged first.

Did this land?

shr-project · 2023-08-04T14:14:29Z

bec7182 requires openembedded/meta-openembedded#727 to be merged first.

Did this land?

It's in master-next since yesterday, will probably get merged to master soon. I've already tested them together.

I don't think you need to wait for meta-oe as rpi-camera-apps is already broken with the libcamera version currently in meta-oe/master (and this PR makes it compatible with master-next and future master).

kraj · 2023-08-07T18:28:06Z

bec7182 requires openembedded/meta-openembedded#727 to be merged first.

Did this land?

now yes.

agherzan · 2023-08-07T19:32:17Z

This will get automerged on CI pass. Thanks @vivien.

vivien changed the title ~~Libcamera apps~~ Libcamera apps improvements Jul 27, 2023

agherzan requested changes Jul 28, 2023

View reviewed changes

vivien force-pushed the libcamera-apps branch from 6d3b584 to 54f4a68 Compare August 2, 2023 20:37

shr-project reviewed Aug 2, 2023

View reviewed changes

recipes-multimedia/libcamera-apps/rpi-libcamera-apps_git.bb Outdated Show resolved Hide resolved

vivien added 8 commits August 2, 2023 18:00

rpi-libcamera-apps: add opencv build dependency

1b0586a

The 'opencv' PACKAGECONFIG entry was missing the build dependency. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

rpi-libcamera-apps: add drm support

5f929ef

Add a 'drm' PACKAGECONFIG entry in order to provide support for a DRM preview window while running the libcamera apps. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

libcamera-apps: move recipe to dynamic-layers

8320e79

Move the libcamera-apps recipe to dynamic-layers/multimedia-layer alongside with its libcamera dependency. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

vivien force-pushed the libcamera-apps branch from 54f4a68 to ffc5345 Compare August 2, 2023 22:04

vivien requested a review from agherzan August 2, 2023 22:23

vivien added 2 commits August 3, 2023 00:59

libcamera-apps: bump to latest main

bec7182

Now that the libcamera package from meta-multimedia has support for flicker controls and libcamera-apps uses meson, we can bump the package to its latest revision. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>

shr-project approved these changes Aug 3, 2023

View reviewed changes

agherzan approved these changes Aug 7, 2023

View reviewed changes

agherzan enabled auto-merge (rebase) August 7, 2023 14:16

agherzan merged commit 5e2f79a into agherzan:master Aug 8, 2023
17 checks passed

vivien deleted the libcamera-apps branch August 8, 2023 13:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Libcamera apps improvements #1205

Libcamera apps improvements #1205

vivien commented Jul 27, 2023

vivien commented Jul 27, 2023 •

edited

Loading

agherzan left a comment •

edited

Loading

vivien commented Jul 29, 2023 •

edited

Loading

kraj commented Jul 29, 2023

kraj commented Aug 1, 2023

agherzan commented Aug 2, 2023

shr-project commented Aug 2, 2023

shr-project commented Aug 2, 2023

shr-project commented Aug 2, 2023

shr-project commented Aug 2, 2023

vivien commented Aug 3, 2023

agherzan commented Aug 4, 2023

shr-project commented Aug 4, 2023 •

edited

Loading

kraj commented Aug 7, 2023

agherzan commented Aug 7, 2023

Libcamera apps improvements #1205

Libcamera apps improvements #1205

Conversation

vivien commented Jul 27, 2023

vivien commented Jul 27, 2023 • edited Loading

agherzan left a comment • edited Loading

Choose a reason for hiding this comment

vivien commented Jul 29, 2023 • edited Loading

kraj commented Jul 29, 2023

kraj commented Aug 1, 2023

agherzan commented Aug 2, 2023

shr-project commented Aug 2, 2023

shr-project commented Aug 2, 2023

shr-project commented Aug 2, 2023

shr-project commented Aug 2, 2023

vivien commented Aug 3, 2023

agherzan commented Aug 4, 2023

shr-project commented Aug 4, 2023 • edited Loading

kraj commented Aug 7, 2023

agherzan commented Aug 7, 2023

vivien commented Jul 27, 2023 •

edited

Loading

agherzan left a comment •

edited

Loading

vivien commented Jul 29, 2023 •

edited

Loading

shr-project commented Aug 4, 2023 •

edited

Loading