Changeset 89379 in vbox for trunk

Timestamp:

May 30, 2021 2:33:49 PM (4 years ago)

Author:

vboxsync

Message:

Audio: Removed PDMAUDIOSTREAMCFG::enmLayout and PDMAUDIOSTREAMLAYOUT. bugref:9890

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (6 diffs)
• include/VBox/vmm/pdmaudioinline.h (modified) (2 diffs)
• src/VBox/Devices/Audio/AudioHlp.cpp (modified) (2 diffs)
• src/VBox/Devices/Audio/AudioMixer.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DevHda.cpp (modified) (4 diffs)
• src/VBox/Devices/Audio/DevHdaStream.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DevHdaStream.h (modified) (1 diff)
• src/VBox/Devices/Audio/DevHdaStreamMap.cpp (modified) (2 diffs)
• src/VBox/Devices/Audio/DevHdaStreamMap.h (modified) (2 diffs)
• src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (3 diffs)
• src/VBox/Devices/Audio/DevSB16.cpp (modified) (2 diffs)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (3 diffs)
• src/VBox/Main/src-client/DrvAudioVRDE.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -503 +503 @@
 
 /**
- * Audio stream (data) layout.
- */
-typedef enum PDMAUDIOSTREAMLAYOUT
-{
-    /** Invalid zero value as per usual (guards against using unintialized values). */
-    PDMAUDIOSTREAMLAYOUT_INVALID = 0,
-    /** Unknown access type; do not use (hdaR3StreamMapReset uses it). */
-    PDMAUDIOSTREAMLAYOUT_UNKNOWN,
-    /** Non-interleaved access, that is, consecutive access to the data.
-     * @todo r=bird: For plain stereo this is actually interleaves left/right.  What
-     *       I guess non-interleaved means, is that there are no additional
-     *       information interleaved next to the interleaved stereo.
-     *       https://stackoverflow.com/questions/17879933/whats-the-interleaved-audio */
-    PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED,
-    /** Interleaved access, where the data can be mixed together with data of other audio streams. */
-    PDMAUDIOSTREAMLAYOUT_INTERLEAVED,
-    /** Complex layout, which does not fit into the interleaved / non-interleaved layouts. */
-    PDMAUDIOSTREAMLAYOUT_COMPLEX,
-    /** Raw (pass through) data, with no data layout processing done.
-     *
-     *  This means that this stream will operate on PDMAUDIOFRAME data
-     *  directly. Don't use this if you don't have to.
-     *
-     * @deprecated Replaced by S64 (signed, 64-bit sample size).  */
-    PDMAUDIOSTREAMLAYOUT_RAW,
-    /** End of valid values. */
-    PDMAUDIOSTREAMLAYOUT_END,
-    /** Hack to blow the type up to 32-bit. */
-    PDMAUDIOSTREAMLAYOUT_32BIT_HACK = 0x7fffffff
-} PDMAUDIOSTREAMLAYOUT;
-
-/**
  * Stream channel data block.
  */
@@ -718 +686 @@
     /** The stream's PCM properties. */
     PDMAUDIOPCMPROPS        Props;
-    /** The stream's audio data layout.
-     *  This indicates how the audio data buffers to/from the backend is being layouted.
-     *
-     *  Currently, the following layouts are supported by the audio connector:
-     *
-     *  PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED:
-     *      One stream at once. The consecutive audio data is exactly in the format and frame width
-     *      like defined in the PCM properties. This is the default.
-     *
-     *  PDMAUDIOSTREAMLAYOUT_RAW:
-     *      Can be one or many streams at once, depending on the stream's mixing buffer setup.
-     *      The audio data will get handled as PDMAUDIOFRAME frames without any modification done.
-     *
-     * @todo r=bird: See PDMAUDIOSTREAMLAYOUT comments. */
-    PDMAUDIOSTREAMLAYOUT    enmLayout;
     /** Device emulation-specific data needed for the audio connector. */
     struct
