Changeset 65362 in vbox for trunk/src/VBox

Timestamp:

Jan 18, 2017 1:52:32 PM (8 years ago)

Author:

vboxsync

Message:

OSE build fixes.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (2 diffs)
• src-client/EbmlWriter.cpp (modified) (8 diffs)
• src-client/EbmlWriter.h (modified) (4 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -709 +709 @@
    VBoxC_SDKS += VBOX_VPX
    VBoxC_DEFS += VBOX_WITH_LIBVPX
+   VBoxC_SOURCES += \
+        src-client/VideoRec.cpp
   else
    $(error "VBox: No alternative for VPX when using video capturing support yet")
@@ -823 +825 @@
         src-client/USBDeviceImpl.cpp \
         src-client/VBoxDriversRegister.cpp \
-        src-client/VideoRec.cpp \
         src-client/VirtualBoxClientImpl.cpp \
         src-client/VMMDevInterface.cpp \

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

@@ -532 +532 @@
     int AddVideoTrack(uint16_t uWidth, uint16_t uHeight, double dbFPS, uint8_t *puTrack)
     {
+#ifdef VBOX_WITH_LIBVPX
         m_Ebml.subStart(MkvElem_TrackEntry);
         m_Ebml.serializeUnsignedInteger(MkvElem_TrackNumber, (uint8_t)CurSeg.mapTracks.size());
@@ -556 +557 @@
 
         return VINF_SUCCESS;
+#else
+        RT_NOREF(uWidth, uHeight, dbFPS, puTrack);
+        return VERR_NOT_SUPPORTED;
+#endif
     }
 
@@ -619 +624 @@
     }
 
+#ifdef VBOX_WITH_LIBVPX
     int writeBlockVP8(WebMTrack *a_pTrack, const vpx_codec_enc_cfg_t *a_pCfg, const vpx_codec_cx_pkt_t *a_pPkt)
     {
@@ -691 +697 @@
         return writeSimpleBlockInternal(a_pTrack, tsBlockMs, a_pPkt->data.frame.buf, a_pPkt->data.frame.sz, fFlags);
     }
+#endif /* VBOX_WITH_LIBVPX */
 
 #ifdef VBOX_WITH_LIBOPUS
@@ -758 +765 @@
         return writeSimpleBlockInternal(a_pTrack, tsBlockMs, pvData, cbData, 0 /* Flags */);
     }
-#endif
+#endif /* VBOX_WITH_LIBOPUS */
 
     int WriteBlock(uint8_t uTrack, const void *pvData, size_t cbData)
     {
-        RT_NOREF(cbData); /* Only needed for assertions for now. */
+        RT_NOREF(pvData, cbData); /* Only needed for assertions for now. */
 
         WebMTracks::iterator itTrack = CurSeg.mapTracks.find(uTrack);
@@ -799 +806 @@
             case WebMTrackType_Video:
             {
+#ifdef VBOX_WITH_LIBVPX
                 if (m_enmVideoCodec == WebMWriter::VideoCodec_VP8)
                 {
@@ -806 +814 @@
                 }
                 else
+#endif /* VBOX_WITH_LIBVPX */
                     rc = VERR_NOT_SUPPORTED;
                 break;
@@ -927 +936 @@
 
         char szMux[64];
-        RTStrPrintf(szMux, sizeof(szMux), "vpxenc%s", vpx_codec_version_str());
-
+        RTStrPrintf(szMux, sizeof(szMux),
+#ifdef VBOX_WITH_LIBVPX
+                     "vpxenc%s", vpx_codec_version_str());
+#else
+                     "unknown");
+#endif
         char szApp[64];
         RTStrPrintf(szApp, sizeof(szApp), VBOX_PRODUCT " %sr%u", VBOX_VERSION_STRING, RTBldCfgRevision());

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

@@ -19 +19 @@
 #define ____EBMLWRITER
 
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable: 4668) /* vpx_codec.h(64) : warning C4668: '__GNUC__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
-#include <vpx/vpx_encoder.h>
-# pragma warning(pop)
-#else
-# include <vpx/vpx_encoder.h>
-#endif
+#ifdef VBOX_WITH_LIBVPX
+# ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable: 4668) /* vpx_codec.h(64) : warning C4668: '__GNUC__' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
+#  include <vpx/vpx_encoder.h>
+#  pragma warning(pop)
+# else
+#  include <vpx/vpx_encoder.h>
+# endif
+#endif /* VBOX_WITH_LIBVPX */
 
 #include <iprt/file.h>
@@ -59 +61 @@
     };
 
+#ifdef VBOX_WITH_LIBVPX
     /**
      * Block data for VP8-encoded video data.
@@ -67 +70 @@
         const vpx_codec_cx_pkt_t  *pPkt;
     };
+#endif /* VBOX_WITH_LIBVPX */
 
+#ifdef VBOX_WITH_LIBOPUS
     /**
      * Block data for Opus-encoded audio data.
@@ -78 +83 @@
         size_t      cbData;
     };
+#endif /* VBOX_WITH_LIBOPUS */
 
 public: