Changeset 41986 in vbox

Timestamp:

Jul 2, 2012 3:04:09 PM (13 years ago)

Author:

vboxsync

Message:

VideoCapture: Introduced a new Makefile variable for including VPX video capturing "VBOX_WITH_VPX" . Also should solve the Video capture issue on solaris.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -990 +990 @@
  VBOX_WITHOUT_IPXE=1
  VBOX_WITH_FFMPEG=
+ VBOX_WITH_VPX=
  # Disable for OSE, requires snv_159+.
  VBOX_WITH_NETFLT_CROSSBOW=

trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.h

@@ -21 +21 @@
 
 #include <VBox/com/VirtualBox.h>
-#include "EbmlWriter.h"
 #include <iprt/uuid.h>
 
@@ -31 +30 @@
 
 #ifdef VBOX_WITH_VPX
+#include "EbmlWriter.h"
 #include <stdarg.h>
 #include <string.h>

trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk

@@ -20 +20 @@
 
 DLLS += VBoxFFmpegFB
-VBoxFFmpegFB_TEMPLATE        = VBOXMAINCLIENTDLL
-#VBoxFFmpegFB_DEFS      += \
-                                 VBOX_WITH_VPX  
-VBoxFFmpegFB_SDKS            = VBOX_FFMPEG VBOX_LIBPNG VBOX_ZLIB VBOX_VPX
-VBoxFFmpegFB_SOURCES         +=  \
-                                                        FFmpegFB.cpp \
-                                                        EbmlWriter.cpp
+VBoxFFmpegFB_TEMPLATE     = VBOXMAINCLIENTDLL
+
+ifdef VBOX_WITH_VPX
+  VBoxFFmpegFB_DEFS      += \
+    VBOX_WITH_VPX  
+endif
+
+ifdef VBOX_WITH_VPX
+  VBoxFFmpegFB_SDKS       = VBOX_FFMPEG VBOX_LIBPNG VBOX_ZLIB VBOX_VPX
+else
+  VBoxFFmpegFB_SDKS       = VBOX_FFMPEG VBOX_LIBPNG VBOX_ZLIB 
+endif
+
+ifdef VBOX_WITH_VPX
+  VBoxFFmpegFB_SOURCES   +=  \
+    FFmpegFB.cpp \
+        EbmlWriter.cpp
+else
+  VBoxFFmpegFB_SOURCES   +=  \
+    FFmpegFB.cpp 
+endif
+
 VBoxFFmpegFB_CXXFLAGS.linux += -fPIC