Merge 9e95cc3f8a into 31ea366e51

audio.go

@@ -14,7 +14,7 @@ import (
 var (
 	audioMutex         sync.Mutex
 	outputSource       audio.AudioSource
-	inputSource        atomic.Pointer[audio.AudioSource]
+	inputSource        audio.AudioSource
 	outputRelay        *audio.OutputRelay
 	inputRelay         *audio.InputRelay
 	audioInitialized   bool
@@ -63,14 +63,13 @@ func startAudio() error {
 
 	// Start input audio if not running, USB audio enabled, and input enabled
 	ensureConfigLoaded()
-	if inputSource.Load() == nil && audioInputEnabled.Load() && config.UsbDevices != nil && config.UsbDevices.Audio {
+	if inputSource == nil && audioInputEnabled.Load() && config.UsbDevices != nil && config.UsbDevices.Audio {
 		alsaPlaybackDevice := "hw:1,0" // USB speakers
 
 		// Create CGO audio source
-		source := audio.NewCgoInputSource(alsaPlaybackDevice)
+		inputSource = audio.NewCgoInputSource(alsaPlaybackDevice)
-		inputSource.Store(&source)
 
-		inputRelay = audio.NewInputRelay(source)
+		inputRelay = audio.NewInputRelay(inputSource)
 		if err := inputRelay.Start(); err != nil {
 			audioLogger.Error().Err(err).Msg("Failed to start input relay")
 		}
@@ -79,48 +78,33 @@ func startAudio() error {
 	return nil
 }
 
-// stopOutputAudio stops output audio (device → browser)
+func stopAudio() {
-func stopOutputAudio() {
 	audioMutex.Lock()
 	outRelay := outputRelay
 	outSource := outputSource
+	inRelay := inputRelay
+	inSource := inputSource
 	outputRelay = nil
 	outputSource = nil
+	inputRelay = nil
+	inputSource = nil
 	audioMutex.Unlock()
 
-	// Disconnect outside mutex to avoid blocking during CGO calls
+	// Disconnect outside mutex to avoid blocking new sessions during CGO calls
 	if outRelay != nil {
 		outRelay.Stop()
 	}
 	if outSource != nil {
 		outSource.Disconnect()
 	}
-}
-
-// stopInputAudio stops input audio (browser → device)
-func stopInputAudio() {
-	audioMutex.Lock()
-	inRelay := inputRelay
-	inputRelay = nil
-	audioMutex.Unlock()
-
-	// Atomically swap and disconnect outside mutex
-	inSource := inputSource.Swap(nil)
-
-	// Disconnect outside mutex to avoid blocking during CGO calls
 	if inRelay != nil {
 		inRelay.Stop()
 	}
 	if inSource != nil {
-		(*inSource).Disconnect()
+		inSource.Disconnect()
 	}
 }
 
-func stopAudio() {
-	stopOutputAudio()
-	stopInputAudio()
-}
-
 func onWebRTCConnect() {
 	count := activeConnections.Add(1)
 	if count == 1 {
@@ -174,7 +158,19 @@ func SetAudioOutputEnabled(enabled bool) error {
 			return startAudio()
 		}
 	} else {
-		stopOutputAudio()
+		audioMutex.Lock()
+		outRelay := outputRelay
+		outSource := outputSource
+		outputRelay = nil
+		outputSource = nil
+		audioMutex.Unlock()
+
+		if outRelay != nil {
+			outRelay.Stop()
+		}
+		if outSource != nil {
+			outSource.Disconnect()
+		}
 	}
 
 	return nil
@@ -191,7 +187,19 @@ func SetAudioInputEnabled(enabled bool) error {
 			return startAudio()
 		}
 	} else {
-		stopInputAudio()
+		audioMutex.Lock()
+		inRelay := inputRelay
+		inSource := inputSource
+		inputRelay = nil
+		inputSource = nil
+		audioMutex.Unlock()
+
+		if inRelay != nil {
+			inRelay.Stop()
+		}
+		if inSource != nil {
+			inSource.Disconnect()
+		}
 	}
 
 	return nil
@@ -240,21 +248,23 @@ func handleInputTrackForSession(track *webrtc.TrackRemote) {
 			continue // Drop frame but keep reading
 		}
 
-		// Lock-free source access (hot path optimization)
+		// Get source in single mutex operation (hot path optimization)
-		source := inputSource.Load()
+		audioMutex.Lock()
+		source := inputSource
+		audioMutex.Unlock()
 
 		if source == nil {
 			continue // No relay, drop frame but keep reading
 		}
 
-		if !(*source).IsConnected() {
+		if !source.IsConnected() {
-			if err := (*source).Connect(); err != nil {
+			if err := source.Connect(); err != nil {
 				continue
 			}
 		}
 
-		if err := (*source).WriteMessage(0, opusData); err != nil {
+		if err := source.WriteMessage(0, opusData); err != nil {
-			(*source).Disconnect()
+			source.Disconnect()
 		}
 	}
 }