Changeset 96285 in vbox for trunk/src/VBox/Main/include

Timestamp:

Aug 18, 2022 8:01:23 AM (2 years ago)

Author:

vboxsync

Message:

Recording: Removed support for Opus. bugref:10275

Location:

trunk/src/VBox/Main/include

Files:

• RecordingInternals.h (modified) (6 diffs)
• WebMWriter.h (modified) (1 diff)

trunk/src/VBox/Main/include/RecordingInternals.h

@@ -39 +39 @@
 #endif /* VBOX_WITH_LIBVPX */
 
-#ifdef VBOX_WITH_LIBOPUS
-# include <opus.h>
-#endif
-
 #ifdef VBOX_WITH_LIBVORBIS
 # include "vorbis/vorbisenc.h"
@@ -51 +47 @@
 *   Defines                                                                                                                      *
 *********************************************************************************************************************************/
-#define VBOX_RECORDING_OPUS_HZ_MAX               48000   /**< Maximum sample rate (in Hz) Opus can handle. */
-#define VBOX_RECORDING_OPUS_FRAME_MS_DEFAULT     20      /**< Default Opus frame size (in ms). */
-
 #define VBOX_RECORDING_VORBIS_HZ_MAX             48000   /**< Maximum sample rate (in Hz) Vorbis can handle. */
 #define VBOX_RECORDING_VORBIS_FRAME_MS_DEFAULT   20      /**< Default Vorbis frame size (in ms). */
@@ -206 +199 @@
     /** Time (in ms) the encoder expects us to send data to encode.
      *
-     *  For Opus, valid frame sizes are:
-     *  ms           Frame size
-     *  2.5          120
-     *  5            240
-     *  10           480
-     *  20 (Default) 960
-     *  40           1920
-     *  60           2880
-     *
      *  For Vorbis, valid frame sizes are powers of two from 64 to 8192 bytes.
      */
@@ -247 +231 @@
 #endif /* VBOX_WITH_LIBVPX */
 
-#ifdef VBOX_WITH_LIBOPUS
-/**
- * Opus encoder state (needs libvorbis).
- */
-typedef struct RECORDINGCODECOPUS
-{
-    /** Encoder we're going to use. */
-    OpusEncoder    *pEnc;
-} RECORDINGCODECOPUS;
-/** Pointer to an Opus encoder state. */
-typedef RECORDINGCODECOPUS *PRECORDINGCODECOPUS;
-#endif /* VBOX_WITH_LIBOPUS */
-
 #ifdef VBOX_WITH_LIBVORBIS
 /**
@@ -314 +285 @@
     union
     {
-# ifdef VBOX_WITH_LIBOPUS
-        RECORDINGCODECOPUS      Opus;
-# endif /* VBOX_WITH_LIBOPUS */
 # ifdef VBOX_WITH_LIBVORBIS
         RECORDINGCODECVORBIS    Vorbis;
@@ -488 +456 @@
 uint32_t recordingCodecGetWritable(PRECORDINGCODEC pCodec, uint64_t msTimestamp);
 #endif /* !MAIN_INCLUDED_RecordingInternals_h */
-

trunk/src/VBox/Main/include/WebMWriter.h

@@ -65 +65 @@
  *  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 */
 
 #ifdef VBOX_WITH_LIBVORBIS