@@ -760 +713 @@
         uint32_t            cFramesPreBuffering;
     } Backend;
-    uint32_t                u32Padding;
     /** Friendly name of the stream. */
     char                    szName[64];
@@ -1185 +1137 @@
 
 /** PDMIAUDIOCONNECTOR interface ID. */
-#define PDMIAUDIOCONNECTOR_IID                  "36fee65e-cbb3-4bb7-a028-e88e6acc1c46"
+#define PDMIAUDIOCONNECTOR_IID                  "ae82616d-0da7-489a-aa4c-3e74d112ca9c"
 
 
@@ -1479 +1431 @@
 
 /** PDMIHOSTAUDIO interface ID. */
-#define PDMIHOSTAUDIO_IID                           "da3c9d33-e532-415b-9156-db31521f59ef"
+#define PDMIHOSTAUDIO_IID                           "b942d1cd-ffbf-490b-a296-74f30884bbd6"
 
 
@@ -1564 +1516 @@
 
 /** PDMIHOSTAUDIOPORT interface ID. */
-#define PDMIHOSTAUDIOPORT_IID                    "9f91ec59-95ba-4925-92dc-e75be1c63352"
+#define PDMIHOSTAUDIOPORT_IID                    "d42144e9-867e-4d1c-86d4-acb92b47f013"
 
 /** @} */

trunk/include/VBox/vmm/pdmaudioinline.h

@@ -946 +946 @@
         return pCfg1->enmDir    == pCfg2->enmDir
             && pCfg1->enmPath   == pCfg2->enmPath
-            && pCfg1->enmLayout == pCfg2->enmLayout
             && pCfg1->Device.cMsSchedulingHint == pCfg2->Device.cMsSchedulingHint
             && pCfg1->Backend.cFramesPeriod == pCfg2->Backend.cFramesPeriod
@@ -980 +979 @@
 {
     AssertPtrReturn(pCfg, false);
-    AssertMsgReturn(pCfg->enmDir    >= PDMAUDIODIR_UNKNOWN          && pCfg->enmDir    < PDMAUDIODIR_END,
-                    ("%d\n", pCfg->enmDir), false);
-    AssertMsgReturn(pCfg->enmLayout >= PDMAUDIOSTREAMLAYOUT_UNKNOWN && pCfg->enmLayout < PDMAUDIOSTREAMLAYOUT_END,
-                    ("%d\n", pCfg->enmLayout), false);
+    AssertMsgReturn(pCfg->enmDir >= PDMAUDIODIR_UNKNOWN && pCfg->enmDir < PDMAUDIODIR_END, ("%d\n", pCfg->enmDir), false);
     return PDMAudioPropsAreValid(&pCfg->Props);
 }

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

@@ -153 +153 @@
 {
     /* Ugly! HDA attach code calls us with uninitialized (all zero) config. */
-    if (   pCfg->enmLayout != PDMAUDIOSTREAMLAYOUT_INVALID
-        || PDMAudioPropsHz(&pCfg->Props) != 0)
+    if (PDMAudioPropsHz(&pCfg->Props) != 0)
     {
         if (PDMAudioStrmCfgIsValid(pCfg))
@@ -160 +159 @@
             if (   pCfg->enmDir == PDMAUDIODIR_IN
                 || pCfg->enmDir == PDMAUDIODIR_OUT)
-            {
-                /* As stated elsewhere, the following is non-sense and must be eliminated. */
-                if (   pCfg->enmLayout == PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED
-                    || pCfg->enmLayout == PDMAUDIOSTREAMLAYOUT_INTERLEAVED
-                    || pCfg->enmLayout == PDMAUDIOSTREAMLAYOUT_RAW)
-                    return AudioHlpPcmPropsAreValid(&pCfg->Props);
-            }
+                return AudioHlpPcmPropsAreValid(&pCfg->Props);
         }
     }

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

@@ -2271 +2271 @@
                 CfgHost.enmDir    = pSink->enmDir;
                 CfgHost.enmPath   = pCfg->enmPath;
