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

Timestamp:

Mar 7, 2021 7:44:29 PM (4 years ago)

Author:

vboxsync

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

143118

Message:

Audio: Switched DrvAudioHlpFramesToBytes parameters. bugref:9890

Location:

trunk/src/VBox/Main/src-client

Files:

• DrvAudioRec.cpp (modified) (3 diffs)
• DrvAudioVRDE.cpp (modified) (1 diff)

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

@@ -89 +89 @@
 #include "ConsoleImpl.h"
 
-#include "../../Devices/Audio/DrvAudio.h"
+#include "../../Devices/Audio/DrvAudio.h" /* Ugly! */
 #include "WebMWriter.h"
 
@@ -108 +108 @@
 *   Defines                                                                                                                      *
 *********************************************************************************************************************************/
-
-#define AVREC_OPUS_HZ_MAX               48000           /** Maximum sample rate (in Hz) Opus can handle. */
-#define AVREC_OPUS_FRAME_MS_DEFAULT     20              /** Default Opus frame size (in ms). */
+#define AVREC_OPUS_HZ_MAX               48000   /**< Maximum sample rate (in Hz) Opus can handle. */
+#define AVREC_OPUS_FRAME_MS_DEFAULT     20      /**< Default Opus frame size (in ms). */
 
 
@@ -438 +437 @@
             pCodec->Opus.msFrame = AVREC_OPUS_FRAME_MS_DEFAULT; /* 20ms by default; to prevent division by zero. */
         pCodec->Opus.csFrame = pSink->Codec.Parms.PCMProps.uHz / (1000 /* s in ms */ / pSink->Codec.Opus.msFrame);
-        pCodec->Opus.cbFrame = DrvAudioHlpFramesToBytes(pCodec->Opus.csFrame, &pSink->Codec.Parms.PCMProps);
+        pCodec->Opus.cbFrame = DrvAudioHlpFramesToBytes(&pSink->Codec.Parms.PCMProps, pCodec->Opus.csFrame);
 
 #ifdef VBOX_WITH_STATISTICS

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

@@ -95 +95 @@
     const uint32_t cFramesVrdpServer = DrvAudioHlpMilliToFrames(200  /* ms */, &pCfgAcq->Props);
 
-    int rc = RTCircBufCreate(&pStreamVRDE->In.pCircBuf, DrvAudioHlpFramesToBytes(cFramesVrdpServer, &pCfgAcq->Props));
+    int rc = RTCircBufCreate(&pStreamVRDE->In.pCircBuf, DrvAudioHlpFramesToBytes(&pCfgAcq->Props, cFramesVrdpServer));
     if (RT_SUCCESS(rc))
     {