refactor: remove Opus feature dependencies and related code from various modules[latest]

Author: shenjinti

Cargo.toml

@@ -30,7 +30,7 @@ exclude = [
 ]
 
 [features]
-opus = ["audio-codec/opus"]
+cross = []
 console = ["dep:minijinja"]
 addon-acme = ["instant-acme"]
 addon-wholesale = [
@@ -74,7 +74,6 @@ contact-center = [
 ]
 
 default = [
-    "opus",
     "console",
     "addon-acme",
     "addon-transcript",
@@ -205,7 +204,6 @@ csv = "1.4.0"
 quick-xml = { version = "0.39.3", features = ["serialize"] }
 ruzstd = "0.8"
 minimp3 = "0.6.1"
-aws-lc-rs = { version = "1", optional = true }
 totp-rs = { version = "5.7.1", features = ["qr", "gen_secret"] }
 ldap3 = { version = "0.12.1", optional = true }
 ring = { version = "0.17", optional = true }
@@ -239,7 +237,6 @@ path = "src/bin/rustpbx.rs"
 [[bin]]
 name = "sipflow"
 path = "src/bin/sipflow.rs"
-required-features = ["opus"]
 
 [[bin]]
 name = "verify-i18n"

Dockerfile

@@ -13,9 +13,7 @@ ENV TZ=UTC
 RUN --mount=type=cache,target=/var/cache/apt \
     apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
-    tzdata \
-    libopus0 \
-    && rm -rf /var/lib/apt/lists/*
+    tzdata
 
 # Create application directory structure
 WORKDIR /app

Dockerfile.cross-aarch64

@@ -1,33 +1,13 @@
 FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main
 
-# Install clang, libclang (for bindgen), and dependencies
+# Install cross-compilation dependencies
 RUN set -eux; \
     apt_opts='-o Acquire::Retries=5 -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30'; \
     apt-get ${apt_opts} update; \
     apt-get ${apt_opts} install -y \
-        cmake \
         pkg-config \
-        clang \
-        llvm \
-        libclang-dev \
-        crossbuild-essential-arm64 \
-        libssl-dev; \
+        crossbuild-essential-arm64; \
     rm -rf /var/lib/apt/lists/*
-
-# Install cross-compiled libs for ARM64
-RUN set -eux; \
-    dpkg --add-architecture arm64; \
-    apt_opts='-o Acquire::Retries=5 -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30'; \
-    apt-get ${apt_opts} update; \
-    apt-get ${apt_opts} install -y \
-        libopus-dev:arm64 \
-        libssl-dev:arm64 || true; \
-    rm -rf /var/lib/apt/lists/*
-
-# Bake all cross-compilation environment variables into the image
-ENV LIBCLANG_PATH=/usr/lib/llvm-10/lib
-ENV CC=clang
-ENV CXX=clang++
 ENV PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
 ENV PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu
 ENV PKG_CONFIG_ALLOW_CROSS=1

Dockerfile.cross-x86_64

@@ -4,8 +4,5 @@ RUN set -eux; \
     apt_opts='-o Acquire::Retries=5 -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30'; \
     apt-get ${apt_opts} update; \
     apt-get ${apt_opts} install -y \
-        cmake \
-        pkg-config \
-        libopus-dev \
-        libssl-dev; \
+        pkg-config; \
     rm -rf /var/lib/apt/lists/*

src/media/bridge.rs

@@ -4031,7 +4031,6 @@ mod tests {
 
     /// Verify Opus → PCMU transcoding via Transcoder produces correct output.
     #[tokio::test]
-    #[cfg(feature = "opus")]
     async fn test_transcoder_opus_to_pcmu() {
         use audio_codec::create_encoder;
         // Generate 20ms of 48kHz mono PCM (960 samples)
@@ -4110,7 +4109,6 @@ mod tests {
 
     /// Verify Opus → G.722 transcoding via Transcoder produces correct output.
     #[tokio::test]
-    #[cfg(feature = "opus")]
     async fn test_transcoder_opus_to_g722() {
         use audio_codec::create_encoder;
 
@@ -4147,7 +4145,6 @@ mod tests {
 
     /// Run full Opus→PCMU round-trip: encode PCM → Opus → transcode → PCMU → decode → verify PCM correlation.
     #[tokio::test]
-    #[cfg(feature = "opus")]
     async fn test_transcoder_opus_to_pcmu_roundtrip_quality() {
         use audio_codec::{create_decoder, create_encoder};
 

src/media/mod.rs

@@ -487,7 +487,6 @@ impl RtpTrackBuilder {
             probation_max_packets: None,
             ice_servers: Vec::new(),
             rtp_map: vec![
-                #[cfg(feature = "opus")]
                 CodecType::Opus,
                 CodecType::G729,
                 CodecType::G722,

src/media/negotiate.rs

@@ -37,7 +37,6 @@ impl CodecInfo {
             CodecType::PCMA => ("PCMA".to_string(), None),
             CodecType::G722 => ("G722".to_string(), None),
             CodecType::G729 => ("G729".to_string(), None),
-            #[cfg(feature = "opus")]
             CodecType::Opus => (
                 "opus".to_string(),
                 Some("minptime=10;useinbandfec=1".to_string()),
@@ -174,20 +173,16 @@ impl MediaNegotiator {
         let static_codec = if let Ok(codec) = CodecType::try_from(pt) {
             let (rate, chans) = match codec {
                 CodecType::PCMU | CodecType::PCMA | CodecType::G722 | CodecType::G729 => (8000, 1),
-                #[cfg(feature = "opus")]
                 CodecType::Opus => (48000, 2),
                 _ => return None,
             };
             Some((codec, rate, chans))
         } else {
-            #[cfg(feature = "opus")]
             if (pt == 96 || pt == 111) && section.kind == MediaKind::Audio {
                 Some((CodecType::Opus, 48000, 2))
             } else {
                 None
             }
-            #[cfg(not(feature = "opus"))]
-            None
         };
 
         static_codec.map(|(codec, rate, chans)| CodecInfo {
@@ -339,7 +334,6 @@ impl MediaNegotiator {
     /// Build default codec list for RTP endpoints
     pub fn default_rtp_codecs() -> Vec<CodecType> {
         vec![
-            #[cfg(feature = "opus")]
             CodecType::Opus,
             CodecType::G729,
             CodecType::G722,
@@ -352,7 +346,6 @@ impl MediaNegotiator {
     /// Build default codec list for WebRTC endpoints
     pub fn default_webrtc_codecs() -> Vec<CodecType> {
         vec![
-            #[cfg(feature = "opus")]
             CodecType::Opus,
             CodecType::G722,
             CodecType::PCMU,
@@ -376,7 +369,6 @@ impl MediaNegotiator {
             CodecType::PCMA => "PCMA",
             CodecType::G722 => "G722",
             CodecType::G729 => "G729",
-            #[cfg(feature = "opus")]
             CodecType::Opus => "opus",
             CodecType::TelephoneEvent => "telephone-event",
         };
@@ -472,7 +464,6 @@ impl MediaNegotiator {
             }),
             _ => {
                 let preferred_rate = match audio.as_ref().map(|codec| codec.codec) {
-                    #[cfg(feature = "opus")]
                     Some(CodecType::Opus) => 48000,
                     _ => 8000,
                 };
@@ -1528,7 +1519,6 @@ a=rtpmap:0 PCMU/8000\r\n";
         assert_eq!(dtmf[0].clock_rate, 8000);
     }
 
-    #[cfg(feature = "opus")]
     #[test]
     fn test_callee_offer_appends_dtmf_in_final_audio_clock_order() {
         let caller_sdp = "v=0\r\n\
@@ -1555,7 +1545,6 @@ a=rtpmap:0 PCMU/8000\r\n";
         assert_eq!(dtmf[1].clock_rate, 48000);
     }
 
-    #[cfg(feature = "opus")]
     #[test]
     fn test_caller_answer_filters_dtmf_by_final_audio_clock_rate() {
         let caller_sdp = "v=0\r\n\
@@ -2244,7 +2233,6 @@ a=rtpmap:8 PCMA/8000\r\n";
         );
     }
 
-    #[cfg(feature = "opus")]
     #[test]
     fn test_rewrite_sdp_codec_list_uses_dtmf_clock_rate() {
         let caller_sdp = "v=0\r\n\

src/media/transcoder.rs

@@ -303,7 +303,6 @@ mod tests {
         assert!(!output.data.is_empty(), "G729 output must not be empty");
     }
 
-    #[cfg(feature = "opus")]
     #[test]
     fn test_transcoder_pcmu_to_opus() {
         let pcm = silence_pcm_8k();