Split AudioProcessingConfig into individual config classes. Added get/set of stream-delay to AudioProcessing.

Author: devopvoid

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

@@ -34,17 +34,124 @@ namespace jni
 				explicit JavaAudioProcessingConfigClass(JNIEnv * env);
 
 				jclass cls;
-				jfieldID echoCancellerEnabled;
-				jfieldID residualEchoDetectorEnabled;
-				jfieldID gainControlEnabled;
-				jfieldID highPassFilterEnabled;
-				jfieldID noiseSuppressionEnabled;
-				jfieldID transientSuppressionEnabled;
-				jfieldID levelEstimationEnabled;
-				jfieldID voiceDetectionEnabled;
+				jfieldID echoCanceller;
+				jfieldID gainControl;
+				jfieldID highPassFilter;
+				jfieldID levelEstimation;
+				jfieldID noiseSuppression;
+				jfieldID residualEchoDetector;
+				jfieldID transientSuppression;
+				jfieldID voiceDetection;
 		};
 
 		webrtc::AudioProcessing::Config toNative(JNIEnv * env, const JavaRef<jobject> & javaType);
+		webrtc::AudioProcessing::Config::GainController2 toGainController2(JNIEnv * env, const JavaLocalRef<jobject> & javaType);
+
+
+		class JavaEchoCancellerClass : public JavaClass
+		{
+			public:
+				explicit JavaEchoCancellerClass(JNIEnv * env);
+
+				jclass cls;
+				jfieldID enabled;
+				jfieldID enforceHighPassFiltering;
+		};
+
+		class JavaGainControlClass : public JavaClass
+		{
+			public:
+				explicit JavaGainControlClass(JNIEnv * env);
+
+				jclass cls;
+				jfieldID enabled;
+				jfieldID fixedDigital;
+				jfieldID adaptiveDigital;
+		};
+
+		class JavaGainControlFixedDigitalClass : public JavaClass
+		{
+			public:
+				explicit JavaGainControlFixedDigitalClass(JNIEnv * env);
+
+				jclass cls;
+				jfieldID gainDb;
+		};
+
+		class JavaGainControlAdaptiveDigitalClass : public JavaClass
+		{
+			public:
+				explicit JavaGainControlAdaptiveDigitalClass(JNIEnv * env);
+
+				jclass cls;
+				jfieldID enabled;
+				jfieldID dryRun;
+				jfieldID vadResetPeriodMs;
+				jfieldID adjacentSpeechFramesThreshold;
+				jfieldID maxGainChangeDbPerSecond;
+				jfieldID maxOutputNoiseLevelDbfs;
+				jfieldID vadProbabilityAttack;
+				jfieldID levelEstimatorAdjacentSpeechFramesThreshold;
+				jfieldID useSaturationProtector;
+				jfieldID initialSaturationMarginDb;
+				jfieldID extraSaturationMarginDb;
+				jfieldID gainApplierAdjacentSpeechFramesThreshold;
+		};
+
+		class JavaHighPassFilterClass : public JavaClass
+		{
+			public:
+				explicit JavaHighPassFilterClass(JNIEnv * env);
+
+				jclass cls;
+				jfieldID enabled;
+		};
+
+		class JavaLevelEstimationClass : public JavaClass
+		{
+			public:
+				explicit JavaLevelEstimationClass(JNIEnv * env);
+
+				jclass cls;
+				jfieldID enabled;
+		};
+
+		class JavaNoiseSuppressionClass : public JavaClass
+		{
+			public:
+				explicit JavaNoiseSuppressionClass(JNIEnv * env);
+
+				jclass cls;
+				jfieldID enabled;
+				jfieldID level;
+		};
+
+		class JavaResidualEchoDetectorClass : public JavaClass
+		{
+			public:
+				explicit JavaResidualEchoDetectorClass(JNIEnv * env);
+
+				jclass cls;
+				jfieldID enabled;
+		};
+
+		class JavaTransientSuppressionClass : public JavaClass
+		{
+			public:
+				explicit JavaTransientSuppressionClass(JNIEnv * env);
+
+				jclass cls;
+				jfieldID enabled;
+		};
+
+		class JavaVoiceDetectionClass : public JavaClass
+		{
+			public:
+				explicit JavaVoiceDetectionClass(JNIEnv * env);
+
+				jclass cls;
+				jfieldID enabled;
+		};
 	}
 }
 

