Skip to content

Commit

Permalink
CRAS: remove nuance-dlc
Browse files Browse the repository at this point in the history
BUG=b:359496197
TEST=CQ

Disallow-Recycled-Builds: test-failures
Cq-Depend: chromium:5790287
Change-Id: Ic1926401f9193c1477b8fbf2df6604e0844623bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5792815
Reviewed-by: Li-Yu Yu <aaronyu@google.com>
Commit-Queue: Cranel W <cranelw@chromium.org>
Tested-by: chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com <chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com>
  • Loading branch information
cranelw authored and Chromeos LUCI committed Aug 20, 2024
1 parent ffb9598 commit 7c089db
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 9 deletions.
3 changes: 1 addition & 2 deletions cras/server/platform/dlc/dlc.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ extern "C" {
#include <stdint.h>
#include <stdlib.h>

#define NUM_CRAS_DLCS 4
#define NUM_CRAS_DLCS 3

#define CRAS_DLC_ID_STRING_MAX_LENGTH 50

Expand All @@ -28,7 +28,6 @@ extern "C" {
enum CrasDlcId {
CrasDlcSrBt,
CrasDlcNcAp,
CrasDlcNuance,
CrasDlcIntelligoBeamforming,
};

Expand Down
5 changes: 1 addition & 4 deletions cras/server/platform/dlc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,17 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
pub enum CrasDlcId {
CrasDlcSrBt,
CrasDlcNcAp,
CrasDlcNuance,
CrasDlcIntelligoBeamforming,
}

// The list of DLCs that are installed automatically.
const MANAGED_DLCS: &[CrasDlcId] = &[
CrasDlcId::CrasDlcSrBt,
CrasDlcId::CrasDlcNcAp,
CrasDlcId::CrasDlcNuance,
CrasDlcId::CrasDlcIntelligoBeamforming,
];

pub const NUM_CRAS_DLCS: usize = 4;
pub const NUM_CRAS_DLCS: usize = 3;
// Assert that NUM_CRAS_DLCS is updated.
// We cannot assign MANAGED_DLCS.len() to NUM_CRAS_DLCS because cbindgen does
// not seem to understand it.
Expand All @@ -73,7 +71,6 @@ impl CrasDlcId {
// CRAS_DLC_ID_STRING_MAX_LENGTH
CrasDlcId::CrasDlcSrBt => "sr-bt-dlc",
CrasDlcId::CrasDlcNcAp => "nc-ap-dlc",
CrasDlcId::CrasDlcNuance => "nuance-dlc",
CrasDlcId::CrasDlcIntelligoBeamforming => "intelligo-beamforming-dlc",
}
}
Expand Down
1 change: 0 additions & 1 deletion cras/src/server/cras_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,6 @@ int cras_server_run(unsigned int profile_disable_mask) {
{
[CrasDlcSrBt] = cras_system_get_sr_bt_supported(),
[CrasDlcNcAp] = true,
[CrasDlcNuance] = cras_s2_get_style_transfer_supported(),
[CrasDlcIntelligoBeamforming] =
cras_s2_get_beamforming_supported(),
},
Expand Down
2 changes: 0 additions & 2 deletions cras/src/server/cras_server_metrics.c
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,6 @@ static inline const char* metrics_dlc_id_str(enum CrasDlcId dlc_id) {
return "SrBt";
case CrasDlcNcAp:
return "NcAp";
case CrasDlcNuance:
return "Nuance";
case CrasDlcIntelligoBeamforming:
return "IntelligoBeamforming";
default:
Expand Down

0 comments on commit 7c089db

Please sign in to comment.