summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2024-09-04 16:27:15 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2024-09-09 14:37:44 +0000
commit15d8f1f9263e9c6eba2e728aac6a9485e471239b (patch)
tree7286602b6f0191928fac4e0b88799a5f10d44da2
parent0f13b08e09b9fbb99e52d446504e4d2681ca437f (diff)
meta-agl-demo: update audiomixer & wireplumber bbappend for 0.5 update
Bug-AGL: SPEC-4934 Change-Id: I4ca64a4c34fef3565611a4494fd87f9013d6ac7f Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30244 Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> ci-image-build: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> (cherry picked from commit cf57bd29b9bf9614d9fa7f7e80fc4a6cfbcde7a0) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30210
-rw-r--r--recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb2
-rw-r--r--recipes-multimedia/wireplumber/files/30-AGL-demo-v4l2.conf22
-rw-r--r--recipes-multimedia/wireplumber/files/30-v4l2-monitor.lua59
-rw-r--r--recipes-multimedia/wireplumber/wireplumber-config-agl_%.bbappend6
4 files changed, 25 insertions, 64 deletions
diff --git a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb
index a1f6f795c..d510d6401 100644
--- a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb
+++ b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb
@@ -24,7 +24,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-audiomixer.g
file://agl-service-audiomixer.conf.gateway-demo \
file://agl-service-audiomixer.token \
"
-SRCREV = "0ff3ef1b254364639fc42495bbcfb4760250990a"
+SRCREV = "c2737d3999723a3818610afd22b0af2e9e390ab9"
PV = "2.0+git${SRCPV}"
S = "${WORKDIR}/git"
diff --git a/recipes-multimedia/wireplumber/files/30-AGL-demo-v4l2.conf b/recipes-multimedia/wireplumber/files/30-AGL-demo-v4l2.conf
new file mode 100644
index 000000000..0a2a3b639
--- /dev/null
+++ b/recipes-multimedia/wireplumber/files/30-AGL-demo-v4l2.conf
@@ -0,0 +1,22 @@
+# meta-agl-demo WirePlumber V4L2 monitor configuration
+
+monitor.v4l2.rules = [
+ #
+ # Bump the priority of any USB camera
+ # Higher priority means it gets selected as the default if it's present
+ # This makes camera-gstreamer work out of the box in demos with a USB camera
+ #
+ {
+ matches = [
+ {
+ node.name = "~v4l2_input.*usb.*"
+ }
+ ]
+ actions = {
+ update-props = {
+ priority.driver = 1300
+ priority.session = 1300
+ }
+ }
+ }
+]
diff --git a/recipes-multimedia/wireplumber/files/30-v4l2-monitor.lua b/recipes-multimedia/wireplumber/files/30-v4l2-monitor.lua
deleted file mode 100644
index 394386235..000000000
--- a/recipes-multimedia/wireplumber/files/30-v4l2-monitor.lua
+++ /dev/null
@@ -1,59 +0,0 @@
--- V4L2 monitor config file; with selecting by default USB camera --
-
-v4l2_monitor = {}
-v4l2_monitor.properties = {}
-
-v4l2_monitor.rules = {
- -- An array of matches/actions to evaluate.
- {
- -- Rules for matching a device or node. It is an array of
- -- properties that all need to match the regexp. If any of the
- -- matches work, the actions are executed for the object.
- matches = {
- {
- -- This matches all cards.
- { "device.name", "matches", "v4l2_device.*" },
- },
- },
- -- Apply properties on the matched object.
- apply_properties = {
- -- ["device.nick"] = "My Device",
- },
- },
- {
- matches = {
- {
- -- Matches all sources.
- { "node.name", "matches", "v4l2_input.*" },
- },
- {
- -- Matches all sinks.
- { "node.name", "matches", "v4l2_output.*" },
- },
- },
- apply_properties = {
- --["node.nick"] = "My Node",
- --["priority.driver"] = 100,
- --["priority.session"] = 100,
- --["node.pause-on-idle"] = false,
- },
- },
- {
- matches = {
- {
- { "node.name", "matches", "v4l2_input*usb*" },
- },
- },
- apply_properties = {
- ["priority.driver"] = 1300,
- ["priority.session"] = 1300,
- },
- },
-}
-
-function v4l2_monitor.enable()
- load_monitor("v4l2", {
- properties = v4l2_monitor.properties,
- rules = v4l2_monitor.rules,
- })
-end
diff --git a/recipes-multimedia/wireplumber/wireplumber-config-agl_%.bbappend b/recipes-multimedia/wireplumber/wireplumber-config-agl_%.bbappend
index 8f93868db..f39efc1c0 100644
--- a/recipes-multimedia/wireplumber/wireplumber-config-agl_%.bbappend
+++ b/recipes-multimedia/wireplumber/wireplumber-config-agl_%.bbappend
@@ -1,10 +1,8 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI += "file://30-v4l2-monitor.lua"
+SRC_URI += "file://30-AGL-demo-v4l2.conf"
do_install:append() {
- # override the one from meta-agl to be able to set as default USB camera
- # such that camera-gstreamer and implicitly pipewire work out of the box
- install -D -m 0644 ${WORKDIR}/30-v4l2-monitor.lua ${D}${sysconfdir}/wireplumber/host.lua.d/
+ install -D -m 0644 ${WORKDIR}/30-AGL-demo-v4l2.conf ${D}${sysconfdir}/wireplumber/wireplumber.conf.d/
}