fix: fix failure to change audio input device

In ReduceNoise mode, dde audio can not get the master device on echo-cancel-source.

Log:
pms: BUG-324445

Author: fly602

audio1/audio.go

@@ -7,14 +7,16 @@ package audio
 import (
 	"errors"
 	"fmt"
-	"github.com/linuxdeepin/go-lib/strv"
 	"math"
 	"os"
+	"regexp"
 	"sort"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/linuxdeepin/go-lib/strv"
+
 	dbus "github.com/godbus/dbus/v5"
 	"github.com/linuxdeepin/dde-daemon/common/dsync"
 	notifications "github.com/linuxdeepin/go-dbus-factory/session/org.freedesktop.notifications"
@@ -1653,6 +1655,10 @@ func (a *Audio) refreshBluetoothOpts() {
 }
 
 func (a *Audio) updateDefaultSink(sinkName string) {
+	if a.defaultSink.Name == sinkName {
+		logger.Warningf("defaultSink %s is the same as sinkName %s", a.defaultSink.Name, sinkName)
+		return
+	}
 	sinkInfo := a.getSinkInfoByName(sinkName)
 
 	if sinkInfo == nil {
@@ -1663,11 +1669,16 @@ func (a *Audio) updateDefaultSink(sinkName string) {
 	logger.Debugf("updateDefaultSink #%d %s", sinkInfo.Index, sinkName)
 	a.moveSinkInputsToSink(sinkInfo.Index)
 	if !isPhysicalDevice(sinkName) {
-		sinkInfo = a.getSinkInfoByName(sinkInfo.PropList["device.master_device"])
-		if sinkInfo == nil {
+		master := a.getMasterNameFromVirtualDevice(sinkName)
+		if master == "" {
 			logger.Warning("failed to get virtual device sinkInfo for name:", sinkName)
 			return
 		}
+		sinkInfo = a.getSinkInfoByName(master)
+		if sinkInfo == nil {
+			logger.Warning("failed to get virtual device sinkInfo for name:", master)
+			return
+		}
 	}
 	a.mu.Lock()
 	sink, ok := a.sinks[sinkInfo.Index]
@@ -1748,6 +1759,10 @@ func (a *Audio) updateSinks(index uint32) (sink *Sink) {
 }
 
 func (a *Audio) updateDefaultSource(sourceName string) {
+	if a.defaultSource.Name == sourceName {
+		logger.Warningf("defaultSource %s is the same as sourceName %s", a.defaultSource.Name, sourceName)
+		return
+	}
 	sourceInfo := a.getSourceInfoByName(sourceName)
 	if sourceInfo == nil {
 		logger.Warning("failed to get sourceInfo for name:", sourceName)
@@ -1757,7 +1772,12 @@ func (a *Audio) updateDefaultSource(sourceName string) {
 	logger.Debugf("updateDefaultSource #%d %s", sourceInfo.Index, sourceName)
 
 	if !isPhysicalDevice(sourceName) {
-		sourceInfo = a.getSourceInfoByName(sourceInfo.Proplist["device.master_device"])
+		master := a.getMasterNameFromVirtualDevice(sourceName)
+		if master == "" {
+			logger.Error("failed to get virtual device for name:", sourceName)
+			return
+		}
+		sourceInfo = a.getSourceInfoByName(master)
 		if sourceInfo == nil {
 			logger.Warning("failed to get virtual device sourceInfo for name:", sourceName)
 			return
@@ -1858,6 +1878,20 @@ func (a *Audio) getDefaultSinkName() string {
 	return v
 }
 
+func (a *Audio) getMasterNameFromVirtualDevice(device string) string {
+	modules := a.ctx.GetModuleList()
+	for _, module := range modules {
+		if strings.Contains(module.Name, "echo-cancel") {
+			re := regexp.MustCompile(`source_master=([^\s]+)`)
+			match := re.FindStringSubmatch(module.Argument)
+			if len(match) > 1 {
+				return match[1]
+			}
+		}
+	}
+	return ""
+}
+
 func (a *Audio) getSinkInfoByName(sinkName string) *pulse.Sink {
 	for _, sinkInfo := range a.ctx.GetSinkList() {
 		if sinkInfo.Name == sinkName {

audio1/audio_config.go

@@ -93,7 +93,9 @@ func (a *Audio) setReduceNoise(enable bool) error {
 	var err error
 	var out []byte
 	if enable {
-		out, err = exec.Command("/bin/sh", "/usr/share/dde-daemon/audio/echoCancelEnable.sh").CombinedOutput()
+		sourceName := a.getDefaultSourceName()
+		logger.Debugf("echoCancelEnable.sh --source_master=%s", sourceName)
+		out, err = exec.Command("/usr/share/dde-daemon/audio/echoCancelEnable.sh", "--source_master="+sourceName).CombinedOutput()
 		if err != nil {
 			logger.Warningf("failed to enable reduce noise %v %s", err, out)
 		}

audio1/source.go

@@ -45,14 +45,20 @@ func newSource(sourceInfo *pulse.Source, audio *Audio) *Source {
 		service: audio.service,
 	}
 	if !isPhysicalDevice(sourceInfo.Name) {
-		masterSourceInfo := audio.getSourceInfoByName(sourceInfo.Proplist["device.master_device"])
-		if masterSourceInfo == nil {
-			logger.Warningf("cannot get master source for %s", sourceInfo.Name)
+		master := audio.getMasterNameFromVirtualDevice(sourceInfo.Name)
+		if master != "" {
+
+			masterSourceInfo := audio.getSourceInfoByName(master)
+			if masterSourceInfo == nil {
+				logger.Warningf("cannot get master source for %s", sourceInfo.Name)
+			} else {
+				sourceInfo.Card = masterSourceInfo.Card
+				sourceInfo.Ports = masterSourceInfo.Ports
+				sourceInfo.ActivePort = masterSourceInfo.ActivePort
+				logger.Debugf("create reducing noise source on %s", masterSourceInfo.Name)
+			}
 		} else {
-			sourceInfo.Card = masterSourceInfo.Card
-			sourceInfo.Ports = masterSourceInfo.Ports
-			sourceInfo.ActivePort = masterSourceInfo.ActivePort
-			logger.Debugf("create reducing noise source on %s", masterSourceInfo.Name)
+			logger.Warningf("cannot get master source for %s", sourceInfo.Name)
 		}
 	}
 
@@ -256,14 +262,19 @@ func (*Source) GetInterfaceName() string {
 func (s *Source) update(sourceInfo *pulse.Source) {
 	// 如果是虚拟通道，则将card和ports等设为对应主通道的值，这是为了能够正常使用降噪的训通道
 	if !isPhysicalDevice(sourceInfo.Name) {
-		masterSourceInfo := s.audio.getSourceInfoByName(sourceInfo.Proplist["device.master_device"])
-		if masterSourceInfo == nil {
-			logger.Warningf("cannot get master source for %s", sourceInfo.Name)
+		master := s.audio.getMasterNameFromVirtualDevice(sourceInfo.Name)
+		if master != "" {
+			masterSourceInfo := s.audio.getSourceInfoByName(master)
+			if masterSourceInfo == nil {
+				logger.Warningf("cannot get master source for %s", sourceInfo.Name)
+			} else {
+				sourceInfo.Card = masterSourceInfo.Card
+				sourceInfo.Ports = masterSourceInfo.Ports
+				sourceInfo.ActivePort = masterSourceInfo.ActivePort
+				logger.Debugf("create reducing noise source on %s", masterSourceInfo.Name)
+			}
 		} else {
-			sourceInfo.Card = masterSourceInfo.Card
-			sourceInfo.Ports = masterSourceInfo.Ports
-			sourceInfo.ActivePort = masterSourceInfo.ActivePort
-			logger.Debugf("create reducing noise source on %s", masterSourceInfo.Name)
+			logger.Warningf("cannot get master source for %s", sourceInfo.Name)
 		}
 	}
 

misc/dde-daemon/audio/echoCancelEnable.sh

@@ -1,13 +1,36 @@
 #!/bin/bash
-aecArgs="$*"
-# If no "aec_args" are passed on to the script, use this "aec_args" as default:
-[ -z "$aecArgs" ] && aecArgs="analog_gain_control=0 digital_gain_control=1"
+
+# 如果没有传递 aecArgs，使用默认值
 newSourceName="echo-cancel-source"
+aecArgs="analog_gain_control=0 digital_gain_control=1"
+sourceMaster=""
+
+# 解析参数
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --aec_args=*)
+            aecArgs="${1#*=}"
+            shift
+            ;;
+        --source_master=*)
+            sourceMaster="${1#*=}"
+            shift
+            ;;
+        *)
+            shift
+            ;;
+    esac
+done
+
+moduleArgs="source_name=$newSourceName"
+if [ -n "$sourceMaster" ]; then
+    moduleArgs="$moduleArgs source_master=$sourceMaster"
+fi
 
 # Reload "module-echo-cancel"
-echo Reload \"module-echo-cancel\" with \"aec_args=$aecArgs\"
+echo Reload \"module-echo-cancel\" with \"aec_args=$aecArgs\" $moduleArgs
 pactl unload-module module-echo-cancel 2>/dev/null
-if pactl load-module module-echo-cancel use_master_format=1 aec_method=webrtc aec_args=\"$aecArgs\" source_name=$newSourceName; then
-	# Set a new default source and sink, if module-echo-cancel has loaded successfully.
-	pactl set-default-source $newSourceName
-fi
+
+if pactl load-module module-echo-cancel use_master_format=1 aec_method=webrtc aec_args=\"$aecArgs\" $moduleArgs; then
+    pactl set-default-source $newSourceName
+fi