Changeset 74850 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Oct 15, 2018 4:45:58 PM (6 years ago)

Author:

vboxsync

Message:

VideoRec/Main: Use PDMAUDIOPCMPROPS for the codec's used PCM properties.

File:

• trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp (modified) (8 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2016-2017 Oracle Corporation
+ * Copyright (C) 2016-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -171 +171 @@
 typedef struct AVRECCODECPARMS
 {
-    /** The encoding rate to use. */
-    uint32_t                uHz;
-    /** Number of audio channels to encode.
-     *  Currently we only supported stereo (2) channels. */
-    uint8_t                 cChannels;
-    /** Bits per sample. */
-    uint8_t                 cBits;
+    /** The codec's used PCM properties. */
+    PDMAUDIOPCMPROPS        PCMProps;
     /** The codec's bitrate. 0 if not used / cannot be specified. */
     uint32_t                uBitrate;
@@ -286 +281 @@
 static int avRecSinkInit(PDRVAUDIOVIDEOREC pThis, PAVRECSINK pSink, PAVRECCONTAINERPARMS pConParms, PAVRECCODECPARMS pCodecParms)
 {
-    uint32_t uHz       = pCodecParms->uHz;
-    uint8_t  cBits     = pCodecParms->cBits;
-    uint8_t  cChannels = pCodecParms->cChannels;
+    uint32_t uHz       = pCodecParms->PCMProps.uHz;
+    uint8_t  cBytes    = pCodecParms->PCMProps.cBytes;
+    uint8_t  cChannels = pCodecParms->PCMProps.cChannels;
     uint32_t uBitrate  = pCodecParms->uBitrate;
 
@@ -418 +413 @@
         pSink->Con.Parms.enmType     = pConParms->enmType;
 
-        pSink->Codec.Parms.uHz       = uHz;
-        pSink->Codec.Parms.cChannels = cChannels;
-        pSink->Codec.Parms.cBits     = cBits;
-        pSink->Codec.Parms.uBitrate  = uBitrate;
+        pSink->Codec.Parms.PCMProps.uHz       = uHz;
+        pSink->Codec.Parms.PCMProps.cChannels = cChannels;
+        pSink->Codec.Parms.PCMProps.cBytes    = cBytes;
+        pSink->Codec.Parms.PCMProps.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pSink->Codec.Parms.PCMProps.cBytes,
+                                                                                  pSink->Codec.Parms.PCMProps.cChannels);
+        pSink->Codec.Parms.uBitrate           = uBitrate;
 
         pSink->Codec.Opus.pEnc       = pEnc;
@@ -522 +519 @@
     const unsigned cFrames = 2; /** @todo Use the PreRoll param for that? */
 
-    const uint32_t csFrame = pSink->Codec.Parms.uHz / (1000 /* s in ms */ / pSink->Codec.Opus.msFrame);
-    const uint32_t cbFrame = csFrame * pSink->Codec.Parms.cChannels * (pSink->Codec.Parms.cBits / 8 /* Bytes */);
+    const uint32_t csFrame = pSink->Codec.Parms.PCMProps.uHz / (1000 /* s in ms */ / pSink->Codec.Opus.msFrame);
+    const uint32_t cbFrame = DrvAudioHlpFramesToBytes(csFrame, &pSink->Codec.Parms.PCMProps);
 
     rc = RTCircBufCreate(&pStreamAV->pCircBuf, cbFrame * cFrames);
@@ -535 +532 @@
             /* Make sure to let the driver backend know that we need the audio data in
              * a specific sampling rate Opus is optimized for. */
-            pCfgAcq->Props.uHz         = pSink->Codec.Parms.uHz;
+            pCfgAcq->Props.uHz         = pSink->Codec.Parms.PCMProps.uHz;
             pCfgAcq->Props.cShift      = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(pCfgAcq->Props.cBytes, pCfgAcq->Props.cChannels);
 
@@ -622 +619 @@
 
     AVRECCODECPARMS CodecParms;
-    CodecParms.uHz       = AVREC_OPUS_HZ_MAX;  /** @todo Make this configurable. */
-    CodecParms.cChannels = 2;                  /** @todo Make this configurable. */
-    CodecParms.cBits     = 16;                 /** @todo Make this configurable. */
-    CodecParms.uBitrate  = 0;                  /* Let Opus decide, based on the number of channels and the input sampling rate. */
+    CodecParms.PCMProps.uHz       = AVREC_OPUS_HZ_MAX;  /** @todo Make this configurable. */
+    CodecParms.PCMProps.cChannels = 2;                  /** @todo Make this configurable. */
+    CodecParms.PCMProps.cBytes    = 2;                  /** 16 bit @todo Make this configurable. */
+
+    CodecParms.uBitrate = 0; /* Let Opus decide, based on the number of channels and the input sampling rate. */
 
     int rc = avRecSinkInit(pThis, &pThis->Sink, &ContainerParms, &CodecParms);
@@ -720 +718 @@
     size_t  cbSrc;
 
-    const uint32_t csFrame = pSink->Codec.Parms.uHz / (1000 /* s in ms */ / pSink->Codec.Opus.msFrame);
-    const uint32_t cbFrame = csFrame * pSink->Codec.Parms.cChannels * (pSink->Codec.Parms.cBits / 8 /* Bytes */);
+    const uint32_t csFrame = pSink->Codec.Parms.PCMProps.uHz / (1000 /* s in ms */ / pSink->Codec.Opus.msFrame);
+    const uint32_t cbFrame = DrvAudioHlpFramesToBytes(csFrame, &pSink->Codec.Parms.PCMProps);
 
     /* Only encode data if we have data for the given time period (or more). */