Merge ~sylvain-pineau/checkbox-support:fix-1947114 into checkbox-support:master
- Git
- lp:~sylvain-pineau/checkbox-support
- fix-1947114
- Merge into master
Proposed by
Sylvain Pineau
Status: | Merged |
---|---|
Approved by: | Sylvain Pineau |
Approved revision: | 04e29ebe5dcd06c826780b50c71147d32fd8b868 |
Merged at revision: | 269f83a1e40bc48d603f49bbd0db0572ba329dea |
Proposed branch: | ~sylvain-pineau/checkbox-support:fix-1947114 |
Merge into: | checkbox-support:master |
Diff against target: |
877 lines (+848/-1) 3 files modified
checkbox_support/parsers/tests/pactl_data/displayport-monitor-hifi.txt (+838/-0) checkbox_support/scripts/audio_settings.py (+1/-1) checkbox_support/scripts/tests/test_audio_settings.py (+9/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jonathan Cave (community) | Approve | ||
Review via email: mp+412674@code.launchpad.net |
Commit message
Description of the change
Fixes the linked bug by adding support for the HiFi displayport profile
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/checkbox_support/parsers/tests/pactl_data/displayport-monitor-hifi.txt b/checkbox_support/parsers/tests/pactl_data/displayport-monitor-hifi.txt |
2 | new file mode 100644 |
3 | index 0000000..d6657e3 |
4 | --- /dev/null |
5 | +++ b/checkbox_support/parsers/tests/pactl_data/displayport-monitor-hifi.txt |
6 | @@ -0,0 +1,838 @@ |
7 | +Module #0 |
8 | + Name: module-device-restore |
9 | + Argument: |
10 | + Usage counter: n/a |
11 | + Properties: |
12 | + module.author = "Lennart Poettering" |
13 | + module.description = "Automatically restore the volume/mute state of devices" |
14 | + module.version = "13.99.1" |
15 | + |
16 | +Module #1 |
17 | + Name: module-stream-restore |
18 | + Argument: |
19 | + Usage counter: n/a |
20 | + Properties: |
21 | + module.author = "Lennart Poettering" |
22 | + module.description = "Automatically restore the volume/mute/device state of streams" |
23 | + module.version = "13.99.1" |
24 | + |
25 | +Module #2 |
26 | + Name: module-card-restore |
27 | + Argument: |
28 | + Usage counter: n/a |
29 | + Properties: |
30 | + module.author = "Lennart Poettering" |
31 | + module.description = "Automatically restore profile of cards" |
32 | + module.version = "13.99.1" |
33 | + |
34 | +Module #3 |
35 | + Name: module-augment-properties |
36 | + Argument: |
37 | + Usage counter: n/a |
38 | + Properties: |
39 | + module.author = "Lennart Poettering" |
40 | + module.description = "Augment the property sets of streams with additional static information" |
41 | + module.version = "13.99.1" |
42 | + |
43 | +Module #4 |
44 | + Name: module-switch-on-port-available |
45 | + Argument: |
46 | + Usage counter: n/a |
47 | + Properties: |
48 | + module.author = "David Henningsson" |
49 | + module.description = "Switches ports and profiles when devices are plugged/unplugged" |
50 | + module.version = "13.99.1" |
51 | + |
52 | +Module #5 |
53 | + Name: module-switch-on-connect |
54 | + Argument: |
55 | + Usage counter: n/a |
56 | + Properties: |
57 | + module.author = "Michael Terry" |
58 | + module.description = "When a sink/source is added, switch to it or conditionally switch to it" |
59 | + module.version = "13.99.1" |
60 | + |
61 | +Module #6 |
62 | + Name: module-udev-detect |
63 | + Argument: |
64 | + Usage counter: n/a |
65 | + Properties: |
66 | + module.author = "Lennart Poettering" |
67 | + module.description = "Detect available audio hardware and load matching drivers" |
68 | + module.version = "13.99.1" |
69 | + |
70 | +Module #7 |
71 | + Name: module-bluetooth-policy |
72 | + Argument: |
73 | + Usage counter: n/a |
74 | + Properties: |
75 | + module.author = "Frédéric Dalleau, Pali Rohár" |
76 | + module.description = "Policy module to make using bluetooth devices out-of-the-box easier" |
77 | + module.version = "13.99.1" |
78 | + |
79 | +Module #8 |
80 | + Name: module-bluetooth-discover |
81 | + Argument: |
82 | + Usage counter: n/a |
83 | + Properties: |
84 | + module.author = "João Paulo Rechi Vita" |
85 | + module.description = "Detect available Bluetooth daemon and load the corresponding discovery module" |
86 | + module.version = "13.99.1" |
87 | + |
88 | +Module #9 |
89 | + Name: module-bluez5-discover |
90 | + Argument: |
91 | + Usage counter: n/a |
92 | + Properties: |
93 | + module.author = "João Paulo Rechi Vita" |
94 | + module.description = "Detect available BlueZ 5 Bluetooth audio devices and load BlueZ 5 Bluetooth audio drivers" |
95 | + module.version = "13.99.1" |
96 | + |
97 | +Module #10 |
98 | + Name: module-native-protocol-unix |
99 | + Argument: |
100 | + Usage counter: n/a |
101 | + Properties: |
102 | + module.author = "Lennart Poettering" |
103 | + module.description = "Native protocol (UNIX sockets)" |
104 | + module.version = "13.99.1" |
105 | + |
106 | +Module #11 |
107 | + Name: module-default-device-restore |
108 | + Argument: |
109 | + Usage counter: n/a |
110 | + Properties: |
111 | + module.author = "Lennart Poettering" |
112 | + module.description = "Automatically restore the default sink and source" |
113 | + module.version = "13.99.1" |
114 | + |
115 | +Module #12 |
116 | + Name: module-always-sink |
117 | + Argument: |
118 | + Usage counter: n/a |
119 | + Properties: |
120 | + module.author = "Colin Guthrie" |
121 | + module.description = "Always keeps at least one sink loaded even if it's a null one" |
122 | + module.version = "13.99.1" |
123 | + |
124 | +Module #14 |
125 | + Name: module-intended-roles |
126 | + Argument: |
127 | + Usage counter: n/a |
128 | + Properties: |
129 | + module.author = "Lennart Poettering" |
130 | + module.description = "Automatically set device of streams based on intended roles of devices" |
131 | + module.version = "13.99.1" |
132 | + |
133 | +Module #15 |
134 | + Name: module-suspend-on-idle |
135 | + Argument: |
136 | + Usage counter: n/a |
137 | + Properties: |
138 | + module.author = "Lennart Poettering" |
139 | + module.description = "When a sink/source is idle for too long, suspend it" |
140 | + module.version = "13.99.1" |
141 | + |
142 | +Module #16 |
143 | + Name: module-console-kit |
144 | + Argument: |
145 | + Usage counter: n/a |
146 | + Properties: |
147 | + module.author = "Lennart Poettering" |
148 | + module.description = "Create a client for each ConsoleKit session of this user" |
149 | + module.version = "13.99.1" |
150 | + |
151 | +Module #17 |
152 | + Name: module-systemd-login |
153 | + Argument: |
154 | + Usage counter: n/a |
155 | + Properties: |
156 | + module.author = "Lennart Poettering" |
157 | + module.description = "Create a client for each login session of this user" |
158 | + module.version = "13.99.1" |
159 | + |
160 | +Module #18 |
161 | + Name: module-position-event-sounds |
162 | + Argument: |
163 | + Usage counter: n/a |
164 | + Properties: |
165 | + module.author = "Lennart Poettering" |
166 | + module.description = "Position event sounds between L and R depending on the position on screen of the widget triggering them." |
167 | + module.version = "13.99.1" |
168 | + |
169 | +Module #19 |
170 | + Name: module-role-cork |
171 | + Argument: |
172 | + Usage counter: n/a |
173 | + Properties: |
174 | + module.author = "Lennart Poettering" |
175 | + module.description = "Mute & cork streams with certain roles while others exist" |
176 | + module.version = "13.99.1" |
177 | + |
178 | +Module #20 |
179 | + Name: module-snap-policy |
180 | + Argument: |
181 | + Usage counter: n/a |
182 | + Properties: |
183 | + module.author = "Canonical Ltd" |
184 | + module.description = "Ubuntu Snap policy management" |
185 | + module.version = "13.99.1" |
186 | + |
187 | +Module #21 |
188 | + Name: module-filter-heuristics |
189 | + Argument: |
190 | + Usage counter: n/a |
191 | + Properties: |
192 | + module.author = "Colin Guthrie" |
193 | + module.description = "Detect when various filters are desirable" |
194 | + module.version = "13.99.1" |
195 | + |
196 | +Module #22 |
197 | + Name: module-filter-apply |
198 | + Argument: |
199 | + Usage counter: n/a |
200 | + Properties: |
201 | + module.author = "Colin Guthrie" |
202 | + module.description = "Load filter sinks automatically when needed" |
203 | + module.version = "13.99.1" |
204 | + |
205 | +Module #23 |
206 | + Name: module-alsa-card |
207 | + Argument: device_id="0" name="pci-0000_00_1f.3-platform-skl_hda_dsp_generic" card_name="alsa_card.pci-0000_00_1f.3-platform-skl_hda_dsp_generic" namereg_fail=false tsched=yes fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes avoid_resampling=no card_properties="module-udev-detect.discovered=1" |
208 | + Usage counter: 0 |
209 | + Properties: |
210 | + module.author = "Lennart Poettering" |
211 | + module.description = "ALSA Card" |
212 | + module.version = "13.99.1" |
213 | + |
214 | +Module #24 |
215 | + Name: module-x11-publish |
216 | + Argument: display=:0 xauthority=/run/user/1000/gdm/Xauthority |
217 | + Usage counter: n/a |
218 | + Properties: |
219 | + module.author = "Lennart Poettering" |
220 | + module.description = "X11 credential publisher" |
221 | + module.version = "13.99.1" |
222 | + |
223 | +Module #25 |
224 | + Name: module-x11-cork-request |
225 | + Argument: display=:0 xauthority=/run/user/1000/gdm/Xauthority |
226 | + Usage counter: n/a |
227 | + Properties: |
228 | + module.author = "Lennart Poettering" |
229 | + module.description = "Synthesize X11 media key events when cork/uncork is requested" |
230 | + module.version = "13.99.1" |
231 | + |
232 | +Module #26 |
233 | + Name: module-x11-xsmp |
234 | + Argument: display=:0 xauthority=/run/user/1000/gdm/Xauthority session_manager=local/u:@/tmp/.ICE-unix/1639,unix/u:/tmp/.ICE-unix/1639 |
235 | + Usage counter: n/a |
236 | + Properties: |
237 | + module.author = "Lennart Poettering" |
238 | + module.description = "X11 session management" |
239 | + module.version = "13.99.1" |
240 | + |
241 | +Sink #1 |
242 | + State: SUSPENDED |
243 | + Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_5__sink |
244 | + Description: sof-hda-dsp HDMI3/DP3 Output |
245 | + Driver: module-alsa-card.c |
246 | + Sample Specification: s16le 2ch 48000Hz |
247 | + Channel Map: front-left,front-right |
248 | + Owner Module: 23 |
249 | + Mute: no |
250 | + Volume: front-left: 65536 / 100% / 0.00 dB, front-right: 65536 / 100% / 0.00 dB |
251 | + balance 0.00 |
252 | + Base Volume: 65536 / 100% / 0.00 dB |
253 | + Monitor Source: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_5__sink.monitor |
254 | + Latency: 0 usec, configured 0 usec |
255 | + Flags: HARDWARE DECIBEL_VOLUME LATENCY |
256 | + Properties: |
257 | + alsa.resolution_bits = "16" |
258 | + device.api = "alsa" |
259 | + device.class = "sound" |
260 | + alsa.class = "generic" |
261 | + alsa.subclass = "generic-mix" |
262 | + alsa.name = "" |
263 | + alsa.id = "HDMI3 (*)" |
264 | + alsa.subdevice = "0" |
265 | + alsa.subdevice_name = "subdevice #0" |
266 | + alsa.device = "5" |
267 | + alsa.card = "0" |
268 | + alsa.card_name = "sof-hda-dsp" |
269 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
270 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
271 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
272 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
273 | + device.bus = "pci" |
274 | + device.vendor.id = "8086" |
275 | + device.vendor.name = "Intel Corporation" |
276 | + device.product.id = "a0c8" |
277 | + device.string = "hw:sofhdadsp,5" |
278 | + device.buffering.buffer_size = "65536" |
279 | + device.buffering.fragment_size = "16384" |
280 | + device.access_mode = "mmap+timer" |
281 | + device.profile.name = "HiFi: hw:sofhdadsp,5: sink" |
282 | + device.profile.description = "HDMI3/DP3 Output" |
283 | + alsa.mixer_device = "hw:sofhdadsp" |
284 | + device.description = "sof-hda-dsp HDMI3/DP3 Output" |
285 | + module-udev-detect.discovered = "1" |
286 | + device.icon_name = "audio-card-pci" |
287 | + Ports: |
288 | + [Out] HDMI3: HDMI3/DP3 Output (priority: 700, not available) |
289 | + Active Port: [Out] HDMI3 |
290 | + Formats: |
291 | + pcm |
292 | + |
293 | +Sink #2 |
294 | + State: SUSPENDED |
295 | + Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_4__sink |
296 | + Description: sof-hda-dsp HDMI2/DP2 Output |
297 | + Driver: module-alsa-card.c |
298 | + Sample Specification: s16le 2ch 48000Hz |
299 | + Channel Map: front-left,front-right |
300 | + Owner Module: 23 |
301 | + Mute: no |
302 | + Volume: front-left: 65536 / 100% / 0.00 dB, front-right: 65536 / 100% / 0.00 dB |
303 | + balance 0.00 |
304 | + Base Volume: 65536 / 100% / 0.00 dB |
305 | + Monitor Source: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_4__sink.monitor |
306 | + Latency: 0 usec, configured 0 usec |
307 | + Flags: HARDWARE DECIBEL_VOLUME LATENCY |
308 | + Properties: |
309 | + alsa.resolution_bits = "16" |
310 | + device.api = "alsa" |
311 | + device.class = "sound" |
312 | + alsa.class = "generic" |
313 | + alsa.subclass = "generic-mix" |
314 | + alsa.name = "" |
315 | + alsa.id = "HDMI2 (*)" |
316 | + alsa.subdevice = "0" |
317 | + alsa.subdevice_name = "subdevice #0" |
318 | + alsa.device = "4" |
319 | + alsa.card = "0" |
320 | + alsa.card_name = "sof-hda-dsp" |
321 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
322 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
323 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
324 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
325 | + device.bus = "pci" |
326 | + device.vendor.id = "8086" |
327 | + device.vendor.name = "Intel Corporation" |
328 | + device.product.id = "a0c8" |
329 | + device.string = "hw:sofhdadsp,4" |
330 | + device.buffering.buffer_size = "65536" |
331 | + device.buffering.fragment_size = "16384" |
332 | + device.access_mode = "mmap+timer" |
333 | + device.profile.name = "HiFi: hw:sofhdadsp,4: sink" |
334 | + device.profile.description = "HDMI2/DP2 Output" |
335 | + alsa.mixer_device = "hw:sofhdadsp" |
336 | + device.description = "sof-hda-dsp HDMI2/DP2 Output" |
337 | + module-udev-detect.discovered = "1" |
338 | + device.icon_name = "audio-card-pci" |
339 | + Ports: |
340 | + [Out] HDMI2: HDMI2/DP2 Output (priority: 600, not available) |
341 | + Active Port: [Out] HDMI2 |
342 | + Formats: |
343 | + pcm |
344 | + |
345 | +Sink #3 |
346 | + State: SUSPENDED |
347 | + Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_3__sink |
348 | + Description: sof-hda-dsp HDMI1/DP1 Output |
349 | + Driver: module-alsa-card.c |
350 | + Sample Specification: s16le 2ch 48000Hz |
351 | + Channel Map: front-left,front-right |
352 | + Owner Module: 23 |
353 | + Mute: no |
354 | + Volume: front-left: 65536 / 100% / 0.00 dB, front-right: 65536 / 100% / 0.00 dB |
355 | + balance 0.00 |
356 | + Base Volume: 65536 / 100% / 0.00 dB |
357 | + Monitor Source: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_3__sink.monitor |
358 | + Latency: 0 usec, configured 0 usec |
359 | + Flags: HARDWARE DECIBEL_VOLUME LATENCY |
360 | + Properties: |
361 | + alsa.resolution_bits = "16" |
362 | + device.api = "alsa" |
363 | + device.class = "sound" |
364 | + alsa.class = "generic" |
365 | + alsa.subclass = "generic-mix" |
366 | + alsa.name = "" |
367 | + alsa.id = "HDMI1 (*)" |
368 | + alsa.subdevice = "0" |
369 | + alsa.subdevice_name = "subdevice #0" |
370 | + alsa.device = "3" |
371 | + alsa.card = "0" |
372 | + alsa.card_name = "sof-hda-dsp" |
373 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
374 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
375 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
376 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
377 | + device.bus = "pci" |
378 | + device.vendor.id = "8086" |
379 | + device.vendor.name = "Intel Corporation" |
380 | + device.product.id = "a0c8" |
381 | + device.string = "hw:sofhdadsp,3" |
382 | + device.buffering.buffer_size = "65536" |
383 | + device.buffering.fragment_size = "16384" |
384 | + device.access_mode = "mmap+timer" |
385 | + device.profile.name = "HiFi: hw:sofhdadsp,3: sink" |
386 | + device.profile.description = "HDMI1/DP1 Output" |
387 | + alsa.mixer_device = "hw:sofhdadsp" |
388 | + device.description = "sof-hda-dsp HDMI1/DP1 Output" |
389 | + module-udev-detect.discovered = "1" |
390 | + device.icon_name = "audio-card-pci" |
391 | + Ports: |
392 | + [Out] HDMI1: HDMI1/DP1 Output (priority: 500, available) |
393 | + Active Port: [Out] HDMI1 |
394 | + Formats: |
395 | + pcm |
396 | + |
397 | +Sink #4 |
398 | + State: SUSPENDED |
399 | + Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink |
400 | + Description: sof-hda-dsp Speaker + Headphones |
401 | + Driver: module-alsa-card.c |
402 | + Sample Specification: s16le 2ch 48000Hz |
403 | + Channel Map: front-left,front-right |
404 | + Owner Module: 23 |
405 | + Mute: no |
406 | + Volume: front-left: 19944 / 30% / -31.00 dB, front-right: 19944 / 30% / -31.00 dB |
407 | + balance 0.00 |
408 | + Base Volume: 65536 / 100% / 0.00 dB |
409 | + Monitor Source: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink.monitor |
410 | + Latency: 0 usec, configured 0 usec |
411 | + Flags: HARDWARE HW_MUTE_CTRL HW_VOLUME_CTRL DECIBEL_VOLUME LATENCY |
412 | + Properties: |
413 | + alsa.resolution_bits = "16" |
414 | + device.api = "alsa" |
415 | + device.class = "sound" |
416 | + alsa.class = "generic" |
417 | + alsa.subclass = "generic-mix" |
418 | + alsa.name = "" |
419 | + alsa.id = "HDA Analog (*)" |
420 | + alsa.subdevice = "0" |
421 | + alsa.subdevice_name = "subdevice #0" |
422 | + alsa.device = "0" |
423 | + alsa.card = "0" |
424 | + alsa.card_name = "sof-hda-dsp" |
425 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
426 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
427 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
428 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
429 | + device.bus = "pci" |
430 | + device.vendor.id = "8086" |
431 | + device.vendor.name = "Intel Corporation" |
432 | + device.product.id = "a0c8" |
433 | + device.string = "hw:sofhdadsp" |
434 | + device.buffering.buffer_size = "65536" |
435 | + device.buffering.fragment_size = "16384" |
436 | + device.access_mode = "mmap+timer" |
437 | + device.profile.name = "HiFi: hw:sofhdadsp: sink" |
438 | + device.profile.description = "Speaker + Headphones" |
439 | + alsa.mixer_device = "hw:sofhdadsp" |
440 | + device.description = "sof-hda-dsp Speaker + Headphones" |
441 | + module-udev-detect.discovered = "1" |
442 | + device.icon_name = "audio-card-pci" |
443 | + Ports: |
444 | + [Out] Speaker: Speaker (priority: 100) |
445 | + [Out] Headphones: Headphones (priority: 200) |
446 | + Active Port: [Out] Headphones |
447 | + Formats: |
448 | + pcm |
449 | + |
450 | +Source #1 |
451 | + State: SUSPENDED |
452 | + Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_5__sink.monitor |
453 | + Description: Monitor of sof-hda-dsp HDMI3/DP3 Output |
454 | + Driver: module-alsa-card.c |
455 | + Sample Specification: s16le 2ch 48000Hz |
456 | + Channel Map: front-left,front-right |
457 | + Owner Module: 23 |
458 | + Mute: no |
459 | + Volume: front-left: 65536 / 100% / 0.00 dB, front-right: 65536 / 100% / 0.00 dB |
460 | + balance 0.00 |
461 | + Base Volume: 65536 / 100% / 0.00 dB |
462 | + Monitor of Sink: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_5__sink |
463 | + Latency: 0 usec, configured 0 usec |
464 | + Flags: DECIBEL_VOLUME LATENCY |
465 | + Properties: |
466 | + device.description = "Monitor of sof-hda-dsp HDMI3/DP3 Output" |
467 | + device.class = "monitor" |
468 | + alsa.card = "0" |
469 | + alsa.card_name = "sof-hda-dsp" |
470 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
471 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
472 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
473 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
474 | + device.bus = "pci" |
475 | + device.vendor.id = "8086" |
476 | + device.vendor.name = "Intel Corporation" |
477 | + device.product.id = "a0c8" |
478 | + device.string = "0" |
479 | + module-udev-detect.discovered = "1" |
480 | + device.icon_name = "audio-card-pci" |
481 | + Formats: |
482 | + pcm |
483 | + |
484 | +Source #2 |
485 | + State: SUSPENDED |
486 | + Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_4__sink.monitor |
487 | + Description: Monitor of sof-hda-dsp HDMI2/DP2 Output |
488 | + Driver: module-alsa-card.c |
489 | + Sample Specification: s16le 2ch 48000Hz |
490 | + Channel Map: front-left,front-right |
491 | + Owner Module: 23 |
492 | + Mute: no |
493 | + Volume: front-left: 65536 / 100% / 0.00 dB, front-right: 65536 / 100% / 0.00 dB |
494 | + balance 0.00 |
495 | + Base Volume: 65536 / 100% / 0.00 dB |
496 | + Monitor of Sink: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_4__sink |
497 | + Latency: 0 usec, configured 0 usec |
498 | + Flags: DECIBEL_VOLUME LATENCY |
499 | + Properties: |
500 | + device.description = "Monitor of sof-hda-dsp HDMI2/DP2 Output" |
501 | + device.class = "monitor" |
502 | + alsa.card = "0" |
503 | + alsa.card_name = "sof-hda-dsp" |
504 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
505 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
506 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
507 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
508 | + device.bus = "pci" |
509 | + device.vendor.id = "8086" |
510 | + device.vendor.name = "Intel Corporation" |
511 | + device.product.id = "a0c8" |
512 | + device.string = "0" |
513 | + module-udev-detect.discovered = "1" |
514 | + device.icon_name = "audio-card-pci" |
515 | + Formats: |
516 | + pcm |
517 | + |
518 | +Source #3 |
519 | + State: SUSPENDED |
520 | + Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_3__sink.monitor |
521 | + Description: Monitor of sof-hda-dsp HDMI1/DP1 Output |
522 | + Driver: module-alsa-card.c |
523 | + Sample Specification: s16le 2ch 48000Hz |
524 | + Channel Map: front-left,front-right |
525 | + Owner Module: 23 |
526 | + Mute: no |
527 | + Volume: front-left: 65536 / 100% / 0.00 dB, front-right: 65536 / 100% / 0.00 dB |
528 | + balance 0.00 |
529 | + Base Volume: 65536 / 100% / 0.00 dB |
530 | + Monitor of Sink: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_3__sink |
531 | + Latency: 0 usec, configured 0 usec |
532 | + Flags: DECIBEL_VOLUME LATENCY |
533 | + Properties: |
534 | + device.description = "Monitor of sof-hda-dsp HDMI1/DP1 Output" |
535 | + device.class = "monitor" |
536 | + alsa.card = "0" |
537 | + alsa.card_name = "sof-hda-dsp" |
538 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
539 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
540 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
541 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
542 | + device.bus = "pci" |
543 | + device.vendor.id = "8086" |
544 | + device.vendor.name = "Intel Corporation" |
545 | + device.product.id = "a0c8" |
546 | + device.string = "0" |
547 | + module-udev-detect.discovered = "1" |
548 | + device.icon_name = "audio-card-pci" |
549 | + Formats: |
550 | + pcm |
551 | + |
552 | +Source #4 |
553 | + State: SUSPENDED |
554 | + Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink.monitor |
555 | + Description: Monitor of sof-hda-dsp Speaker + Headphones |
556 | + Driver: module-alsa-card.c |
557 | + Sample Specification: s16le 2ch 48000Hz |
558 | + Channel Map: front-left,front-right |
559 | + Owner Module: 23 |
560 | + Mute: no |
561 | + Volume: front-left: 65536 / 100% / 0.00 dB, front-right: 65536 / 100% / 0.00 dB |
562 | + balance 0.00 |
563 | + Base Volume: 65536 / 100% / 0.00 dB |
564 | + Monitor of Sink: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink |
565 | + Latency: 0 usec, configured 0 usec |
566 | + Flags: DECIBEL_VOLUME LATENCY |
567 | + Properties: |
568 | + device.description = "Monitor of sof-hda-dsp Speaker + Headphones" |
569 | + device.class = "monitor" |
570 | + alsa.card = "0" |
571 | + alsa.card_name = "sof-hda-dsp" |
572 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
573 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
574 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
575 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
576 | + device.bus = "pci" |
577 | + device.vendor.id = "8086" |
578 | + device.vendor.name = "Intel Corporation" |
579 | + device.product.id = "a0c8" |
580 | + device.string = "0" |
581 | + module-udev-detect.discovered = "1" |
582 | + device.icon_name = "audio-card-pci" |
583 | + Formats: |
584 | + pcm |
585 | + |
586 | +Source #5 |
587 | + State: SUSPENDED |
588 | + Name: alsa_input.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__source |
589 | + Description: sof-hda-dsp Headphones Stereo Microphone |
590 | + Driver: module-alsa-card.c |
591 | + Sample Specification: s16le 2ch 48000Hz |
592 | + Channel Map: front-left,front-right |
593 | + Owner Module: 23 |
594 | + Mute: no |
595 | + Volume: front-left: 32845 / 50% / -18.00 dB, front-right: 32845 / 50% / -18.00 dB |
596 | + balance 0.00 |
597 | + Base Volume: 20724 / 32% / -30.00 dB |
598 | + Monitor of Sink: n/a |
599 | + Latency: 0 usec, configured 0 usec |
600 | + Flags: HARDWARE HW_MUTE_CTRL HW_VOLUME_CTRL DECIBEL_VOLUME LATENCY |
601 | + Properties: |
602 | + alsa.resolution_bits = "16" |
603 | + device.api = "alsa" |
604 | + device.class = "sound" |
605 | + alsa.class = "generic" |
606 | + alsa.subclass = "generic-mix" |
607 | + alsa.name = "" |
608 | + alsa.id = "HDA Analog (*)" |
609 | + alsa.subdevice = "0" |
610 | + alsa.subdevice_name = "subdevice #0" |
611 | + alsa.device = "0" |
612 | + alsa.card = "0" |
613 | + alsa.card_name = "sof-hda-dsp" |
614 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
615 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
616 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
617 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
618 | + device.bus = "pci" |
619 | + device.vendor.id = "8086" |
620 | + device.vendor.name = "Intel Corporation" |
621 | + device.product.id = "a0c8" |
622 | + device.string = "hw:sofhdadsp" |
623 | + device.buffering.buffer_size = "65536" |
624 | + device.buffering.fragment_size = "16384" |
625 | + device.access_mode = "mmap+timer" |
626 | + device.profile.name = "HiFi: hw:sofhdadsp: source" |
627 | + device.profile.description = "Headphones Stereo Microphone" |
628 | + alsa.mixer_device = "hw:sofhdadsp" |
629 | + device.description = "sof-hda-dsp Headphones Stereo Microphone" |
630 | + module-udev-detect.discovered = "1" |
631 | + device.icon_name = "audio-card-pci" |
632 | + Ports: |
633 | + [In] Mic2: Headphones Stereo Microphone (priority: 200) |
634 | + Active Port: [In] Mic2 |
635 | + Formats: |
636 | + pcm |
637 | + |
638 | +Source #6 |
639 | + State: SUSPENDED |
640 | + Name: alsa_input.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_6__source |
641 | + Description: sof-hda-dsp Digital Microphone |
642 | + Driver: module-alsa-card.c |
643 | + Sample Specification: s16le 4ch 48000Hz |
644 | + Channel Map: front-left,front-right,rear-left,rear-right |
645 | + Owner Module: 23 |
646 | + Mute: no |
647 | + Volume: front-left: 29274 / 45% / -21.00 dB, front-right: 29274 / 45% / -21.00 dB, rear-left: 29274 / 45% / -21.00 dB, rear-right: 29274 / 45% / -21.00 dB |
648 | + balance 0.00 |
649 | + Base Volume: 30419 / 46% / -20.00 dB |
650 | + Monitor of Sink: n/a |
651 | + Latency: 0 usec, configured 0 usec |
652 | + Flags: HARDWARE HW_MUTE_CTRL HW_VOLUME_CTRL DECIBEL_VOLUME LATENCY |
653 | + Properties: |
654 | + alsa.resolution_bits = "16" |
655 | + device.api = "alsa" |
656 | + device.class = "sound" |
657 | + alsa.class = "generic" |
658 | + alsa.subclass = "generic-mix" |
659 | + alsa.name = "" |
660 | + alsa.id = "DMIC (*)" |
661 | + alsa.subdevice = "0" |
662 | + alsa.subdevice_name = "subdevice #0" |
663 | + alsa.device = "6" |
664 | + alsa.card = "0" |
665 | + alsa.card_name = "sof-hda-dsp" |
666 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
667 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
668 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
669 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
670 | + device.bus = "pci" |
671 | + device.vendor.id = "8086" |
672 | + device.vendor.name = "Intel Corporation" |
673 | + device.product.id = "a0c8" |
674 | + device.string = "hw:sofhdadsp,6" |
675 | + device.buffering.buffer_size = "65536" |
676 | + device.buffering.fragment_size = "16384" |
677 | + device.access_mode = "mmap+timer" |
678 | + device.profile.name = "HiFi: hw:sofhdadsp,6: source" |
679 | + device.profile.description = "Digital Microphone" |
680 | + alsa.mixer_device = "hw:sofhdadsp" |
681 | + device.description = "sof-hda-dsp Digital Microphone" |
682 | + module-udev-detect.discovered = "1" |
683 | + device.icon_name = "audio-card-pci" |
684 | + Ports: |
685 | + [In] Mic1: Digital Microphone (priority: 100) |
686 | + Active Port: [In] Mic1 |
687 | + Formats: |
688 | + pcm |
689 | + |
690 | +Client #0 |
691 | + Driver: module-systemd-login.c |
692 | + Owner Module: 17 |
693 | + Properties: |
694 | + application.name = "Login Session 2" |
695 | + systemd-login.session = "2" |
696 | + |
697 | +Client #4 |
698 | + Driver: module-x11-xsmp.c |
699 | + Owner Module: 26 |
700 | + Properties: |
701 | + application.name = "XSMP Session on gnome-session as 10ec6cc64fba7c34fe163729351342406800000016390060" |
702 | + xsmp.vendor = "gnome-session" |
703 | + xsmp.client.id = "10ec6cc64fba7c34fe163729351342406800000016390060" |
704 | + |
705 | +Client #5 |
706 | + Driver: protocol-native.c |
707 | + Owner Module: 10 |
708 | + Properties: |
709 | + application.name = "GNOME Shell Volume Control" |
710 | + native-protocol.peer = "UNIX socket client" |
711 | + native-protocol.version = "33" |
712 | + application.id = "org.gnome.VolumeControl" |
713 | + application.icon_name = "multimedia-volume-control" |
714 | + application.version = "3.36.9" |
715 | + application.process.id = "1654" |
716 | + application.process.user = "u" |
717 | + application.process.host = "u" |
718 | + application.process.binary = "gnome-shell" |
719 | + application.language = "en_US.UTF-8" |
720 | + window.x11.display = ":0" |
721 | + application.process.machine_id = "8f6599b170014e7cbecdf0bcdacb19fd" |
722 | + |
723 | +Client #6 |
724 | + Driver: protocol-native.c |
725 | + Owner Module: 10 |
726 | + Properties: |
727 | + application.name = "GNOME Volume Control Media Keys" |
728 | + native-protocol.peer = "UNIX socket client" |
729 | + native-protocol.version = "33" |
730 | + application.id = "org.gnome.VolumeControl" |
731 | + application.icon_name = "multimedia-volume-control" |
732 | + application.version = "" |
733 | + application.process.id = "1785" |
734 | + application.process.user = "u" |
735 | + application.process.host = "u" |
736 | + application.process.binary = "gsd-media-keys" |
737 | + application.language = "en_US.UTF-8" |
738 | + window.x11.display = ":0" |
739 | + application.process.machine_id = "8f6599b170014e7cbecdf0bcdacb19fd" |
740 | + |
741 | +Client #8 |
742 | + Driver: protocol-native.c |
743 | + Owner Module: 10 |
744 | + Properties: |
745 | + application.name = "Terminal" |
746 | + native-protocol.peer = "UNIX socket client" |
747 | + native-protocol.version = "33" |
748 | + application.icon_name = "org.gnome.Terminal" |
749 | + window.x11.display = ":0" |
750 | + window.x11.screen = "0" |
751 | + application.process.id = "2071" |
752 | + application.process.user = "u" |
753 | + application.process.host = "u" |
754 | + application.process.binary = "gnome-terminal-server" |
755 | + application.language = "en_US.UTF-8" |
756 | + application.process.machine_id = "8f6599b170014e7cbecdf0bcdacb19fd" |
757 | + |
758 | +Client #11 |
759 | + Driver: protocol-native.c |
760 | + Owner Module: 10 |
761 | + Properties: |
762 | + application.name = "Mutter" |
763 | + native-protocol.peer = "UNIX socket client" |
764 | + native-protocol.version = "33" |
765 | + application.process.id = "1654" |
766 | + application.process.user = "u" |
767 | + application.process.host = "u" |
768 | + application.process.binary = "gnome-shell" |
769 | + application.language = "en_US.UTF-8" |
770 | + window.x11.display = ":0" |
771 | + application.process.machine_id = "8f6599b170014e7cbecdf0bcdacb19fd" |
772 | + |
773 | +Client #12 |
774 | + Driver: protocol-native.c |
775 | + Owner Module: 10 |
776 | + Properties: |
777 | + application.name = "update-manager" |
778 | + native-protocol.peer = "UNIX socket client" |
779 | + native-protocol.version = "33" |
780 | + application.icon_name = "system-software-update" |
781 | + window.x11.display = ":0" |
782 | + window.x11.screen = "0" |
783 | + application.process.id = "2268" |
784 | + application.process.user = "u" |
785 | + application.process.host = "u" |
786 | + application.process.binary = "python3.8" |
787 | + application.language = "en_US.UTF-8" |
788 | + application.process.machine_id = "8f6599b170014e7cbecdf0bcdacb19fd" |
789 | + |
790 | +Client #13 |
791 | + Driver: protocol-native.c |
792 | + Owner Module: 10 |
793 | + Properties: |
794 | + application.name = "pactl" |
795 | + native-protocol.peer = "UNIX socket client" |
796 | + native-protocol.version = "33" |
797 | + application.process.id = "2864" |
798 | + application.process.user = "u" |
799 | + application.process.host = "u" |
800 | + application.process.binary = "pactl" |
801 | + application.language = "en_US.UTF-8" |
802 | + window.x11.display = ":0" |
803 | + application.process.machine_id = "8f6599b170014e7cbecdf0bcdacb19fd" |
804 | + |
805 | +Card #0 |
806 | + Name: alsa_card.pci-0000_00_1f.3-platform-skl_hda_dsp_generic |
807 | + Driver: module-alsa-card.c |
808 | + Owner Module: 23 |
809 | + Properties: |
810 | + alsa.card = "0" |
811 | + alsa.card_name = "sof-hda-dsp" |
812 | + alsa.long_card_name = "AAEON-UPX_TGL01-V1.0" |
813 | + alsa.driver_name = "snd_soc_skl_hda_dsp" |
814 | + device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic" |
815 | + sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0" |
816 | + device.bus = "pci" |
817 | + device.vendor.id = "8086" |
818 | + device.vendor.name = "Intel Corporation" |
819 | + device.product.id = "a0c8" |
820 | + device.string = "0" |
821 | + device.description = "sof-hda-dsp" |
822 | + module-udev-detect.discovered = "1" |
823 | + device.icon_name = "audio-card-pci" |
824 | + Profiles: |
825 | + HiFi: Play HiFi quality Music (sinks: 4, sources: 2, priority: 40768, available: yes) |
826 | + off: Off (sinks: 0, sources: 0, priority: 0, available: yes) |
827 | + Active Profile: HiFi |
828 | + Ports: |
829 | + [Out] HDMI3: HDMI3/DP3 Output (priority: 700, latency offset: 0 usec, not available) |
830 | + Part of profile(s): HiFi |
831 | + [Out] HDMI2: HDMI2/DP2 Output (priority: 600, latency offset: 0 usec, not available) |
832 | + Part of profile(s): HiFi |
833 | + [Out] HDMI1: HDMI1/DP1 Output (priority: 500, latency offset: 0 usec, available) |
834 | + Properties: |
835 | + device.product.name = "BenQ EL2870U" |
836 | + Part of profile(s): HiFi |
837 | + [Out] Speaker: Speaker (priority: 100, latency offset: 0 usec) |
838 | + Part of profile(s): HiFi |
839 | + [Out] Headphones: Headphones (priority: 200, latency offset: 0 usec) |
840 | + Part of profile(s): HiFi |
841 | + [In] Mic2: Headphones Stereo Microphone (priority: 200, latency offset: 0 usec) |
842 | + Part of profile(s): HiFi |
843 | + [In] Mic1: Digital Microphone (priority: 100, latency offset: 0 usec) |
844 | + Part of profile(s): HiFi |
845 | diff --git a/checkbox_support/scripts/audio_settings.py b/checkbox_support/scripts/audio_settings.py |
846 | index 2cf6a3f..1b3974c 100644 |
847 | --- a/checkbox_support/scripts/audio_settings.py |
848 | +++ b/checkbox_support/scripts/audio_settings.py |
849 | @@ -123,7 +123,7 @@ def _guess_hdmi_profile(pactl_list): |
850 | card, port = available_port.popitem() |
851 | # Keep the shortest string in the profile_list including 'stereo' |
852 | # it will avoid testing 'surround' profiles |
853 | - profile = min([p for p in port.profile_list if ('stereo' in p) or ('Hdmi' in p)], key=len) |
854 | + profile = min([p for p in port.profile_list if ('stereo' in p) or ('Hdmi' in p) or ('HiFi' in p)], key=len) |
855 | logging.info("[ Selected profile ]".center(80, '=')) |
856 | logging.info("Card #{} Profile: {}".format(card, profile)) |
857 | return (card, profile) |
858 | diff --git a/checkbox_support/scripts/tests/test_audio_settings.py b/checkbox_support/scripts/tests/test_audio_settings.py |
859 | index 6a6b0ba..8427a05 100644 |
860 | --- a/checkbox_support/scripts/tests/test_audio_settings.py |
861 | +++ b/checkbox_support/scripts/tests/test_audio_settings.py |
862 | @@ -171,6 +171,15 @@ class SetProfileTest(unittest.TestCase, PactlDataMixIn): |
863 | _guess_hdmi_profile(self.get_text("desktop-bionic-x13")), |
864 | ('0', 'Hdmi2')) |
865 | |
866 | + def test_displayport_monitor_hifi(self): |
867 | + """ |
868 | + Displayport profiles can be exposed using Hifi |
869 | + """ |
870 | + self.assertEqual( |
871 | + _guess_hdmi_profile(self.get_text("displayport-monitor-hifi")), |
872 | + ('0', 'HiFi')) |
873 | + |
874 | + |
875 | class RegexTest(unittest.TestCase): |
876 | |
877 | def test_volume_regex_trusty(self): |
LGTM, thank you!