-                CfgHost.enmLayout = pCfg->enmLayout;
                 CfgHost.Device    = pCfg->Device;
                 RTStrCopy(CfgHost.szName, sizeof(CfgHost.szName), pCfg->szName);

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

@@ -1673 +1673 @@
             RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Front");
 
-            pCfg->enmPath           = PDMAUDIOPATH_OUT_FRONT;
-            pCfg->enmLayout         = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+            pCfg->enmPath = PDMAUDIOPATH_OUT_FRONT;
             /// @todo PDMAudioPropsSetChannels(&pCfg->Props, 2); ?
 
@@ -1686 +1685 @@
             RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Center/LFE");
 
-            pCfg->enmPath           = PDMAUDIOPATH_OUT_CENTER_LFE;
-            pCfg->enmLayout         = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+            pCfg->enmPath = PDMAUDIOPATH_OUT_CENTER_LFE;
             PDMAudioPropsSetChannels(&pCfg->Props, fUseCenter && fUseLFE ? 2 : 1);
 
@@ -1698 +1696 @@
             RTStrPrintf(pCfg->szName, RT_ELEMENTS(pCfg->szName), "Rear");
 
-            pCfg->enmPath           = PDMAUDIOPATH_OUT_REAR;
-            pCfg->enmLayout         = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+            pCfg->enmPath = PDMAUDIOPATH_OUT_REAR;
             PDMAudioPropsSetChannels(&pCfg->Props, 2);
 
@@ -4402 +4399 @@
                     Cfg.enmDir                        = PDMAUDIODIR_OUT;
                     Cfg.enmPath                       = PDMAUDIOPATH_OUT_FRONT;
-                    Cfg.enmLayout                     = PDMAUDIOSTREAMLAYOUT_INTERLEAVED;
                     Cfg.Device.cMsSchedulingHint      = 10;
                     Cfg.Backend.cFramesPreBuffering   = UINT32_MAX;

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

@@ -548 +548 @@
 #  error "Implement me!"
 # else
-            pCfg->enmPath   = PDMAUDIOPATH_IN_LINE;
-            pCfg->enmLayout = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
+            pCfg->enmPath = PDMAUDIOPATH_IN_LINE;
             RTStrCopy(pCfg->szName, sizeof(pCfg->szName), "Line In");
 # endif

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

@@ -158 +158 @@
     uint32_t                idxScheduleLoop;
 
+    uint64_t                u64Padding;
     /** Buffer descriptors and additional timer scheduling state.
      * (Same as HDABDLEDESC, with more sensible naming.)  */

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

@@ -349 +349 @@
 
             Assert(pMap->cbGuestFrame); /* Frame size must not be 0. */
-            pMap->enmLayout = PDMAUDIOSTREAMLAYOUT_INTERLEAVED;
             return VINF_SUCCESS;
         }
