diff options
| author | Li-Yu Yu <aaronyu@google.com> | 2024-05-13 06:06:18 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-05-13 09:03:51 +0000 |
| commit | baffbac8d15fdb8426f05fc621828e0ddc3820fa (patch) | |
| tree | e92566b635d8773031c814be39496557e3d38b89 | |
| parent | f739475a01fe36a4b3490ac66df16c4fc80918c2 (diff) | |
| download | adhd-baffbac8d15fdb8426f05fc621828e0ddc3820fa.tar.gz | |
cras_stream_apm: Allow all channels
We don't want to use FC to pass the 3rd channel for beamforming
because when a client requests mono and beamforming is not enabled,
CRAS might picked up FC as mono, while it's preferred to mix FL+FR
in that case.
BUG=b:261951580
TEST=bazel test //...
TEST=tast run dut12 audio.CrasMultiChannelCapture.\* audio.CrasAEC.\*
Change-Id: I13e7744016034e3bce5e178d4401e867a9d49580
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5534462
Commit-Queue: Li-Yu Yu <aaronyu@google.com>
Tested-by: chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com <chromeos-cop-builder@chromeos-cop.iam.gserviceaccount.com>
Reviewed-by: Pattara Teerapong <pteerapong@chromium.org>
| -rw-r--r-- | cras/src/server/cras_stream_apm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cras/src/server/cras_stream_apm.c b/cras/src/server/cras_stream_apm.c index 448be059..a084a19e 100644 --- a/cras/src/server/cras_stream_apm.c +++ b/cras/src/server/cras_stream_apm.c @@ -592,9 +592,7 @@ static struct cras_audio_format get_best_channels( apm_fmt.channel_layout[ch] = -1; } - int apm_valid_channels[] = {CRAS_CH_FL, CRAS_CH_FR, CRAS_CH_FC}; - for (int i = 0; i < ARRAY_SIZE(apm_valid_channels); i++) { - int ch = apm_valid_channels[i]; + for (int ch = CRAS_CH_FL; ch < CRAS_CH_MAX; ch++) { if (dev_fmt->channel_layout[ch] != -1) { apm_fmt.channel_layout[ch] = apm_fmt.num_channels++; } |