summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJudy Hsiao <judyhsiao@chromium.org>2021-04-01 14:06:42 +0800
committerCommit Bot <commit-bot@chromium.org>2021-04-01 13:29:48 +0000
commitc2260aea977564db35ad5be09b257d522d4bf4bc (patch)
tree7e50537d9085503bc706a8861110f5a21fce206c
parentfb309cc39ae9473caa840cc5114c7f5fffc53e13 (diff)
downloadadhd-c2260aea977564db35ad5be09b257d522d4bf4bc.tar.gz
ucm-config: limit input and output sampling rate on Scarlett usb audio device
Limit both input and output sampling rate to 48000 for Scarlett usb audio devices as they do not support using different rate for input and output at the same time. BUG=b:183532291 TEST=1.Connect Scarlett usb audio device. 2.Play spotify, then join meet, and verify audio is correct. Change-Id: I21db9809e0596d1f6c2fdf105d800f7ba29df182 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/2796743 Reviewed-by: Yu-Hsuan Hsu <yuhsuan@chromium.org> Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org> Commit-Queue: Judy Hsiao <judyhsiao@chromium.org> Tested-by: Judy Hsiao <judyhsiao@chromium.org>
-rw-r--r--ucm-config/for_all_boards/Scarlett 2i2 USB/HiFi.conf27
-rw-r--r--ucm-config/for_all_boards/Scarlett 2i2 USB/Scarlett 2i2 USB.conf5
-rw-r--r--ucm-config/for_all_boards/Scarlett 2i4 USB/HiFi.conf27
-rw-r--r--ucm-config/for_all_boards/Scarlett 2i4 USB/Scarlett 2i4 USB.conf5
4 files changed, 64 insertions, 0 deletions
diff --git a/ucm-config/for_all_boards/Scarlett 2i2 USB/HiFi.conf b/ucm-config/for_all_boards/Scarlett 2i2 USB/HiFi.conf
new file mode 100644
index 00000000..f49d6816
--- /dev/null
+++ b/ucm-config/for_all_boards/Scarlett 2i2 USB/HiFi.conf
@@ -0,0 +1,27 @@
+SectionVerb {
+ Value {
+ FullySpecifiedUCM "1"
+ }
+ EnableSequence [
+ cdev "hw:USB,0"
+ ]
+ DisableSequence [
+ ]
+}
+
+SectionDevice."Scarlett 2i2 USB Output".0 {
+ Comment "Scarlett 2i2 Output"
+
+ Value {
+ PlaybackPCM "hw:USB,0"
+ PlaybackRate "48000"
+ }
+}
+
+SectionDevice."Scarlett 2i2 USB Input".0 {
+ Comment "Scarlett 2i2 Input"
+ Value {
+ CapturePCM "hw:USB,0"
+ CaptureRate "48000"
+ }
+}
diff --git a/ucm-config/for_all_boards/Scarlett 2i2 USB/Scarlett 2i2 USB.conf b/ucm-config/for_all_boards/Scarlett 2i2 USB/Scarlett 2i2 USB.conf
new file mode 100644
index 00000000..88bac6ba
--- /dev/null
+++ b/ucm-config/for_all_boards/Scarlett 2i2 USB/Scarlett 2i2 USB.conf
@@ -0,0 +1,5 @@
+Comment "Scarlett 2i2 USB"
+SectionUseCase."HiFi" {
+ File "HiFi.conf"
+ Comment "Default"
+}
diff --git a/ucm-config/for_all_boards/Scarlett 2i4 USB/HiFi.conf b/ucm-config/for_all_boards/Scarlett 2i4 USB/HiFi.conf
new file mode 100644
index 00000000..894683cd
--- /dev/null
+++ b/ucm-config/for_all_boards/Scarlett 2i4 USB/HiFi.conf
@@ -0,0 +1,27 @@
+SectionVerb {
+ Value {
+ FullySpecifiedUCM "1"
+ }
+ EnableSequence [
+ cdev "hw:USB,0"
+ ]
+ DisableSequence [
+ ]
+}
+
+SectionDevice."Scarlett 2i4 USB Output".0 {
+ Comment "Scarlett 2i4 Output"
+
+ Value {
+ PlaybackPCM "hw:USB,0"
+ PlaybackRate "48000"
+ }
+}
+
+SectionDevice."Scarlett 2i4 USB Input".0 {
+ Comment "Scarlett 2i4 Input"
+ Value {
+ CapturePCM "hw:USB,0"
+ CaptureRate "48000"
+ }
+}
diff --git a/ucm-config/for_all_boards/Scarlett 2i4 USB/Scarlett 2i4 USB.conf b/ucm-config/for_all_boards/Scarlett 2i4 USB/Scarlett 2i4 USB.conf
new file mode 100644
index 00000000..71ea1696
--- /dev/null
+++ b/ucm-config/for_all_boards/Scarlett 2i4 USB/Scarlett 2i4 USB.conf
@@ -0,0 +1,5 @@
+Comment "Scarlett 2i4 USB"
+SectionUseCase."HiFi" {
+ File "HiFi.conf"
+ Comment "Default"
+}