revert: "feat: add noise-supression to calls" #17335

Author: Antreesy

src/components/MediaSettings/AdvancedAudioDialog.vue

@@ -10,7 +10,6 @@ import NcFormBox from '@nextcloud/vue/components/NcFormBox'
 import NcFormBoxSwitch from '@nextcloud/vue/components/NcFormBoxSwitch'
 import { useDevices } from '../../composables/useDevices.js'
 import { useSettingsStore } from '../../stores/settings.ts'
-import { localMediaModel } from '../../utils/webrtc/index.js'
 
 const props = defineProps<{
 	container?: string
@@ -67,14 +66,6 @@ function onClosing(result?: unknown) {
 	)) {
 		// Apply changes to audio stream
 		updateAudioStream(true)
-
-		if (localMediaModel.getWebRtc()) {
-			if (settingsStore.noiseSuppressionWithModel) {
-				localMediaModel.enableNoiseSuppression()
-			} else {
-				localMediaModel.disableNoiseSuppression()
-			}
-		}
 	}
 
 	emit('close', result)

src/components/NewMessage/NewMessageAudioRecorder.vue

@@ -57,9 +57,9 @@ import { useAudioEncoder } from '../../composables/useAudioEncoder.ts'
 import { useGetToken } from '../../composables/useGetToken.ts'
 import { useSettingsStore } from '../../stores/settings.ts'
 import {
+	destroyNoiseSuppressionWorklet,
 	processNoiseSuppression,
 	registerNoiseSuppressionWorklet,
-	unregisterNoiseSuppressionWorklet,
 } from '../../utils/suppressNoise.ts'
 import { mediaDevicesManager } from '../../utils/webrtc/index.js'
 
