Changeset 89821 in vbox

Timestamp:

Jun 21, 2021 1:04:40 PM (4 years ago)

Author:

vboxsync

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

145278

Message:

Audio: Some info item fixes and docs updates. bugref:9890

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioinline.h (modified) (1 diff)
• src/VBox/Devices/Audio/AudioMixer.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DevHda.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DevHdaStream.h (modified) (2 diffs)

trunk/include/VBox/vmm/pdmaudioinline.h

@@ -1417 +1417 @@
                 PDMAudioPropsFramesToMilliMax(&pCfg->Props, pCfg->Backend.cFramesPreBuffering, 9999999),
                 pCfg->Device.cMsSchedulingHint,
-                pCfg->enmPath == PDMAUDIOPATH_UNKNOWN ? ", " : "",
+                pCfg->enmPath == PDMAUDIOPATH_UNKNOWN ? "" : ", ",
                 pCfg->enmPath == PDMAUDIOPATH_UNKNOWN ? "" : PDMAudioPathGetName(pCfg->enmPath) );
     return pszDst;

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

@@ -257 +257 @@
     AssertReturnVoid(pMixer->uMagic == AUDIOMIXER_MAGIC);
 
-    int rc2 = RTCritSectEnter(&pMixer->CritSect);
-    AssertRCReturnVoid(rc2);
-
-    pHlp->pfnPrintf(pHlp, "[Master] %s: fMuted=%RTbool auChannels=%.*Rhxs\n",
-                    pMixer->pszName, pMixer->VolMaster.fMuted, sizeof(pMixer->VolMaster.auChannels), pMixer->VolMaster.auChannels);
-
+    int rc = RTCritSectEnter(&pMixer->CritSect);
+    AssertRCReturnVoid(rc);
+
+    /* Determin max sink name length for pretty formatting: */
+    size_t cchMaxName = strlen(pMixer->pszName);
     PAUDMIXSINK pSink;
-    unsigned    iSink = 0;
     RTListForEach(&pMixer->lstSinks, pSink, AUDMIXSINK, Node)
     {
-        pHlp->pfnPrintf(pHlp, "[Sink %u] %s: fMuted=%RTbool auChannels=%.*Rhxs\n",
-                        iSink, pSink->pszName, pSink->Volume.fMuted, sizeof(pSink->Volume.auChannels), pSink->Volume.auChannels);
+        size_t const cchMixer = strlen(pSink->pszName);
+        cchMaxName = RT_MAX(cchMixer, cchMaxName);
+    }
+
+    /* Do the displaying. */
+    pHlp->pfnPrintf(pHlp, "[Master] %*s: fMuted=%#RTbool auChannels=%.*Rhxs\n", cchMaxName, pMixer->pszName,
+                    pMixer->VolMaster.fMuted, sizeof(pMixer->VolMaster.auChannels), pMixer->VolMaster.auChannels);
+    unsigned iSink = 0;
+    RTListForEach(&pMixer->lstSinks, pSink, AUDMIXSINK, Node)
+    {
+        pHlp->pfnPrintf(pHlp, "[Sink %u] %*s: fMuted=%#RTbool auChannels=%.*Rhxs\n", iSink, cchMaxName, pSink->pszName,
+                        pSink->Volume.fMuted, sizeof(pSink->Volume.auChannels), pSink->Volume.auChannels);
         ++iSink;
     }
 
-    rc2 = RTCritSectLeave(&pMixer->CritSect);
-    AssertRC(rc2);
+    RTCritSectLeave(&pMixer->CritSect);
 }
 

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

@@ -4120 +4120 @@
 static void hdaR3DbgPrintStream(PHDASTATE pThis, PCDBGFINFOHLP pHlp, int idxStream)
 {
-
-    pHlp->pfnPrintf(pHlp, "Stream #%d:\n", idxStream);
+    char szTmp[PDMAUDIOSTRMCFGTOSTRING_MAX];
+    PHDASTREAM const pStream = &pThis->aStreams[idxStream];
+    pHlp->pfnPrintf(pHlp, "Stream #%d: %s\n", idxStream, PDMAudioStrmCfgToString(&pStream->State.Cfg, szTmp, sizeof(szTmp)));
     pHlp->pfnPrintf(pHlp, "  SD%dCTL  : %R[sdctl]\n",   idxStream, HDA_STREAM_REG(pThis, CTL,   idxStream));
     pHlp->pfnPrintf(pHlp, "  SD%dCTS  : %R[sdsts]\n",   idxStream, HDA_STREAM_REG(pThis, STS,   idxStream));
     pHlp->pfnPrintf(pHlp, "  SD%dFIFOS: %R[sdfifos]\n", idxStream, HDA_STREAM_REG(pThis, FIFOS, idxStream));
     pHlp->pfnPrintf(pHlp, "  SD%dFIFOW: %R[sdfifow]\n", idxStream, HDA_STREAM_REG(pThis, FIFOW, idxStream));
-
-    PHDASTREAM const pStream = &pThis->aStreams[idxStream];
     pHlp->pfnPrintf(pHlp, "  Current BDLE%02u: %s%#RX64 LB %#x%s - off=%#x\n", pStream->State.idxCurBdle, "%%" /*vboxdbg phys prefix*/,
                     pStream->State.aBdl[pStream->State.idxCurBdle].GCPhys, pStream->State.aBdl[pStream->State.idxCurBdle].cb,

trunk/src/VBox/Devices/Audio/DevHdaStream.h

@@ -115 +115 @@
      *  Can be 0 if no next transfer is scheduled. */
     uint64_t                tsTransferNext;
-    /** Total transfer size (in bytes) of a transfer period.
-     * @note This is in host side frames, in case we're doing any mapping. */
+    /** Total transfer size (in bytes) of a transfer period. */
     uint32_t                cbTransferSize;
     /** The size of an average transfer. */
     uint32_t                cbAvgTransfer;
-    /** The stream's current host side configuration.
-     * This should match the SDnFMT in all respects but maybe the channel count as
-     * we may need to expand mono or into/from into stereo.  The unmodified SDnFMT
-     * properties can be found in HDASTREAMR3::Mapping::PCMProps. */
+    /** The stream's current configuration (matches SDnFMT). */
     PDMAUDIOSTREAMCFG       Cfg;
     /** Timestamp (real time, in ns) of last DMA transfer. */
@@ -200 +196 @@
  *       multiple audio streams in one single SDI/SDO (interleaving streams).
  *
- * How a specific SDI/SDO is mapped to our internal audio streams relies on the
- * stream channel mappings.
- *
  * Contains only register values which do *not* change until a stream reset
  * occurs.