Changeset 96285 in vbox for trunk/src/VBox/Main/include/RecordingInternals.h

Timestamp:

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

Author:

vboxsync

Message:

Recording: Removed support for Opus. bugref:10275

File:

• trunk/src/VBox/Main/include/RecordingInternals.h (modified) (6 diffs)

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 */
-