Changeset 0d59ea7e in mainline for uspace/drv/audio/hdaudio/codec.c

Timestamp:

2022-07-02T14:34:36Z (22 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6ab7aad4, a247c32, baa2a33, d9dda26

Parents:

9e9d9bc6

Message:

Multiple HD Audio converters cannot pull from a single stream

We select one arbitrary output converter for out PCM output, similar to what
we do for input.

We filter the 'other' VirtualBox output converters based on rates/formats
being zero.

File:

• uspace/drv/audio/hdaudio/codec.c (modified) (6 diffs)

uspace/drv/audio/hdaudio/codec.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2014 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -512 +512 @@
         codec->address = address;
         codec->in_aw = -1;
+        codec->out_aw = -1;
 
         rc = hda_get_subnc(codec, 0, &sfg, &nfg);
@@ -584 +585 @@
                                         goto error;
                         } else if (awtype == awt_audio_output) {
-                                codec->out_aw_list[codec->out_aw_num++] = aw;
-
                                 rc = hda_get_supp_rates(codec, aw, &rates);
                                 if (rc != EOK)
@@ -594 +593 @@
                                         goto error;
 
-                                ddf_msg(LVL_DEBUG, "Output widget %d: rates=0x%x formats=0x%x",
+                                if (rates != 0 && formats != 0 &&
+                                    codec->out_aw < 0) {
+                                        ddf_msg(LVL_DEBUG, "Selected output "
+                                            "widget %d\n", aw);
+                                        codec->out_aw = aw;
+                                } else {
+                                        ddf_msg(LVL_DEBUG, "Ignoring output "
+                                            "widget %d\n", aw);
+                                }
+
+                                ddf_msg(LVL_NOTE, "Output widget %d: rates=0x%x formats=0x%x",
                                     aw, rates, formats);
+                                codec->out_aw_rates = rates;
+                                codec->out_aw_formats = formats;
                         } else if (awtype == awt_audio_input) {
                                 if (codec->in_aw < 0) {
@@ -616 +627 @@
                                 ddf_msg(LVL_DEBUG, "Input widget %d: rates=0x%x formats=0x%x",
                                     aw, rates, formats);
+                                codec->in_aw_rates = rates;
+                                codec->in_aw_formats = formats;
                         }
 
@@ -644 +657 @@
 {
         errno_t rc;
-        int out_aw;
-        int i;
-
-        for (i = 0; i < codec->out_aw_num; i++) {
-                out_aw = codec->out_aw_list[i];
-
-                /* Configure converter */
-
-                ddf_msg(LVL_DEBUG, "Configure output converter format");
-                rc = hda_set_converter_fmt(codec, out_aw, stream->fmt);
-                if (rc != EOK)
-                        goto error;
-
-                ddf_msg(LVL_DEBUG, "Configure output converter stream, channel");
-                rc = hda_set_converter_ctl(codec, out_aw, stream->sid, 0);
-                if (rc != EOK)
-                        goto error;
-        }
+
+        /* Configure converter */
+        ddf_msg(LVL_DEBUG, "Configure output converter format / %d",
+            codec->out_aw);
+        rc = hda_set_converter_fmt(codec, codec->out_aw, stream->fmt);
+        if (rc != EOK)
+                goto error;
+
+        ddf_msg(LVL_DEBUG, "Configure output converter stream, channel");
+        rc = hda_set_converter_ctl(codec, codec->out_aw, stream->sid, 0);
+        if (rc != EOK)
+                goto error;
 
         return EOK;