@@ -208,7 +208,7 @@ export default {
 				if (this.settingsStore.noiseSuppressionWithModel) {
 					this.noiseSuppressionConsumer = await registerNoiseSuppressionWorklet()
 				}
-				const audioStreamProcessed = processNoiseSuppression(this.audioStream, this.noiseSuppressionConsumer, this.settingsStore.noiseSuppressionWithModel)
+				const audioStreamProcessed = processNoiseSuppression(this.audioStream, this.settingsStore.noiseSuppressionWithModel)
 				this.mediaRecorder = new this.MediaRecorder(audioStreamProcessed, {
 					mimeType: 'audio/wav',
 				})
@@ -264,7 +264,7 @@ export default {
 			clearInterval(this.recordTimer)
 			this.$emit('recording', false)
 			if (this.noiseSuppressionConsumer) {
-				unregisterNoiseSuppressionWorklet(this.noiseSuppressionConsumer)
+				destroyNoiseSuppressionWorklet(this.noiseSuppressionConsumer)
 				this.noiseSuppressionConsumer = null
 			}
 		},

src/utils/media/pipeline/NoiseSuppressor.js

@@ -8,87 +8,63 @@ import { loadRnnoise, RnnoiseWorkletNode } from '@sapphi-red/web-noise-suppresso
 let audioContext: AudioContext | null = null
 let rnnoiseWorklet: RnnoiseWorkletNode | null = null
 const workletConsumers = new Set<symbol>()
-const workletCleanupCallbackMap = new Map<symbol, () => void>()
 
 /**
  * Creates and registers global RNNoiseWorkletNode and AudioContext.
  *
  * @returns A promise that resolves with a unique symbol
  * representing the consumer. This symbol must be passed to
- * `unregisterNoiseSuppressionWorklet` when the consumer is done.
+ * `destroyNoiseSuppressionWorklet` when the consumer is done.
  */
-export async function registerNoiseSuppressionWorklet(): Promise<symbol | null> {
+export async function registerNoiseSuppressionWorklet(): Promise<symbol> {
 	const consumer = Symbol('noise-suppression-consumer')
 	workletConsumers.add(consumer)
 
 	if (audioContext && rnnoiseWorklet) {
-		if (audioContext.state === 'suspended') {
-			await audioContext.resume()
-		}
-
 		// Already registered
 		return consumer
 	}
 
-	try {
-		audioContext = new AudioContext()
-		const rnnoiseWasmBinary = await loadRnnoise({
-			url: new URL(
-				'../../node_modules/@sapphi-red/web-noise-suppressor/dist/rnnoise.wasm',
-				import.meta.url,
-			).pathname,
-			simdUrl: new URL(
-				'../../node_modules/@sapphi-red/web-noise-suppressor/dist/rnnoise_simd.wasm',
-				import.meta.url,
-			).pathname,
-		})
-		await audioContext.audioWorklet.addModule(new URL(
-			'../../node_modules/@sapphi-red/web-noise-suppressor/dist/rnnoise/workletProcessor.js',
+	audioContext = new AudioContext()
+	const rnnoiseWasmBinary = await loadRnnoise({
+		url: new URL(
+			'../../node_modules/@sapphi-red/web-noise-suppressor/dist/rnnoise.wasm',
 			import.meta.url,
-		).pathname)
-		rnnoiseWorklet = new RnnoiseWorkletNode(audioContext, {
-			wasmBinary: rnnoiseWasmBinary,
-			maxChannels: 2,
-		})
-
-		if (audioContext.state === 'suspended') {
-			await audioContext.resume()
-		}
-
-		return consumer
-	} catch (error) {
-		console.error('Error initializing RNNoiseWorklet:', error)
-		await destroyNoiseSuppressionWorklet()
-		workletConsumers.delete(consumer)
-		return null
-	}
+		).pathname,
+		simdUrl: new URL(
+			'../../node_modules/@sapphi-red/web-noise-suppressor/dist/rnnoise_simd.wasm',
+			import.meta.url,
+		).pathname,
+	})
+	await audioContext.audioWorklet.addModule(new URL(
+		'../../node_modules/@sapphi-red/web-noise-suppressor/dist/rnnoise/workletProcessor.js',
+		import.meta.url,
+	).pathname)
+	rnnoiseWorklet = new RnnoiseWorkletNode(audioContext, {
+		wasmBinary: rnnoiseWasmBinary,
+		maxChannels: 2,
+	})
+
+	return consumer
 }
 
 /**
- * Unregister consumer from the global RNNoiseWorkletNode and AudioContext
+ * Destroys the global RNNoiseWorkletNode and AudioContext
  * if there are no other worklet consumers left.
  *
  * @param consumer The symbol returned by `registerNoiseSuppressionWorklet`.
  */
-export async function unregisterNoiseSuppressionWorklet(consumer: symbol) {
+export async function destroyNoiseSuppressionWorklet(consumer: symbol) {
 	if (!workletConsumers.has(consumer)) {
 		return
 	}
 
-	cleanupNoiseSuppressionWorklet(consumer)
 	workletConsumers.delete(consumer)
 
 	if (workletConsumers.size > 0) {
 		return
-	} else {
-		await destroyNoiseSuppressionWorklet()
 	}
-}
 
-/**
- * Destroys the global RNNoiseWorkletNode and AudioContext
- */
-export async function destroyNoiseSuppressionWorklet() {
 	if (rnnoiseWorklet) {
 		try {
 			rnnoiseWorklet?.disconnect()
@@ -113,10 +89,9 @@ export async function destroyNoiseSuppressionWorklet() {
  * Requires that RNNoiseWorklet has been asynchronously registered beforehand.
  *
  * @param stream - MediaStream to process
- * @param consumer - Unique consumer id returned by `registerNoiseSuppressionWorklet`
  * @param enabled - Whether noise suppression is enabled
  */
-export function processNoiseSuppression(stream: MediaStream, consumer: symbol | null, enabled = false): MediaStream {
+export function processNoiseSuppression(stream: MediaStream, enabled = false): MediaStream {
 	if (!enabled) {
 		// No noise suppression requested; return the original stream
 		return stream
@@ -127,32 +102,24 @@ export function processNoiseSuppression(stream: MediaStream, consumer: symbol |
 		return stream
 	}
 
-	if (!audioContext || !rnnoiseWorklet || !consumer) {
+	if (!audioContext || !rnnoiseWorklet) {
 		return stream
 	}
 
-	cleanupNoiseSuppressionWorklet(consumer)
-	return processRnnoise(stream, consumer)
+	return processRnnoise(stream)
 }
 
 /**
  * Connects the RNNoiseWorklet to the given MediaStream and returns a new MediaStream with noise suppression applied.
  *
  * @param stream - MediaStream to process
- * @param consumer - Unique consumer id returned by `registerNoiseSuppressionWorklet`
  */
-export function processRnnoise(stream: MediaStream, consumer: symbol): MediaStream {
+export function processRnnoise(stream: MediaStream): MediaStream {
 	try {
 		const mediaStreamAudioSource = audioContext!.createMediaStreamSource(stream)
-		const outputGainNode = audioContext!.createGain()
 		const mediaStreamAudioDestinationNode = audioContext!.createMediaStreamDestination()
-
-		// Gain node configuration (to increase the output of processed track)
-		outputGainNode.gain.value = 2
-
 		mediaStreamAudioSource.connect(rnnoiseWorklet!)
-		rnnoiseWorklet!.connect(outputGainNode)
-		outputGainNode.connect(mediaStreamAudioDestinationNode)
+		rnnoiseWorklet!.connect(mediaStreamAudioDestinationNode)
 
 		const processedAudioTrack = mediaStreamAudioDestinationNode.stream.getAudioTracks()[0]
 		if (!processedAudioTrack) {
@@ -164,33 +131,9 @@ export function processRnnoise(stream: MediaStream, consumer: symbol): MediaStre
 			stream.removeTrack(track)
 		}
 		stream.addTrack(processedAudioTrack)
-
-		workletCleanupCallbackMap.set(consumer, () => {
-			try {
-				mediaStreamAudioSource.disconnect(rnnoiseWorklet!)
-				rnnoiseWorklet!.disconnect(outputGainNode)
-				outputGainNode.disconnect(mediaStreamAudioDestinationNode)
-				mediaStreamAudioDestinationNode.disconnect()
-			} catch (error) {
-				console.error(error)
-			}
-			processedAudioTrack.stop()
-		})
 	} catch (error) {
 		console.error('Error processing noise suppression:', error)
 	}
 
 	return stream
 }
-
-/**
- * Cleans up the processing nodes currently associated with a consumer.
- *
- * @param consumer - Unique consumer id returned by `registerNoiseSuppressionWorklet`
- */
-function cleanupNoiseSuppressionWorklet(consumer: symbol) {
-	if (workletCleanupCallbackMap.has(consumer)) {
-		workletCleanupCallbackMap.get(consumer)!()
-		workletCleanupCallbackMap.delete(consumer)
-	}
-}