pipewire: update to pw 0.3.40 and wp 0.4.5

Change-Id: Ie9e3fd0a67e6a5fa38543cb9b4cc54f2e0555813
Signed-off-by: Ashok Sidipotu <ashok.sidipotu@collabora.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27040
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

2 files changed, 20 insertions, 12 deletions

diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/bluetooth.lua.d/30-bluez-monitor.lua b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/bluetooth.lua.d/30-bluez-monitor.lua
index 36fe749bb..530f4cc62 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/bluetooth.lua.d/30-bluez-monitor.lua
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/bluetooth.lua.d/30-bluez-monitor.lua
@@ -3,13 +3,15 @@
 bluez_monitor = {}
 
 bluez_monitor.properties = {
-  -- Enable mSBC support, disabled by default. Be aware that
-  -- mSBC is not expected to work on all headset + adapter combinations.
-  -- This can be overloaded for a specific device and native backend
-  -- in rules section.
-  --["bluez5.msbc-support"] = false,
+  -- These features do not work on all headsets, so they are enabled
+  -- by default based on the hardware database. They can also be
+  -- forced on/off for all devices by the following options:
 
-  --["bluez5.sbc-xq-support"] = true,
+  --["bluez5.enable-sbc-xq"] = true,
+  --["bluez5.enable-msbc"] = true,
+  --["bluez5.enable-hw-volume"] = true,
+
+  -- See bluez-hardware.conf for the hardware database.
 
   -- Enabled headset roles (default: [ hsp_hs hfp_ag ]), this
   -- property only applies to native backend. Currently some headsets
@@ -23,7 +25,11 @@ bluez_monitor.properties = {
   ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]",
 
   -- Enabled A2DP codecs (default: all).
-  --["bluez5.codecs"] = "[ sbc aac ldac aptx aptx_hd ]",
+  --["bluez5.codecs"] = "[ sbc sbc_xq aac ldac aptx aptx_hd aptx_ll aptx_ll_duplex faststream faststream_duplex ]",
+
+  -- HFP/HSP backend (default: native).
+  -- Available values: any, none, hsphfpd, ofono, native
+  ["bluez5.hfphsp-backend"] = "ofono",
 
   -- Properties for the A2DP codec configuration
   --["bluez5.default.rate"] = 48000,
@@ -50,9 +56,6 @@ bluez_monitor.rules = {
       --["bluez5.auto-connect"] = "[ hfp_hf hsp_hs a2dp_sink hfp_ag hsp_ag a2dp_source ]",
       ["bluez5.auto-connect"]  = "[ hfp_hf hsp_hs a2dp_sink ]",
 
-      -- Overload mSBC support for native backend and a specific device.
-      --["bluez5.msbc-support"] = false,
-
       -- Hardware volume control (default: [ hfp_ag hsp_ag a2dp_source ])
       --["bluez5.hw-volume"] = "[ hfp_hf hsp_hs a2dp_sink hfp_ag hsp_ag a2dp_source ]",
 
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/policy.lua.d/10-default-policy.lua b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/policy.lua.d/10-default-policy.lua
index f70f38b1f..82f5bb055 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/policy.lua.d/10-default-policy.lua
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/policy.lua.d/10-default-policy.lua
@@ -43,6 +43,11 @@ policy_config.policy = {
   ["move"] = false,  -- moves session items when metadata target.node changes
   ["follow"] = true, -- moves session items to the default device when it has changed
 
+  -- Set to 'true' to disable channel splitting & merging on nodes and enable
+  -- passthrough of audio in the same format as the format of the device.
+  -- Note that this breaks JACK support; it is generally not recommended
+  ["audio.no-dsp"] = false,
+
   -- how much to lower the volume of lower priority streams when ducking
   -- note that this is a linear volume modifier (not cubic as in pulseaudio)
   ["duck.level"] = 0.2,
@@ -108,8 +113,8 @@ load_module("mixer-api")
 -- Create endpoints statically at startup
 load_script("static-endpoints.lua", policy_config.endpoints)
 
--- Create items for nodes that appear in the graph
-load_script("create-item.lua")
+  -- Create session items for nodes that appear in the graph
+  load_script("create-item.lua", default_policy.policy)
 
 -- Link nodes to each other to make media flow in the graph
 load_script("policy-node.lua", policy_config.policy)