ringrtc: Add support for switching to Ringrtc ADM

To enable add `RINGRTC_ADM=y` before the make invocation

Author: mutexlox-signal

bin/build-cli

@@ -100,10 +100,10 @@ export MACOSX_DEPLOYMENT_TARGET="10.15"
 (
     if [ "${BUILD_TYPE}" = "debug" ]
     then
-        OUTPUT_DIR="${OUTPUT_DIR}" cargo build --package ringrtc --bin direct --features=native,simnet
+        OUTPUT_DIR="${OUTPUT_DIR}" cargo build --package ringrtc --bin direct --features=native,simnet${RINGRTC_ADM:+",ringrtc_adm"}
         echo "Can run with target/debug/direct"
     else
-        OUTPUT_DIR="${OUTPUT_DIR}" cargo build --package ringrtc --bin direct --features=native,simnet --release
+        OUTPUT_DIR="${OUTPUT_DIR}" cargo build --package ringrtc --bin direct --features=native,simnet${RINGRTC_ADM:+",ringrtc_adm"} --release
         echo "Can run with target/release/direct"
     fi
 )

bin/build-electron

@@ -219,7 +219,7 @@ then
             exit 1 # unreachable
         fi
 
-        RUSTFLAGS="${RUSTFLAGS}" OUTPUT_DIR="${OUTPUT_DIR}" cargo rustc --package ringrtc --target ${CARGO_TARGET} --features electron ${INCLUDE_RELEASE_FLAG:+"--release"} --crate-type cdylib
+        RUSTFLAGS="${RUSTFLAGS}" OUTPUT_DIR="${OUTPUT_DIR}" cargo rustc --package ringrtc --target ${CARGO_TARGET} --features electron${RINGRTC_ADM:+",ringrtc_adm"} ${INCLUDE_RELEASE_FLAG:+"--release"} --crate-type cdylib
 
         mkdir -p src/node/build/${DEFAULT_PLATFORM}
         copy_to_node target/${CARGO_TARGET}/${BUILD_TYPE}/${OUTPUT_LIBRARY} src/node/build/${DEFAULT_PLATFORM}/libringrtc-"${TARGET_ARCH}".node

bin/build-gctc

@@ -100,10 +100,10 @@ export MACOSX_DEPLOYMENT_TARGET="10.15"
 (
     if [ "${BUILD_TYPE}" = "debug" ]
     then
-        OUTPUT_DIR="${OUTPUT_DIR}" cargo build --package ringrtc --bin group_call --features=native,sim_http
+        OUTPUT_DIR="${OUTPUT_DIR}" cargo build --package ringrtc --bin group_call --features=native,sim_http${RINGRTC_ADM:+",ringrtc_adm"}
         echo "Can run with target/debug/group_call"
     else
-        OUTPUT_DIR="${OUTPUT_DIR}" cargo build --package ringrtc --bin group_call --features=native,sim_http --release
+        OUTPUT_DIR="${OUTPUT_DIR}" cargo build --package ringrtc --bin group_call --features=native,sim_http${RINGRTC_ADM:+",ringrtc_adm"} --release
         echo "Can run with target/release/group_call"
     fi
 )

src/rust/Cargo.toml

@@ -107,6 +107,7 @@ injectable_network = []
 sim_http = ["ureq", "rustls"]
 check-all = ["electron", "jni"]
 call_sim = ["call_protobuf/call_sim", "native", "injectable_network", "bitvec", "chrono", "clap", "fern", "tokio", "tonic", "tower"]
+ringrtc_adm = []
 
 [[test]]
 name = "incoming"

src/rust/src/webrtc/peer_connection_factory.rs

@@ -131,6 +131,8 @@ pub enum RffiAudioDeviceModuleType {
     Default,
     /// Use a file-based ADM for testing and simulation.
     File,
+    /// Use RingRTC's ADM implementation.
+    RingRtc,
 }
 
 /// Stays in sync with RffiAudioConfig in peer_connection_factory.h.
@@ -164,7 +166,10 @@ pub struct AudioConfig {
 impl Default for AudioConfig {
     fn default() -> Self {
         Self {
+            #[cfg(not(feature = "ringrtc_adm"))]
             audio_device_module_type: Default::default(),
+            #[cfg(feature = "ringrtc_adm")]
+            audio_device_module_type: RffiAudioDeviceModuleType::RingRtc,
             file_based_adm_config: None,
             high_pass_filter_enabled: true,
             aec_enabled: true,