webrtc-jni/src/main/cpp/include/media/audio/AudioProcessingConfig.h

@@ -40,7 +40,25 @@ JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_audio_AudioProcessing_applyC
 	apm->ApplyConfig(jni::AudioProcessingConfig::toNative(env, jni::JavaLocalRef<jobject>(env, config)));
 }
 
-JNIEXPORT jint JNICALL Java_dev_onvoid_webrtc_media_audio_AudioProcessing_processStream___3BLdev_onvoid_webrtc_media_audio_AudioProcessingStreamConfig_2Ldev_onvoid_webrtc_media_audio_AudioProcessingStreamConfig_2_3B
+JNIEXPORT void JNICALL Java_dev_onvoid_webrtc_media_audio_AudioProcessing_setStreamDelayMs
+(JNIEnv * env, jobject caller, jint delayMs)
+{
+	webrtc::AudioProcessing * apm = GetHandle<webrtc::AudioProcessing>(env, caller);
+	CHECK_HANDLE(apm);
+
+	apm->set_stream_delay_ms(delayMs);
+}
+
+JNIEXPORT jint JNICALL Java_dev_onvoid_webrtc_media_audio_AudioProcessing_getStreamDelayMs
+(JNIEnv * env, jobject caller)
+{
+	webrtc::AudioProcessing * apm = GetHandle<webrtc::AudioProcessing>(env, caller);
+	CHECK_HANDLEV(apm, 0);
+
+	return apm->stream_delay_ms();
+}
+
+JNIEXPORT jint JNICALL Java_dev_onvoid_webrtc_media_audio_AudioProcessing_processStream
 (JNIEnv * env, jobject caller, jbyteArray src, jobject inputConfig, jobject outputConfig, jbyteArray dest)
 {
 	webrtc::AudioProcessing * apm = GetHandle<webrtc::AudioProcessing>(env, caller);
@@ -68,7 +86,7 @@ JNIEXPORT jint JNICALL Java_dev_onvoid_webrtc_media_audio_AudioProcessing_proces
 	return result;
 }
 
-JNIEXPORT jint JNICALL Java_dev_onvoid_webrtc_media_audio_AudioProcessing_processReverseStream___3BLdev_onvoid_webrtc_media_audio_AudioProcessingStreamConfig_2Ldev_onvoid_webrtc_media_audio_AudioProcessingStreamConfig_2_3B
+JNIEXPORT jint JNICALL Java_dev_onvoid_webrtc_media_audio_AudioProcessing_processReverseStream
 (JNIEnv * env, jobject caller, jbyteArray src, jobject inputConfig, jobject outputConfig, jbyteArray dest)
 {
 	webrtc::AudioProcessing * apm = GetHandle<webrtc::AudioProcessing>(env, caller);

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

@@ -80,6 +80,7 @@ namespace jni
 		JavaEnums::add<webrtc::RtpTransceiverDirection>(env, PKG"RTCRtpTransceiverDirection");
 		JavaEnums::add<webrtc::SdpType>(env, PKG"RTCSdpType");
 		JavaEnums::add<webrtc::AudioDeviceModule::AudioLayer>(env, PKG_AUDIO"AudioLayer");
+		JavaEnums::add<webrtc::AudioProcessing::Config::NoiseSuppression::Level>(env, PKG_AUDIO"AudioProcessingConfig$NoiseSuppression$Level");
 		JavaEnums::add<jni::RTCStats::RTCStatsType>(env, PKG"RTCStatsType");
 
 		JavaFactories::add<webrtc::AudioSourceInterface>(env, PKG_MEDIA"audio/AudioTrackSource");