Changeset 68132 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 27, 2017 8:15:43 AM (8 years ago)

Author:

vboxsync

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

117212

Message:

Audio: Renamed audio samples to audio frame because that's what they really are. No actual code changes.

Location:

trunk/src/VBox/Main/src-client

Files:

• DrvAudioVRDE.cpp (modified) (5 diffs)
• DrvAudioVideoRec.cpp (modified) (3 diffs)

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

@@ -86 +86 @@
 
 /* Sanity. */
-AssertCompileSize(PDMAUDIOSAMPLE, sizeof(int64_t) * 2 /* st_sample_t using by VRDP server */);
+AssertCompileSize(PDMAUDIOFRAME, sizeof(int64_t) * 2 /* st_sample_t using by VRDP server */);
 
 static int vrdeCreateStreamIn(PVRDESTREAM pStreamVRDE, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
@@ -105 +105 @@
              */
             pCfgAcq->enmLayout         = PDMAUDIOSTREAMLAYOUT_RAW;
-            pCfgAcq->cSampleBufferHint = pStreamVRDE->In.csMax;
+            pCfgAcq->cFrameBufferHint = pStreamVRDE->In.csMax;
         }
     }
@@ -127 +127 @@
          */
         pCfgAcq->enmLayout         = PDMAUDIOSTREAMLAYOUT_RAW;
-        pCfgAcq->cSampleBufferHint = _4K; /** @todo Make this configurable. */
+        pCfgAcq->cFrameBufferHint = _4K; /** @todo Make this configurable. */
     }
 
@@ -292 +292 @@
     int rc = VINF_SUCCESS;
 
-    PPDMAUDIOSAMPLE paSampleBuf = (PPDMAUDIOSAMPLE)pvBuf;
+    PPDMAUDIOFRAME paSampleBuf = (PPDMAUDIOFRAME)pvBuf;
     AssertPtr(paSampleBuf);
 
@@ -501 +501 @@
         /* Return samples instead of bytes here
          * (since we specified PDMAUDIOSTREAMLAYOUT_RAW as the audio data layout). */
-        return (uint32_t)PDMAUDIOSTREAMCFG_B2S(pStreamVRDE->pCfg, RTCircBufUsed(pStreamVRDE->In.pCircBuf));
+        return (uint32_t)PDMAUDIOSTREAMCFG_B2F(pStreamVRDE->pCfg, RTCircBufUsed(pStreamVRDE->In.pCircBuf));
     }
 

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

@@ -375 +375 @@
 
         if (pCfgAcq)
-            pCfgAcq->cSampleBufferHint = 0;
+            pCfgAcq->cFrameBufferHint = 0;
 
         LogRel2(("VideoRec: Support for surround audio not implemented yet\n"));
@@ -409 +409 @@
             pCfgAcq->Props.uHz         = pSink->Codec.Parms.uHz;
             pCfgAcq->Props.cShift      = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfgAcq->Props.cBits, pCfgAcq->Props.cChannels);
-            pCfgAcq->cSampleBufferHint = _4K; /** @todo Make this configurable. */
+            pCfgAcq->cFrameBufferHint = _4K; /** @todo Make this configurable. */
         }
     }
@@ -586 +586 @@
 
     const uint32_t csFrame = pSink->Codec.Opus.csFrame;
-    const uint32_t cbFrame = PDMAUDIOSTREAMCFG_S2B(pStreamAV->pCfg, csFrame);
+    const uint32_t cbFrame = PDMAUDIOSTREAMCFG_F2B(pStreamAV->pCfg, csFrame);
 
     while (RTCircBufUsed(pCircBuf) >= cbFrame)