Moved to WebRTC branch 4664 (M96)

Author: devopvoid

webrtc-jni/pom.xml

@@ -12,7 +12,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<webrtc.branch>branch-heads/4638</webrtc.branch>
+		<webrtc.branch>branch-heads/4664</webrtc.branch>
 		<webrtc.src.dir>${user.home}/webrtc</webrtc.src.dir>
 		<webrtc.install.dir>${user.home}/webrtc/build</webrtc.install.dir>
 		<cmake.build.type>Release</cmake.build.type>

webrtc-jni/src/main/cpp/CMakeLists.txt

@@ -69,7 +69,7 @@ if(APPLE)
 	set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS "-x objective-c++")
 	target_link_libraries(${PROJECT_NAME} "-framework Foundation" "-framework AVFoundation" "-framework CoreMedia" "-framework CoreAudio")
 elseif(LINUX)
-	target_link_libraries(${PROJECT_NAME} -static-libgcc -static-libstdc++ asound pulse udev v4l2)
+	target_link_libraries(${PROJECT_NAME} -static-libgcc -static-libstdc++ pulse udev)
 elseif(WIN32)
 	target_link_libraries(${PROJECT_NAME} mf.lib mfreadwrite.lib mfplat.lib mfuuid.lib)
 endif()

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

@@ -90,12 +90,6 @@ namespace jni
 				jfieldID adjacentSpeechFramesThreshold;
 				jfieldID maxGainChangeDbPerSecond;
 				jfieldID maxOutputNoiseLevelDbfs;
-				jfieldID vadProbabilityAttack;
-				jfieldID levelEstimatorAdjacentSpeechFramesThreshold;
-				jfieldID useSaturationProtector;
-				jfieldID initialSaturationMarginDb;
-				jfieldID extraSaturationMarginDb;
-				jfieldID gainApplierAdjacentSpeechFramesThreshold;
 		};
 
 		class JavaHighPassFilterClass : public JavaClass

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

@@ -95,12 +95,6 @@ namespace jni
 			gainController.adaptive_digital.adjacent_speech_frames_threshold = gainControlAdaptiveDigital.getInt(javaGainControlAdaptiveDigitalClass->adjacentSpeechFramesThreshold);
 			gainController.adaptive_digital.max_gain_change_db_per_second = gainControlAdaptiveDigital.getFloat(javaGainControlAdaptiveDigitalClass->maxGainChangeDbPerSecond);
 			gainController.adaptive_digital.max_output_noise_level_dbfs = gainControlAdaptiveDigital.getFloat(javaGainControlAdaptiveDigitalClass->maxOutputNoiseLevelDbfs);
-			gainController.adaptive_digital.vad_probability_attack = gainControlAdaptiveDigital.getFloat(javaGainControlAdaptiveDigitalClass->vadProbabilityAttack);
-			gainController.adaptive_digital.level_estimator_adjacent_speech_frames_threshold = gainControlAdaptiveDigital.getInt(javaGainControlAdaptiveDigitalClass->levelEstimatorAdjacentSpeechFramesThreshold);
-			gainController.adaptive_digital.use_saturation_protector = gainControlAdaptiveDigital.getBoolean(javaGainControlAdaptiveDigitalClass->useSaturationProtector);
-			gainController.adaptive_digital.initial_saturation_margin_db = gainControlAdaptiveDigital.getFloat(javaGainControlAdaptiveDigitalClass->initialSaturationMarginDb);
-			gainController.adaptive_digital.extra_saturation_margin_db = gainControlAdaptiveDigital.getFloat(javaGainControlAdaptiveDigitalClass->extraSaturationMarginDb);
-			gainController.adaptive_digital.gain_applier_adjacent_speech_frames_threshold = gainControlAdaptiveDigital.getInt(javaGainControlAdaptiveDigitalClass->gainApplierAdjacentSpeechFramesThreshold);
 
 			return gainController;
 		}
@@ -153,12 +147,6 @@ namespace jni
 			adjacentSpeechFramesThreshold = GetFieldID(env, cls, "adjacentSpeechFramesThreshold", "I");
 			maxGainChangeDbPerSecond = GetFieldID(env, cls, "maxGainChangeDbPerSecond", "F");
 			maxOutputNoiseLevelDbfs = GetFieldID(env, cls, "maxOutputNoiseLevelDbfs", "F");
-			vadProbabilityAttack = GetFieldID(env, cls, "vadProbabilityAttack", "F");
-			levelEstimatorAdjacentSpeechFramesThreshold = GetFieldID(env, cls, "levelEstimatorAdjacentSpeechFramesThreshold", "I");
-			useSaturationProtector = GetFieldID(env, cls, "useSaturationProtector", "Z");
-			initialSaturationMarginDb = GetFieldID(env, cls, "initialSaturationMarginDb", "F");
-			extraSaturationMarginDb = GetFieldID(env, cls, "extraSaturationMarginDb", "F");
-			gainApplierAdjacentSpeechFramesThreshold = GetFieldID(env, cls, "gainApplierAdjacentSpeechFramesThreshold", "I");
 		}
 
 		JavaHighPassFilterClass::JavaHighPassFilterClass(JNIEnv* env)

webrtc/src/main/java/dev/onvoid/webrtc/media/audio/AudioProcessingConfig.java

@@ -70,14 +70,6 @@ public static class AdaptiveDigital {
 			public float maxGainChangeDbPerSecond = 3.0f;
 			public float maxOutputNoiseLevelDbfs = -50.0f;
 
-			public float vadProbabilityAttack = 1.0f;
-
-			public int levelEstimatorAdjacentSpeechFramesThreshold = 12;
-			public boolean useSaturationProtector = true;
-			public float initialSaturationMarginDb = 25.0f;
-			public float extraSaturationMarginDb = 5.0f;
-			public int gainApplierAdjacentSpeechFramesThreshold = 12;
-
 		}