Changeset 89415 in vbox

Timestamp:

May 31, 2021 8:31:47 PM (4 years ago)

Author:

vboxsync

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

144768

Message:

Audio: Removed PDMAUDIOFRAME. bugref:9890

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (2 diffs)
• src/VBox/Main/src-client/DrvAudioVRDE.cpp (modified) (4 diffs)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -419 +419 @@
 
 /**
- * A single audio frame.
- *
- * Currently only two (2) channels, left and right, are supported.
- *
- * @note When changing this structure, make sure to also handle
- *       VRDP's input / output processing in DrvAudioVRDE, as VRDP
- *       expects audio data in st_sample_t format (historical reasons)
- *       which happens to be the same as PDMAUDIOFRAME for now.
- *
- * @todo r=bird: This is an internal AudioMixBuffer structure which should not
- *       be exposed here, I think.  Only used to some sizeof statements in VRDE.
- *       (The problem with exposing it, is that we would like to move away from
- *       stereo and instead to anything from 1 to 16 channels.  That means
- *       removing this structure entirely.)
- */
-typedef struct PDMAUDIOFRAME
-{
-    /** Left channel. */
-    int64_t         i64LSample;
-    /** Right channel. */
-    int64_t         i64RSample;
-} PDMAUDIOFRAME;
-/** Pointer to a single (stereo) audio frame. */
-typedef PDMAUDIOFRAME *PPDMAUDIOFRAME;
-/** Pointer to a const single (stereo) audio frame. */
-typedef PDMAUDIOFRAME const *PCPDMAUDIOFRAME;
-
-
-/**
  * Audio path: input sources and playback destinations.
  *
@@ -912 +883 @@
      *  See PDMAUDIOSTREAM_WARN_FLAGS_XXX. */
     uint32_t                fWarningsShown;
-    /** The stream properties (both sides when PDMAUDIOSTREAM_CREATE_F_NO_MIXBUF
-     * is used, otherwise the guest side). */
+    /** The stream properties. */
     PDMAUDIOPCMPROPS        Props;
 

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

@@ -84 +84 @@
 /** Pointer to the instance data for an VRDE audio driver. */
 typedef DRVAUDIOVRDE *PDRVAUDIOVRDE;
-
-/* Sanity. */
-AssertCompileSize(PDMAUDIOFRAME, sizeof(int64_t) * 2 /* st_sample_t using by VRDP server */);
-
 
 
@@ -588 +584 @@
     /** @todo Find some sane value here. We probably need a VRDE API VRDE to specify this. */
     if (pDrv->cClients)
-        return _16K * sizeof(PDMAUDIOFRAME);
+        return _16K * sizeof(int64_t) * 2;
     return 0;
 }
@@ -631 +627 @@
     Assert(uVrdpFormat == VRDE_AUDIO_FMT_MAKE(PDMAudioPropsHz(pProps), 2, 64, true));
 
-    /* We specified PDMAUDIOSTREAMLAYOUT_RAW (== S64), so
-       convert the buffer pointe and size accordingly:  */
-    PCPDMAUDIOFRAME paSampleBuf    = (PCPDMAUDIOFRAME)pvBuf;
-    uint32_t const  cFramesToWrite = cbBuf / sizeof(paSampleBuf[0]);
-    Assert(cFramesToWrite * sizeof(paSampleBuf[0]) == cbBuf);
-
     /** @todo r=bird: there was some incoherent mumbling about "using the
      *        internal counter to track if we (still) can write to the VRDP
@@ -643 +633 @@
      *        sensible, so I've removed it. */
 
-    /*
-     * Call the VRDP server with the data.
-     */
-    uint32_t cFramesWritten = 0;
-    while (cFramesWritten < cFramesToWrite)
-    {
-        uint32_t const cFramesChunk = cFramesToWrite - cFramesWritten; /** @todo For now write all at once. */
-
-        /* Note: The VRDP server expects int64_t samples per channel, regardless
-                 of the actual  sample bits (e.g 8 or 16 bits). */
-        pDrv->pConsoleVRDPServer->SendAudioSamples(&paSampleBuf[cFramesWritten], cFramesChunk /* Frames */, uVrdpFormat);
-
-        cFramesWritten += cFramesChunk;
-    }
-
-    Log3Func(("cFramesWritten=%RU32\n", cFramesWritten));
-    *pcbWritten = cFramesWritten * sizeof(PDMAUDIOFRAME);
+    uint32_t cFrames = PDMAudioPropsBytesToFrames(&pStream->pStream->Props, cbBuf);
+    Assert(cFrames == cbBuf / (sizeof(uint64_t) * 2));
+    pDrv->pConsoleVRDPServer->SendAudioSamples(pvBuf, cFrames, uVrdpFormat);
+
+    Log3Func(("cFramesWritten=%RU32\n", cFrames));
+    *pcbWritten = PDMAudioPropsFramesToBytes(&pStream->pStream->Props, cFrames);
+    Assert(*pcbWritten == cbBuf);
     return VINF_SUCCESS;
 }