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

Timestamp:

Mar 1, 2018 3:35:39 PM (7 years ago)

Author:

vboxsync

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

121065

Message:

VideoRec: Got rid of the static codec interface define and prepare for also getting/using other codec interface (like VP9, not used yet).

File:

• trunk/src/VBox/Main/src-client/VideoRec.cpp (modified) (6 diffs)

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

@@ -33 +33 @@
 #include <iprt/time.h>
 
+#include <VBox/err.h>
 #include <VBox/com/VirtualBox.h>
 
@@ -40 +41 @@
 #ifdef VBOX_WITH_LIBVPX
 # define VPX_CODEC_DISABLE_COMPAT 1
-# include <vpx/vp8cx.h>
-# include <vpx/vpx_image.h>
-
-/** Default VPX codec to use. */
-# define DEFAULTCODEC (vpx_codec_vp8_cx())
+# include "vpx/vp8cx.h"
+# include "vpx/vpx_image.h"
+# include "vpx/vpx_encoder.h"
 #endif /* VBOX_WITH_LIBVPX */
 
@@ -148 +147 @@
     uint8_t             abBuf[_64K]; /** @todo Fix! */
     size_t              cbBuf;
-    /** Time stamp (in ms). */
+    /** Absolute time stamp (in ms). */
     uint64_t            uTimeStampMs;
 } VIDEORECAUDIOFRAME, *PVIDEORECAUDIOFRAME;
@@ -1090 +1089 @@
     PVIDEORECVIDEOCODEC pVC = &pStream->Video.Codec;
 
-#ifdef VBOX_WITH_LIBVPX
-    vpx_codec_err_t rcv = vpx_codec_enc_config_default(DEFAULTCODEC, &pVC->VPX.Cfg, 0);
-    if (rcv != VPX_CODEC_OK)
-    {
-        LogRel(("VideoRec: Failed to get default configuration for VPX codec: %s\n", vpx_codec_err_to_string(rcv)));
-        return VERR_INVALID_PARAMETER;
-    }
-#endif
-
     pStream->Video.uDelayMs = 1000 / pCfg->Video.uFPS;
 
@@ -1183 +1173 @@
 
 #ifdef VBOX_WITH_LIBVPX
+# ifdef VBOX_WITH_LIBVPX_VP9
+    vpx_codec_iface_t *pCodecIface = vpx_codec_vp9_cx();
+# else /* Default is using VP8. */
+    vpx_codec_iface_t *pCodecIface = vpx_codec_vp8_cx();
+# endif
+
+    vpx_codec_err_t rcv = vpx_codec_enc_config_default(pCodecIface, &pVC->VPX.Cfg, 0 /* Reserved */);
+    if (rcv != VPX_CODEC_OK)
+    {
+        LogRel(("VideoRec: Failed to get default config for VPX encoder: %s\n", vpx_codec_err_to_string(rcv)));
+        return VERR_AVREC_CODEC_INIT_FAILED;
+    }
+
     /* Target bitrate in kilobits per second. */
     pVC->VPX.Cfg.rc_target_bitrate = pCfg->Video.uRate;
@@ -1196 +1199 @@
 
     /* Initialize codec. */
-    rcv = vpx_codec_enc_init(&pVC->VPX.Ctx, DEFAULTCODEC, &pVC->VPX.Cfg, 0);
+    rcv = vpx_codec_enc_init(&pVC->VPX.Ctx, pCodecIface, &pVC->VPX.Cfg, 0 /* Flags */);
     if (rcv != VPX_CODEC_OK)
     {
-        LogRel(("VideoRec: Failed to initialize VP8 encoder: %s\n", vpx_codec_err_to_string(rcv)));
-        return VERR_INVALID_PARAMETER;
+        LogRel(("VideoRec: Failed to initialize VPX encoder: %s\n", vpx_codec_err_to_string(rcv)));
+        return VERR_AVREC_CODEC_INIT_FAILED;
     }