Add option to provide AudioProcessing to the PeerConnectionFactory

Author: devopvoid

webrtc-jni/src/main/cpp/include/JNI_PeerConnectionFactory.h

@@ -35,7 +35,7 @@
 #include "api/video_codecs/builtin_video_encoder_factory.h"
 
 JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_PeerConnectionFactory_initialize
-(JNIEnv * env, jobject caller, jobject audioModule)
+(JNIEnv * env, jobject caller, jobject audioModule, jobject audioProcessing)
 {
 	webrtc::AudioDeviceModule * audioDevModule = (audioModule != nullptr)
 		? GetHandle<webrtc::AudioDeviceModule>(env, audioModule)
@@ -56,30 +56,10 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_PeerConnectionFactory_initialize
 			throw jni::Exception("Start worker thread failed");
 		}
 
-
-
-		webrtc::AudioProcessing::Config config;
-		config.echo_canceller.enabled = true;
-		config.echo_canceller.enforce_high_pass_filtering = true;
-		config.echo_canceller.mobile_mode = false;
-
-		config.residual_echo_detector.enabled = true;
-
-		config.noise_suppression.enabled = true;
-		config.noise_suppression.analyze_linear_aec_output_when_available = true;
-
-		config.high_pass_filter.enabled = true;
-
-		config.level_estimation.enabled = true;
-		config.voice_detection.enabled = true;
-		config.transient_suppression.enabled = true;
-
-
-		rtc::scoped_refptr<webrtc::AudioProcessing> apm = webrtc::AudioProcessingBuilder().Create();
-		apm->ApplyConfig(config);
-
-
-
+		webrtc::AudioProcessing * processing = (audioProcessing != nullptr)
+			? GetHandle<webrtc::AudioProcessing>(env, audioProcessing)
+			: nullptr;
+		rtc::scoped_refptr<webrtc::AudioProcessing> apm(processing);
 
 		auto factory = webrtc::CreatePeerConnectionFactory(
 			networkThread.get(),

webrtc-jni/src/main/cpp/src/JNI_PeerConnectionFactory.cpp

@@ -22,6 +22,7 @@
 import dev.onvoid.webrtc.media.MediaType;
 import dev.onvoid.webrtc.media.audio.AudioDeviceModule;
 import dev.onvoid.webrtc.media.audio.AudioOptions;
+import dev.onvoid.webrtc.media.audio.AudioProcessing;
 import dev.onvoid.webrtc.media.audio.AudioTrackSource;
 import dev.onvoid.webrtc.media.audio.AudioTrack;
 import dev.onvoid.webrtc.media.video.VideoTrackSource;
@@ -60,17 +61,39 @@ public class PeerConnectionFactory extends DisposableNativeObject {
 	 * Creates an instance of PeerConnectionFactory.
 	 */
 	public PeerConnectionFactory() {
-		this(null);
+		this(null, null);
 	}
 
 	/**
 	 * Creates an instance of PeerConnectionFactory with the provided audio
-	 * module.
+	 * processing module.
 	 *
-	 * @param audioModule The custom audio module.
+	 * @param audioProcessing The custom audio processing module.
+	 */
+	public PeerConnectionFactory(AudioProcessing audioProcessing) {
+		initialize(null, audioProcessing);
+	}
+
+	/**
+	 * Creates an instance of PeerConnectionFactory with the provided audio
+	 * device module.
+	 *
+	 * @param audioModule The custom audio device module.
 	 */
 	public PeerConnectionFactory(AudioDeviceModule audioModule) {
-		initialize(audioModule);
+		initialize(audioModule, null);
+	}
+
+	/**
+	 * Creates an instance of PeerConnectionFactory with provided modules for
+	 * audio devices and audio processing.
+	 *
+	 * @param audioModule     The custom audio device module.
+	 * @param audioProcessing The custom audio processing module.
+	 */
+	public PeerConnectionFactory(AudioDeviceModule audioModule,
+			AudioProcessing audioProcessing) {
+		initialize(audioModule, audioProcessing);
 	}
 
 	/**
@@ -146,6 +169,7 @@ public native RTCPeerConnection createPeerConnection(
 	@Override
 	public native void dispose();
 
-	private native void initialize(AudioDeviceModule audioModule);
+	private native void initialize(AudioDeviceModule audioModule,
+			AudioProcessing audioProcessing);
 
 }

webrtc/src/main/java/dev/onvoid/webrtc/PeerConnectionFactory.java

@@ -21,7 +21,9 @@
 import dev.onvoid.webrtc.media.MediaSource;
 import dev.onvoid.webrtc.media.MediaStreamTrackState;
 import dev.onvoid.webrtc.media.MediaType;
+import dev.onvoid.webrtc.media.audio.AudioDeviceModule;
 import dev.onvoid.webrtc.media.audio.AudioOptions;
+import dev.onvoid.webrtc.media.audio.AudioProcessing;
 import dev.onvoid.webrtc.media.audio.AudioTrackSource;
 import dev.onvoid.webrtc.media.audio.AudioTrack;
 import dev.onvoid.webrtc.media.video.VideoDeviceSource;
@@ -31,6 +33,32 @@
 
 class PeerConnectionFactoryTests extends TestBase {
 
+	@Test
+	void createWithAudioDeviceModule() {
+		AudioDeviceModule audioDevModule = new AudioDeviceModule();
+
+		PeerConnectionFactory factory = new PeerConnectionFactory(audioDevModule);
+		factory.dispose();
+	}
+
+	@Test
+	void createWithAudioProcessing() {
+		AudioProcessing audioProcessing = new AudioProcessing();
+
+		PeerConnectionFactory factory = new PeerConnectionFactory(audioProcessing);
+		factory.dispose();
+	}
+
+	@Test
+	void createWithAudioModules() {
+		AudioDeviceModule audioDevModule = new AudioDeviceModule();
+		AudioProcessing audioProcessing = new AudioProcessing();
+
+		PeerConnectionFactory factory = new PeerConnectionFactory(
+				audioDevModule, audioProcessing);
+		factory.dispose();
+	}
+
 	@Test
 	void createPeerConnectionNullParams() {
 		assertThrows(NullPointerException.class, () -> {