Changeset 68733 in vbox

Timestamp:

Sep 13, 2017 8:46:40 AM (7 years ago)

Author:

vboxsync

Message:

VideoRec/EbmlWriter.cpp: Renamed OpusPrivData -> WEBMOPUSPRIVDATA and moved it out of the WebM implementation scope.

File:

• trunk/src/VBox/Main/src-client/EbmlWriter.cpp (modified) (3 diffs)

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

@@ -321 +321 @@
  *  With signed 16-bit timecodes and a default timecode scale of 1ms per unit this makes 65536ms. */
 #define VBOX_WEBM_BLOCK_MAX_LEN_MS          UINT16_MAX
+
+#ifdef VBOX_WITH_LIBOPUS
+# pragma pack(push)
+# pragma pack(1)
+    /** Opus codec private data within the MKV (WEBM) container.
+     *  Taken from: https://wiki.xiph.org/MatroskaOpus */
+    typedef struct WEBMOPUSPRIVDATA
+    {
+        WEBMOPUSPRIVDATA(uint32_t a_u32SampleRate, uint8_t a_u8Channels)
+        {
+            au64Head        = RT_MAKE_U64_FROM_U8('O', 'p', 'u', 's', 'H', 'e', 'a', 'd');
+            u8Version       = 1;
+            u8Channels      = a_u8Channels;
+            u16PreSkip      = 0;
+            u32SampleRate   = a_u32SampleRate;
+            u16Gain         = 0;
+            u8MappingFamily = 0;
+        }
+
+        uint64_t au64Head;          /**< Defaults to "OpusHead". */
+        uint8_t  u8Version;         /**< Must be set to 1. */
+        uint8_t  u8Channels;
+        uint16_t u16PreSkip;
+        /** Sample rate *before* encoding to Opus.
+         *  Note: This rate has nothing to do with the playback rate later! */
+        uint32_t u32SampleRate;
+        uint16_t u16Gain;
+        /** Must stay 0 -- otherwise a mapping table must be appended
+         *  right after this header. */
+        uint8_t  u8MappingFamily;
+    } WEBMOPUSPRIVDATA, *PWEBMOPUSPRIVDATA;
+    AssertCompileSize(WEBMOPUSPRIVDATA, 19);
+# pragma pack(pop)
+#endif /* VBOX_WITH_LIBOPUS */
 
 class WebMWriter_Impl
@@ -490 +524 @@
     } CurSeg;
 
-#ifdef VBOX_WITH_LIBOPUS
-# pragma pack(push)
-# pragma pack(1)
-    /** Opus codec private data.
-     *  Taken from: https://wiki.xiph.org/MatroskaOpus */
-    struct OpusPrivData
-    {
-        OpusPrivData(uint32_t a_u32SampleRate, uint8_t a_u8Channels)
-        {
-            au64Head        = RT_MAKE_U64_FROM_U8('O', 'p', 'u', 's', 'H', 'e', 'a', 'd');
-            u8Version       = 1;
-            u8Channels      = a_u8Channels;
-            u16PreSkip      = 0;
-            u32SampleRate   = a_u32SampleRate;
-            u16Gain         = 0;
-            u8MappingFamily = 0;
-        }
-
-        uint64_t au64Head;          /**< Defaults to "OpusHead". */
-        uint8_t  u8Version;         /**< Must be set to 1. */
-        uint8_t  u8Channels;
-        uint16_t u16PreSkip;
-        /** Sample rate *before* encoding to Opus.
-         *  Note: This rate has nothing to do with the playback rate later! */
-        uint32_t u32SampleRate;
-        uint16_t u16Gain;
-        /** Must stay 0 -- otherwise a mapping table must be appended
-         *  right after this header. */
-        uint8_t  u8MappingFamily;
-    };
-    AssertCompileSize(OpusPrivData, 19);
-# pragma pack(pop)
-#endif /* VBOX_WITH_LIBOPUS */
-
     /** Audio codec to use. */
     WebMWriter::AudioCodec      m_enmAudioCodec;
@@ -611 +611 @@
         pTrack->Audio.framesPerBlock = uHz / (1000 /* s in ms */ / pTrack->Audio.msPerBlock);
 
-        OpusPrivData opusPrivData(uHz, cChannels);
+        WEBMOPUSPRIVDATA opusPrivData(uHz, cChannels);
 
         LogFunc(("Opus @ %RU16Hz (%RU16ms + %RU16 frames per block)\n",