Changeset 67692 in vbox

Timestamp:

Jun 29, 2017 12:36:40 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

116522

Message:

Audio/HDA: Stream configuration initialization fixes.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (17 diffs)
• HDACodec.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/DevHDA.cpp

@@ -1001 +1001 @@
  */
 #ifdef IN_RING3
-static int hdaSDFMTToStrmCfg(uint32_t u32SDFMT, PPDMAUDIOSTREAMCFG pStrmCfg);
+static int hdaSDFMTToPCMProps(uint32_t u32SDFMT, PPDMAUDIOPCMPROPS pProps);
 #endif
 /** @} */
@@ -1062 +1062 @@
  */
 #ifdef IN_RING3
-static int           hdaStreamMapInit(PHDASTREAMMAPPING pMapping, PPDMAUDIOSTREAMCFG pCfg);
+static int           hdaStreamMapInit(PHDASTREAMMAPPING pMapping, PPDMAUDIOPCMPROPS pProps);
 static void          hdaStreamMapDestroy(PHDASTREAMMAPPING pMapping);
 static void          hdaStreamMapReset(PHDASTREAMMAPPING pMapping);
@@ -1957 +1957 @@
     hdaStreamUpdateLPIB(pThis, pStream, HDA_STREAM_REG(pThis, LPIB, pStream->u8SD));
 
-    int rc = hdaSDFMTToStrmCfg(HDA_STREAM_REG(pThis, FMT, uSD), &pStream->State.strmCfg);
+    PPDMAUDIOSTREAMCFG pCfg = &pStream->State.strmCfg;
+
+    int rc = hdaSDFMTToPCMProps(HDA_STREAM_REG(pThis, FMT, uSD), &pCfg->Props);
     if (RT_FAILURE(rc))
     {
@@ -1963 +1965 @@
         return rc;
     }
-
-    PPDMAUDIOSTREAMCFG pCfg = &pStream->State.strmCfg;
 
     /* Set the stream's direction. */
@@ -1977 +1977 @@
 # else
             pCfg->DestSource.Source = PDMAUDIORECSOURCE_LINE;
+            pCfg->enmLayout         = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
             RTStrCopy(pCfg->szName, sizeof(pCfg->szName), "Line In");
 # endif
@@ -1999 +2000 @@
      * number of channels in a single audio stream.
      */
-    rc = hdaStreamMapInit(&pStream->State.Mapping, pCfg);
+    rc = hdaStreamMapInit(&pStream->State.Mapping, &pCfg->Props);
     AssertRCReturn(rc, rc);
 
@@ -2955 +2956 @@
 
 #ifdef IN_RING3
-static int hdaSDFMTToStrmCfg(uint32_t u32SDFMT, PPDMAUDIOSTREAMCFG pStrmCfg)
-{
-    AssertPtrReturn(pStrmCfg, VERR_INVALID_POINTER);
+/**
+ * Converts an HDA stream's SDFMT register into a given PCM properties structure.
+ *
+ * @return  IPRT status code.
+ * @param   u32SDFMT            The HDA stream's SDFMT value to convert.
+ * @param   pProps              PCM properties structure to hold converted result on success.
+ */
+static int hdaSDFMTToPCMProps(uint32_t u32SDFMT, PPDMAUDIOPCMPROPS pProps)
+{
+    AssertPtrReturn(pProps, VERR_INVALID_POINTER);
 
 # define EXTRACT_VALUE(v, mask, shift) ((v & ((mask) << (shift))) >> (shift))
@@ -3018 +3026 @@
     if (RT_SUCCESS(rc))
     {
-        RT_ZERO(pStrmCfg->Props);
-
-        pStrmCfg->Props.uHz       = u32Hz * u32HzMult / u32HzDiv;
-        pStrmCfg->Props.cChannels = (u32SDFMT & 0xf) + 1;
-        pStrmCfg->Props.cBits     = cBits;
-        pStrmCfg->Props.fSigned   = true;
-        pStrmCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pStrmCfg->Props.cBits, pStrmCfg->Props.cChannels);
+        RT_BZERO(pProps, sizeof(PDMAUDIOPCMPROPS));
+
+        pProps->cBits     = cBits;
+        pProps->fSigned   = true;
+        pProps->cChannels = (u32SDFMT & 0xf) + 1;
+        pProps->uHz       = u32Hz * u32HzMult / u32HzDiv;
+        pProps->cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pProps->cBits, pProps->cChannels);
     }
 
@@ -3062 +3070 @@
 
     /** @todo Make the following configurable through mixer API and/or CFGM? */
-    switch (pCfg->cChannels)
+    switch (pCfg->Props.cChannels)
     {
         case 3:  /* 2.1: Front (Stereo) + LFE. */
@@ -3108 +3116 @@
     if (rc == VERR_NOT_SUPPORTED)
     {
-        LogRel(("HDA: Unsupported channel count (%RU8), falling back to stereo channels\n", pCfg->Props.cChannels));
-        pCfg->Props.cChannels = 2;
-
+        LogRel2(("HDA: Unsupported channel count (%RU8), falling back to stereo channels\n", pCfg->Props.cChannels));
+
+        /* Fall back to 2 channels (see below in fUseFront block). */
         rc = VINF_SUCCESS;
     }
@@ -3122 +3130 @@
         {
             RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Front");
+
             pCfg->DestSource.Dest = PDMAUDIOPLAYBACKDEST_FRONT;
+            pCfg->enmLayout       = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+
             pCfg->Props.cChannels = 2;
+            pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBits, pCfg->Props.cChannels);
 
             rc = hdaCodecRemoveStream(pThis->pCodec,  PDMAUDIOMIXERCTL_FRONT);
@@ -3135 +3147 @@
         {
             RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Center/LFE");
+
             pCfg->DestSource.Dest = PDMAUDIOPLAYBACKDEST_CENTER_LFE;
+            pCfg->enmLayout       = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+
             pCfg->Props.cChannels = (fUseCenter && fUseLFE) ? 2 : 1;
+            pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBits, pCfg->Props.cChannels);
 
             rc = hdaCodecRemoveStream(pThis->pCodec,  PDMAUDIOMIXERCTL_CENTER_LFE);
@@ -3147 +3163 @@
         {
             RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Rear");
+
             pCfg->DestSource.Dest = PDMAUDIOPLAYBACKDEST_REAR;
+            pCfg->enmLayout       = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+
             pCfg->Props.cChannels = 2;
+            pCfg->Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfg->Props.cBits, pCfg->Props.cChannels);
 
             rc = hdaCodecRemoveStream(pThis->pCodec,  PDMAUDIOMIXERCTL_REAR);
@@ -3721 +3741 @@
 #ifdef IN_RING3
 /**
- * Initializes a stream mapping structure according to the given stream configuration.
+ * Initializes a stream mapping structure according to the given PCM properties.
  *
  * @return  IPRT status code.
  * @param   pMapping            Pointer to mapping to initialize.
- * @param   pCfg                Pointer to stream configuration to use.
- */
-static int hdaStreamMapInit(PHDASTREAMMAPPING pMapping, PPDMAUDIOSTREAMCFG pCfg)
+ * @param   pProps              Pointer to PCM properties to use for initialization.
+ */
+static int hdaStreamMapInit(PHDASTREAMMAPPING pMapping, PPDMAUDIOPCMPROPS pProps)
 {
     AssertPtrReturn(pMapping, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfg,     VERR_INVALID_POINTER);
-
-    AssertReturn(pCfg->Props.cChannels, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pProps,   VERR_INVALID_POINTER);
+
+    if (!DrvAudioHlpPCMPropsAreValid(pProps))
+        return VERR_INVALID_PARAMETER;
 
     hdaStreamMapReset(pMapping);
 
-    pMapping->paChannels = (PPDMAUDIOSTREAMCHANNEL)RTMemAlloc(sizeof(PDMAUDIOSTREAMCHANNEL) * pCfg->Props.cChannels);
+    pMapping->paChannels = (PPDMAUDIOSTREAMCHANNEL)RTMemAlloc(sizeof(PDMAUDIOSTREAMCHANNEL) * pProps->cChannels);
     if (!pMapping->paChannels)
         return VERR_NO_MEMORY;
 
-    if (!DrvAudioHlpStreamCfgIsValid(pCfg))
-        return VERR_INVALID_PARAMETER;
-
     int rc = VINF_SUCCESS;
 
-    Assert(RT_IS_POWER_OF_TWO(pCfg->Props.cBits));
+    Assert(RT_IS_POWER_OF_TWO(pProps->cBits));
 
     /** @todo We assume all channels in a stream have the same format. */
     PPDMAUDIOSTREAMCHANNEL pChan = pMapping->paChannels;
-    for (uint8_t i = 0; i < pCfg->Props.cChannels; i++)
+    for (uint8_t i = 0; i < pProps->cChannels; i++)
     {
         pChan->uChannel = i;
-        pChan->cbStep   = (pCfg->Props.cBits / 2);
-        pChan->cbFrame  = pChan->cbStep * pCfg->Props.cChannels;
+        pChan->cbStep   = (pProps->cBits / 2);
+        pChan->cbFrame  = pChan->cbStep * pProps->cChannels;
         pChan->cbFirst  = i * pChan->cbStep;
         pChan->cbOff    = pChan->cbFirst;
@@ -3776 +3794 @@
     if (RT_SUCCESS(rc))
     {
-        pMapping->cChannels = pCfg->Props.cChannels;
+        pMapping->cChannels = pProps->cChannels;
 #ifdef VBOX_WITH_HDA_AUDIO_INTERLEAVING_STREAMS_SUPPORT
         pMapping->enmLayout = PDMAUDIOSTREAMLAYOUT_INTERLEAVED;
@@ -3939 +3957 @@
 
     if (!DrvAudioHlpStreamCfgIsValid(pCfg))
+    {
+        LogRel(("HDA: Invalid stream configuration used for sink #%RU8: %RU8 bit, %RU8 channel(s) @ %RU32Hz\n",
+                pSink->uSD, pCfg->Props.cBits, pCfg->Props.cChannels, pCfg->Props.uHz));
+
+        AssertFailed(); /* Should not happen. */
         return VERR_INVALID_PARAMETER;
+    }
 
     int rc = AudioMixerSinkSetFormat(pSink->pMixSink, &pCfg->Props);
@@ -6550 +6574 @@
                     hdaBDLEDumpAll(pThis, pStrm->u64BDLBase, pStrm->u16LVI + 1);
 #endif
-                }
-
-                rc = hdaSDFMTToStrmCfg(HDA_STREAM_REG(pThis, FMT, uStreamID), &pStrm->State.strmCfg);
-                if (RT_FAILURE(rc))
-                {
-                    LogRel(("HDA: Stream #%RU8: Loading format failed, rc=%Rrc\n", uStreamID, rc));
-                    /* Continue. */
                 }
 

trunk/src/VBox/Devices/Audio/HDACodec.cpp

@@ -3291 +3291 @@
         RT_ZERO(strmCfg);
 
-        strmCfg.Props.uHz       = 44100;
-        strmCfg.Props.cChannels = 2;
-        strmCfg.Props.cBits     = 16;
-        strmCfg.Props.fSigned   = true;
-
         /* Note: Adding the default input/output streams is *not* critical for the overall
          *       codec construction result. */
@@ -3302 +3297 @@
          * Output streams.
          */
-        strmCfg.enmDir = PDMAUDIODIR_OUT;
+        strmCfg.enmDir    = PDMAUDIODIR_OUT;
+        strmCfg.enmLayout = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+
+        strmCfg.Props.cBits     = 16;
+        strmCfg.Props.fSigned   = true;
+        strmCfg.Props.cChannels = 2;
+        strmCfg.Props.uHz       = 44100;
+        strmCfg.Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(strmCfg.Props.cBits, strmCfg.Props.cChannels);
 
         /* Front. */
@@ -3331 +3333 @@
          * Input streams.
          */
-        strmCfg.enmDir = PDMAUDIODIR_IN;
+        RT_ZERO(strmCfg);
+
+        strmCfg.enmDir    = PDMAUDIODIR_IN;
+        strmCfg.enmLayout = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+
+        strmCfg.Props.cBits     = 16;
+        strmCfg.Props.fSigned   = true;
+        strmCfg.Props.cChannels = 2;
+        strmCfg.Props.uHz       = 44100;
+        strmCfg.Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(strmCfg.Props.cBits, strmCfg.Props.cChannels);
 
 #ifdef VBOX_WITH_AUDIO_HDA_MIC_IN