Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: Only score hardware formats by channel count at count<=2

Browse Source 
Scoring by channel count makes sense when you are using hardware that
supports mono and stereo formats. However, if your hardware also supports
surround formats, defaulting to those might be confusing. So, don't
prefer them.

Problem reported and fix tested by tcmart14 with a 2015 model Macbook Pro.
This commit is contained in:
nia 2021-05-02 21:37:32 +00:00
parent c29d5e341f
commit 9bf7704373
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/audio/audio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: audio.c,v 1.94 2021/04/26 19:59:58 thorpej Exp $ */ /* $NetBSD: audio.c,v 1.95 2021/05/02 21:37:32 nia Exp $ */
/*- /*-
* Copyright (c) 2008 The NetBSD Foundation, Inc. * Copyright (c) 2008 The NetBSD Foundation, Inc.
@ -138,7 +138,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.94 2021/04/26 19:59:58 thorpej Exp $"); __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.95 2021/05/02 21:37:32 nia Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "audio.h" #include "audio.h"
@ -6574,7 +6574,10 @@ audio_hw_probe(struct audio_softc *sc, audio_format2_t *cand, int mode)
query.fmt.precision == AUDIO_INTERNAL_BITS) { query.fmt.precision == AUDIO_INTERNAL_BITS) {
score += 0x10; score += 0x10;
} }
score += query.fmt.channels;
/* Do not prefer surround formats */
if (query.fmt.channels <= 2)
score += query.fmt.channels;
if (score < cand_score) { if (score < cand_score) {
DPRINTF(1, "fmt[%d] skip; score 0x%x < 0x%x\n", i, DPRINTF(1, "fmt[%d] skip; score 0x%x < 0x%x\n", i,