@@ -385 +384 @@
 {
     AssertPtrReturnVoid(pMap);
-
-    pMap->enmLayout = PDMAUDIOSTREAMLAYOUT_UNKNOWN;
 
     if (pMap->paMappings)

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

@@ -30 +30 @@
      * The host properties are found in HDASTREAMSTATE::Cfg::Props.  */
     PDMAUDIOPCMPROPS                GuestProps;
-    /** The stream's layout. */
-    PDMAUDIOSTREAMLAYOUT            enmLayout;
     /** The guest side frame size in bytes. */
     uint8_t                         cbGuestFrame;
@@ -38 +36 @@
     /** Number of mappings in paMappings. */
     uint8_t                         cMappings;
-    uint8_t                         aPadding[1];
+    uint8_t                         aPadding[1+4];
     /** Array of stream mappings.
      *  Note: The mappings *must* be layed out in an increasing order, e.g.

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

@@ -1751 +1751 @@
             Cfg.enmDir      = PDMAUDIODIR_IN;
             Cfg.enmPath     = PDMAUDIOPATH_IN_LINE;
-            Cfg.enmLayout   = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
             RTStrCopy(Cfg.szName, sizeof(Cfg.szName), "Line-In");
 
@@ -1764 +1763 @@
             Cfg.enmDir      = PDMAUDIODIR_IN;
             Cfg.enmPath     = PDMAUDIOPATH_IN_MIC;
-            Cfg.enmLayout   = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
             RTStrCopy(Cfg.szName, sizeof(Cfg.szName), "Mic-In");
 
@@ -1777 +1775 @@
             Cfg.enmDir      = PDMAUDIODIR_OUT;
             Cfg.enmPath     = PDMAUDIOPATH_OUT_FRONT;
-            Cfg.enmLayout   = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
             RTStrCopy(Cfg.szName, sizeof(Cfg.szName), "Output");
 

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

@@ -2185 +2185 @@
             pStream->Cfg.enmDir    = PDMAUDIODIR_OUT;
             pStream->Cfg.enmPath   = PDMAUDIOPATH_OUT_FRONT;
-            pStream->Cfg.enmLayout = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
 
             PDMAudioPropsInit(&pStream->Cfg.Props, 1 /* 8-bit */, false /* fSigned */, 1 /* Mono */, 11025 /* uHz */);
@@ -2224 +2223 @@
             pStream->Cfg.enmDir      = PDMAUDIODIR_OUT;
             pStream->Cfg.enmPath     = PDMAUDIOPATH_OUT_FRONT;
-            pStream->Cfg.enmLayout   = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
 
             RTStrCopy(pStream->Cfg.szName, sizeof(pStream->Cfg.szName), "Output");

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

@@ -1562 +1562 @@
  * @param   pStreamEx   Stream to initialize.
  * @param   pCfgHost    Stream configuration to use for the host side (backend).
+ *                      This will be adjusted.
  * @param   pCfgGuest   Stream configuration to use for the guest side.
  */
 static int drvAudioStreamInitInternal(PDRVAUDIO pThis, PDRVAUDIOSTREAM pStreamEx,
-                                      PPDMAUDIOSTREAMCFG pCfgHost, PPDMAUDIOSTREAMCFG pCfgGuest)
+                                      PPDMAUDIOSTREAMCFG pCfgHost, PCPDMAUDIOSTREAMCFG pCfgGuest)
 {
     /*
@@ -1571 +1572 @@
      */
     pStreamEx->Core.uMagic = PDMAUDIOSTREAM_MAGIC;
-
-    /* Set the host's default audio data layout. */
-/** @todo r=bird: Why, oh why? OTOH, the layout stuff is non-sense anyway. */
-    pCfgHost->enmLayout = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED;
 
 #ifdef LOG_ENABLED
@@ -1665 +1662 @@
     AssertRC(rc);
 
-    /* Set the guests's default audio data layout. */
-    pCfgGuest->enmLayout = PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED; /** @todo r=bird: WTF DO WE DO THIS?  It's input and probably should've been const... */
     rc = PDMAudioStrmCfgCopy(&pStreamEx->Guest.Cfg, pCfgGuest);
     AssertRC(rc);

trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

@@ -313 +313 @@
      * st_sample_t and PDMAUDIOFRAME).
      */
-    pCfgAcq->enmLayout = PDMAUDIOSTREAMLAYOUT_RAW;
     PDMAudioPropsInitEx(&pCfgAcq->Props, 8 /*64-bit*/, true /*fSigned*/, 2 /*stereo*/, 22050 /*Hz*/,
                         true /*fLittleEndian*/, true /*fRaw*/);
@@ -343 +342 @@
      * see st_sample_t and PDMAUDIOFRAME).
      */
-    pCfgAcq->enmLayout = PDMAUDIOSTREAMLAYOUT_RAW;
     PDMAudioPropsInitEx(&pCfgAcq->Props, 8 /*64-bit*/, true /*fSigned*/, 2 /*stereo*/, 22050 /*Hz*/,
                         true /*fLittleEndian*/, true /*fRaw*/);