device: remove echo-cancel configuration

This will be possible to do with the new filter-utils.lua design.

src/config/wireplumber.conf

@@ -434,11 +434,6 @@ wireplumber.components = [
     provides = hooks.default-nodes.find-best
     requires = [ support.lua-scripting ]
   }
-  {
-    name = default-nodes/find-echo-cancel-default-node.lua, type = script/lua
-    provides = hooks.default-nodes.find-echo-cancel
-    requires = [ support.lua-scripting ]
-  }
   {
     name = default-nodes/state-default-nodes.lua, type = script/lua
     provides = hooks.default-nodes.state
@@ -455,7 +450,6 @@ wireplumber.components = [
                  hooks.default-nodes.apply ]
     wants = [ hooks.default-nodes.find-selected,
               hooks.default-nodes.find-best,
-              hooks.default-nodes.find-echo-cancel,
               hooks.default-nodes.state ]
   }
 

src/config/wireplumber.conf.d/device.conf

@@ -15,15 +15,6 @@ wireplumber.settings = {
   ## The persistent save interval in milliseconds when a change happens
   # device.save-interval-ms = 1000
 
-  ## Whether to auto-switch to echo cancel sink and source nodes or not
-  # device.auto-echo-cancel = true
-
-  ## Sets the default echo-cancel-sink node name to automatically switch to
-  # device.echo-cancel-sink-name = "echo-cancel-sink"
-
-  ## Sets the default echo-cancel-source node name to automatically switch to
-  # device.echo-cancel-source-name = "echo-cancel-source"
-
   ## The device discovery time out(in milli sec) between V4L2 and libcamera.
   # device.camera-discovery-timeout = 100
 }

src/scripts/default-nodes/apply-default-node.lua

@@ -9,7 +9,6 @@ log = Log.open_topic ("s-default-nodes")
 SimpleEventHook {
   name = "default-nodes/apply-default-node",
   after = { "default-nodes/find-best-default-node",
-            "default-nodes/find-echo-cancel-default-node",
             "default-nodes/find-selected-default-node",
             "default-nodes/find-stored-default-node" },
   interests = {

src/scripts/default-nodes/find-echo-cancel-default-node.lua

@@ -1,70 +0,0 @@
--- WirePlumber
---
--- Copyright © 2022 Collabora Ltd.
---
--- SPDX-License-Identifier: MIT
-
-cutils = require ("common-utils")
-config = require ("device-config")
-log = Log.open_topic ("s-default-nodes")
-
-enabled = false
-
-find_echo_cancel_default_node_hook = SimpleEventHook {
-  name = "default-nodes/find-echo-cancel-default-node",
-  interests = {
-    EventInterest {
-      Constraint { "event.type", "=", "select-default-node" },
-      Constraint { "default-node.type", "#", "audio.*" },
-    },
-  },
-  execute = function (event)
-    local props = event:get_properties ()
-    local available_nodes = event:get_data ("available-nodes")
-    local selected_prio = event:get_data ("selected-node-priority") or 0
-    local selected_node = event:get_data ("selected-node")
-
-    available_nodes = available_nodes and available_nodes:parse ()
-    if not available_nodes then
-      return
-    end
-
-    -- Get the part after "audio." (= 6 characters)
-    local srcsink = props ["default-node.type"]:sub (7)
-
-    for _, node_props in ipairs (available_nodes) do
-      if isEchoCancelNode (node_props, srcsink) then
-        local priority = node_props ["priority.session"]
-        priority = math.tointeger (priority) or 0
-        priority = priority + 10001 - i
-
-        if priority > selected_prio then
-          selected_prio = priority
-          selected_node = name
-        end
-      end
-    end
-
-    if selected_node then
-      event:set_data ("selected-node-priority", selected_prio)
-      event:set_data ("selected-node", selected_node)
-    end
-  end
-}
-
-function isEchoCancelNode (node_props, srcsink)
-  local virtual = cutils.parseBool (node_props ["node.virtual"])
-  return virtual and
-      node_props ["node.name"] == config ["echo-cancel-" .. srcsink .. "-name"]
-end
-
-function toggleAutoEchoCancel (enable)
-  if enable and not enabled then
-    find_echo_cancel_default_node_hook:register ()
-  elseif not enable and enabled then
-    find_echo_cancel_default_node_hook:remove ()
-  end
-end
-
-config:subscribe ("auto-echo-cancel", toggleAutoEchoCancel)
-toggleAutoEchoCancel (config.auto_echo_cancel)

src/scripts/lib/device-config.lua

@@ -12,9 +12,6 @@ local defaults = {
   ["use-persistent-storage"] = true,
   ["default-volume"] = 0.4 ^ 3,
   ["default-input-volume"] = 1.0,
-  ["auto-echo-cancel"] = true,
-  ["echo-cancel-sink-name"] = "echo-cancel-sink",
-  ["echo-cancel-source-name"] = "echo-cancel-source",
   ["camera-discovery-timeout"] = 100,
 }
 

tests/script-tester.c

@@ -243,7 +243,6 @@ load_components (ScriptRunnerFixture *f, gconstpointer argv)
     load_component (f, "si-audio-virtual", "module");
 
     load_component (f, "default-nodes/apply-default-node.lua", "script/lua");
-    load_component (f, "default-nodes/find-echo-cancel-default-node.lua", "script/lua");
     load_component (f, "default-nodes/state-default-nodes.lua", "script/lua");
     load_component (f, "default-nodes/find-best-default-node.lua", "script/lua");
     load_component (f, "default-nodes/rescan.lua", "script/lua");