features: Remove CrOSLateBootAudioAecRequiredForCrasProcessor

It was intended as a kill switch. We are fine for quite a while without engaging it so it's time to delete it. BUG=b:360959915 TEST=bazel test //... Change-Id: Ib1704073ad47ef78e89ba14734bfe8b35322f55f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5953207 Reviewed-by: Hung-Hsien Chen <[email protected]> Commit-Queue: Li-Yu Yu <[email protected]> Tested-by: [email protected] <[email protected]>
chromeos · Oct 23, 2024 · 0c480dc · 0c480dc
1 parent a240c65
commit 0c480dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/cras/server/platform/features/features.inc b/cras/server/platform/features/features.inc
@@ -14,7 +14,6 @@ DEFINE_FEATURE(CrOSLateBootAudioA2DPAdvancedCodecs, false)
 DEFINE_FEATURE(CrOSLateBootAudioEmptyAPMForCrasProcessor, true)
 DEFINE_FEATURE(CrOSLateBootAudioSuppressSetRTCAudioActive, false)
 DEFINE_FEATURE(CrOSLateBootAudioOffloadCrasDSPToSOF, false)
-DEFINE_FEATURE(CrOSLateBootAudioAecRequiredForCrasProcessor, false)
 DEFINE_FEATURE(CrOSLateBootCrasProcessorDedicatedThread, true)
 DEFINE_FEATURE(CrOSLateBootCrasProcessorWavDump, false)
 DEFINE_FEATURE(CrOSLateBootBluetoothAudioLEAudioOnly, false)

diff --git a/cras/src/server/cras_stream_apm.c b/cras/src/server/cras_stream_apm.c
@@ -708,25 +708,14 @@ struct cras_apm* cras_stream_apm_add(struct cras_stream_apm* stream,
   bool client_enabled = stream->effects & VOICE_ISOLATION;
   enum CrasProcessorEffect cp_effect = cras_s2_get_cras_processor_effect(
       nc_providers, client_controlled, client_enabled);
-  syslog(LOG_DEBUG, "Setting CrasProcessorEffect for idev: %s",
-         idev->info.name);
-  if (cras_feature_enabled(CrOSLateBootAudioAecRequiredForCrasProcessor) &&
-      !(stream->effects & APM_ECHO_CANCELLATION)) {
-    syslog(LOG_DEBUG,
-           "Set to NoEffects because "
-           "CrOSLateBootAudioAecRequiredForCrasProcessor is enabled while "
-           "stream->effects disallow AEC.");
-    cp_effect = NoEffects;
-  } else {
-    char* nc_providers_str = cras_nc_providers_bitset_to_str(nc_providers);
-    syslog(LOG_DEBUG,
-           "Effect: %s, compatible NC providers: %s, voice isolation "
-           "(client_controlled, client_enabled): (%s, %s)",
-           cras_processor_effect_to_str(cp_effect), nc_providers_str,
-           client_controlled ? "true" : "false",
-           client_enabled ? "true" : "false");
-    cras_rust_free_string(nc_providers_str);
-  }
+  char* nc_providers_str = cras_nc_providers_bitset_to_str(nc_providers);
+  syslog(LOG_DEBUG,
+         "idev: %s, Effect: %s, compatible NC providers: %s, voice isolation "
+         "(client_controlled, client_enabled): (%s, %s)",
+         idev->info.name, cras_processor_effect_to_str(cp_effect),
+         nc_providers_str, client_controlled ? "true" : "false",
+         client_enabled ? "true" : "false");
+  cras_rust_free_string(nc_providers_str);
 
   // TODO(hychao): Remove the check when we enable more effects.
   if (!apm_needed_for_effects(