Move feature_tier into s2

s2 will be used to instruct the DLC to download.

BUG=b:356757315
TEST=bazel test //...

Change-Id: I7a4b82fbd1d8b989cd6887fb73292489a309c776
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/6040757
Reviewed-by: Cranel W <[email protected]>
Commit-Queue: Li-Yu Yu <[email protected]>
Tested-by: Li-Yu Yu <[email protected]>
Reviewed-by: Hung-Hsien Chen <[email protected]>

Author: afq984

Cargo.Bazel.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "007a6f993637dd2a9588e36625c054d01a11ddca0e94f8fb0410c7b32cc02e32",
+  "checksum": "9a241194a05459dda7f4c65786ed4ee920464ebcd778b6388ef33fdb661c390a",
   "crates": {
     "addr2line 0.20.0": {
       "name": "addr2line",
@@ -2174,6 +2174,10 @@
             {
               "id": "log 0.4.20",
               "target": "log"
+            },
+            {
+              "id": "serde 1.0.152",
+              "target": "serde"
             }
           ],
           "selects": {}

Cargo.lock

@@ -6,7 +6,6 @@
 
 WRITE_SOURCE_FILE_TARGETS = [
     "@//cras/common:generate_rust_common_h",
-    "@//cras/server/feature_tier:generate_feature_tier_h",
     "@//cras/server/ini:generate_ini_h",
     "@//cras/server/platform/dlc:generate_dlc_h",
     "@//cras/server/processor:generate_processor_h",

build/write_source_files/write_source_file_targets_generated.bzl

@@ -3,10 +3,8 @@
 # found in the LICENSE file.
 
 load("@crate_index//:defs.bzl", "all_crate_deps")
-load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_rust//rust:defs.bzl", "rust_test")
 load("//:utils.bzl", "require_no_config")
-load("//rules/cbindgen:rules.bzl", "cras_cbindgen")
 load("//rules/rust:defs.bzl", "cras_rust_library")
 
 cras_rust_library(
@@ -25,18 +23,3 @@ rust_test(
     crate = ":feature_tier",
     target_compatible_with = require_no_config("//:system_cras_rust_build"),
 )
-
-cras_cbindgen(
-    name = "feature_tier_h",
-    out = "feature_tier.h",
-    copyright_year = 2024,
-    extra_args = [],
-    lib = ":feature_tier",
-)
-
-cc_library(
-    name = "cc",
-    hdrs = ["feature_tier.h"],
-    visibility = ["//visibility:public"],
-    deps = [":feature_tier"],
-)

cras/server/feature_tier/BUILD.bazel

@@ -6,3 +6,4 @@ edition = "2021"
 [dependencies]
 libc = { workspace = true }
 log = { workspace = true }
+serde = { workspace = true }

cras/server/feature_tier/Cargo.toml

@@ -2,8 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+use std::ffi::CStr;
+
+use serde::Serialize;
+
 /// Support status for CRAS features.
-#[repr(C)]
+#[derive(Default, Serialize)]
 pub struct CrasFeatureTier {
     pub initialized: bool,
     pub is_x86_64_v2: bool,
@@ -28,6 +32,42 @@ impl CrasFeatureTier {
             is_x86_64_v2: x86_64_v2,
         }
     }
+
+    /// Construct a CrasFeatureTier from NULL terminated strings.
+    ///
+    /// # Safety
+    ///
+    /// board_name and cpu_name must be a NULL terminated strings or NULLs.
+    pub unsafe fn new_c(board_name: *const libc::c_char, cpu_name: *const libc::c_char) -> Self {
+        let board_name = if board_name.is_null() {
+            ""
+        } else {
+            match CStr::from_ptr(board_name).to_str() {
+                Ok(name) => name,
+                Err(_) => "",
+            }
+        };
+
+        let cpu_name = if cpu_name.is_null() {
+            ""
+        } else {
+            match CStr::from_ptr(cpu_name).to_str() {
+                Ok(name) => name,
+                Err(_) => "",
+            }
+        };
+
+        let tier = CrasFeatureTier::new(board_name, cpu_name);
+
+        log::info!(
+            "cras_feature_tier initialized with board={:?} cpu={:?} x86_64_v2={:?}",
+            board_name,
+            cpu_name,
+            tier.is_x86_64_v2
+        );
+
+        tier
+    }
 }
 
 #[cfg(any(target_arch = "x86_64"))]
@@ -93,68 +133,9 @@ mod tests {
         assert!(has_substr("DisalLoWed", &["abc", "Dis"]));
         assert!(!has_substr("DisalLoWed", &["abc"]));
     }
-}
-
-pub mod bindings {
-    use std::ffi::CStr;
-
-    pub use super::CrasFeatureTier;
-
-    #[no_mangle]
-    /// Initialize the cras feature tier struct.
-    /// On error, a negative error code is returned.
-    ///
-    /// # Safety
-    ///
-    /// out must be non-NULL.
-    pub unsafe extern "C" fn cras_feature_tier_init(
-        out: *mut CrasFeatureTier,
-        board_name: *const libc::c_char,
-        cpu_name: *const libc::c_char,
-    ) -> libc::c_int {
-        let board_name = if board_name.is_null() {
-            ""
-        } else {
-            match CStr::from_ptr(board_name).to_str() {
-                Ok(name) => name,
-                Err(_) => return -libc::EINVAL,
-            }
-        };
-
-        let cpu_name = if cpu_name.is_null() {
-            ""
-        } else {
-            match CStr::from_ptr(cpu_name).to_str() {
-                Ok(name) => name,
-                Err(_) => return -libc::EINVAL,
-            }
-        };
-
-        let tier = CrasFeatureTier::new(board_name, cpu_name);
-
-        log::info!(
-            "cras_feature_tier initialized with board={:?} cpu={:?} x86_64_v2={:?}",
-            board_name,
-            cpu_name,
-            tier.is_x86_64_v2
-        );
-
-        *out = tier;
-
-        0
-    }
 
-    #[cfg(test)]
-    mod tests {
-        use super::*;
-
-        #[test]
-        fn null_safety() {
-            let mut tier = std::mem::MaybeUninit::<CrasFeatureTier>::zeroed();
-            let rc = unsafe {
-                cras_feature_tier_init(tier.as_mut_ptr(), std::ptr::null(), std::ptr::null())
-            };
-            assert_eq!(0, rc);
-        }
+    #[test]
+    fn null_safety() {
+        unsafe { CrasFeatureTier::new_c(std::ptr::null(), std::ptr::null()) };
     }
 }

cras/server/feature_tier/feature_tier.h

@@ -20,6 +20,7 @@ cras_rust_library(
     deps = all_crate_deps(normal = True) + [
         "//audio_processor",
         "//cras/common:rust_common",
+        "//cras/server/feature_tier",
         "//cras/server/ini",
     ],
 )

cras/server/feature_tier/src/lib.rs

@@ -9,6 +9,7 @@ edition = "2021"
 audio_processor = { workspace = true }
 cras_common = { workspace = true }
 cras_ini = { workspace = true }
+cras_feature_tier = { workspace = true }
 
 anyhow = { workspace = true }
 libc = { workspace = true }

cras/server/s2/BUILD.bazel

@@ -27,8 +27,6 @@ void cras_s2_set_ap_nc_featured_allowed(bool allowed);
 
 void cras_s2_set_ap_nc_segmentation_allowed(bool allowed);
 
-void cras_s2_set_ap_nc_feature_tier_allowed(bool allowed);
-
 bool cras_s2_are_audio_effects_ready(void);
 
 void cras_s2_set_notify_audio_effect_ui_appearance_changed(NotifyAudioEffectUIAppearanceChanged notify_audio_effect_ui_appearance_changed);
@@ -53,7 +51,12 @@ void cras_s2_set_voice_isolation_ui_enabled(bool enabled);
 
 bool cras_s2_get_voice_isolation_ui_enabled(void);
 
-void cras_s2_init(void);
+/**
+ * # Safety
+ *
+ * board_name and cpu_name must be NULL-terminated strings or NULLs.
+ */
+void cras_s2_init(const char *board_name, const char *cpu_name);
 
 bool cras_s2_get_beamforming_supported(void);
 
@@ -103,6 +106,8 @@ void cras_s2_set_spatial_audio_supported(bool supported);
 
 bool cras_s2_get_spatial_audio_supported(void);
 
+bool cras_s2_get_sr_bt_supported(void);
+
 #endif  /* CRAS_SERVER_S2_S2_H_ */
 
 #ifdef __cplusplus

cras/server/s2/Cargo.toml

@@ -16,6 +16,7 @@ use cras_common::types_internal::CrasEffectUIAppearance;
 use cras_common::types_internal::CrasProcessorEffect;
 use cras_common::types_internal::CRAS_NC_PROVIDER;
 use cras_common::types_internal::EFFECT_TYPE;
+use cras_feature_tier::CrasFeatureTier;
 
 use crate::processing::BeamformingConfig;
 
@@ -36,11 +37,6 @@ pub extern "C" fn cras_s2_set_ap_nc_segmentation_allowed(allowed: bool) {
     state().set_ap_nc_segmentation_allowed(allowed);
 }
 
-#[no_mangle]
-pub extern "C" fn cras_s2_set_ap_nc_feature_tier_allowed(allowed: bool) {
-    state().set_ap_nc_feature_tier_allowed(allowed);
-}
-
 pub fn set_dlc_manager_ready() {
     state().set_dlc_manager_ready();
 }
@@ -132,17 +128,25 @@ pub extern "C" fn cras_s2_get_voice_isolation_ui_enabled() -> bool {
     state().input.voice_isolation_ui_enabled
 }
 
+/// # Safety
+///
+/// board_name and cpu_name must be NULL-terminated strings or NULLs.
 #[no_mangle]
-pub extern "C" fn cras_s2_init() {
+pub unsafe extern "C" fn cras_s2_init(
+    board_name: *const libc::c_char,
+    cpu_name: *const libc::c_char,
+) {
+    let mut s = state();
     match std::fs::read_to_string("/run/chromeos-config/v1/audio/main/cras-config-dir") {
         Ok(str) => {
-            state().read_cras_config(&str);
+            s.read_cras_config(&str);
         }
         Err(err) => {
-            state().read_cras_config("");
+            s.read_cras_config("");
             log::error!("Failed to read cras-config-dir: {err:#}");
         }
     }
+    s.set_feature_tier(CrasFeatureTier::new_c(board_name, cpu_name));
 }
 
 #[no_mangle]
@@ -294,3 +298,8 @@ pub fn cras_s2_get_beamforming_config_path() -> Option<PathBuf> {
         BeamformingConfig::Unsupported { .. } => None,
     }
 }
+
+#[no_mangle]
+pub extern "C" fn cras_s2_get_sr_bt_supported() -> bool {
+    state().input.feature_tier.sr_bt_supported
+}