Changeset 45731 in vbox

Timestamp:

Apr 25, 2013 2:33:35 PM (12 years ago)

Author:

vboxsync

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

85288

Message:

several fixes for video recording

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/src-client/DisplayImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)
• src/VBox/Main/xml/Settings.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -2750 +2750 @@
 endif
 
-#VPXLIB
 SDK_VBOX_VPX       = .
 if1of ($(KBUILD_TARGET), darwin linux os2 solaris)
@@ -2757 +2756 @@
      $(PATH_ROOT)/src/libs/libvpx/vp8 \
      $(PATH_ROOT)/src/libs/libvpx/vpx_mem
-SDK_VBOX_VPX_LIBS ?=  $(PATH_STAGE_BIN)/VBox-libvpx.so
- else
- SDK_VBOX_VPX_LIBS  ?= $(PATH_STAGE_BIN)/VBox-libvpx$(SUFF_DLL)
-endif
-
-SDK_VBOX_BOOST        = .
-SDK_VBOX_BOOST_DEFS  ?= BOOST_DISABLE_ASSERTS
-SDK_VBOX_BOOST_INCS  ?= $(PATH_ROOT)/src/libs/boost-1.37.0
+ SDK_VBOX_VPX_LIBS ?= $(PATH_STAGE_BIN)/VBox-libvpx.so
+else
+ SDK_VBOX_VPX_LIBS ?= $(PATH_STAGE_BIN)/VBox-libvpx$(SUFF_DLL)
+endif
+
+SDK_VBOX_BOOST       = .
+SDK_VBOX_BOOST_DEFS ?= BOOST_DISABLE_ASSERTS
+SDK_VBOX_BOOST_INCS ?= $(PATH_ROOT)/src/libs/boost-1.37.0
 
 #

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -367 +367 @@
                      "                            [--autostop-type disabled|savestate|poweroff|\n"
                      "                                             acpishutdown]\n"
+#endif
+#ifdef VBOX_WITH_VPX
+                     "                            [--vcpenabled on|off]\n"
+                     "                            [--vcpfile <filename>]\n"
+                     "                            [--vcpwidth <width>]\n"
+                     "                            [--vcpheight <height>]\n"
 #endif
                      "                            [--defaultfrontend default|<name]\n"

trunk/src/VBox/Main/Makefile.kmk

@@ -566 +566 @@
 VBoxC_DEFS.win.amd64 += _WIN32_WINNT=0x0510
 
+VBoxC_SDKS = VBOX_LIBPNG VBOX_ZLIB
 ifdef VBOX_WITH_VPX
-  VBoxC_SDKS =  VBOX_LIBPNG VBOX_ZLIB VBOX_VPX
-else
-  VBoxC_SDKS =  VBOX_LIBPNG VBOX_ZLIB
+  VBoxC_SDKS += VBOX_VPX
 endif
 

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

@@ -496 +496 @@
         BSTR strVideoCaptureFile;
         mParent->machine()->COMGETTER(VideoCaptureFile)(&strVideoCaptureFile);
-        LogFlow(("VidoeRecording VPX enabled\n"));
         if (VideoRecContextInit(mpVideoRecContext, strVideoCaptureFile,
                                 ulVideoCaptureHorzRes, ulVideoCaptureVertRes))
         {
-            LogFlow(("Failed to initialize video recording context\n"));
+            LogFlow(("Failed to initialize video recording context!\n"));
             return E_FAIL;
         }
+        LogFlow(("Vidoe recording VPX enabled!\n"));
     }
 #endif

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -8775 +8775 @@
         mHWData->mVideoCaptureWidth = data.ulVideoCaptureHorzRes;
         mHWData->mVideoCaptureHeight = data.ulVideoCaptureVertRes;
-        mHWData->mVideoCaptureEnabled = false; /* @todo r=klaus restore to data.fVideoCaptureEnabled */
+        mHWData->mVideoCaptureEnabled = data.fVideoCaptureEnabled;
         mHWData->mVideoCaptureFile = data.strVideoCaptureFile;
         mHWData->mFirmwareType = data.firmwareType;

trunk/src/VBox/Main/xml/Settings.cpp

@@ -5082 +5082 @@
     {
         // VirtualBox 4.1 adds PCI passthrough.
-        if (hardwareMachine.pciAttachments.size())
+        if (   hardwareMachine.pciAttachments.size()
+            || hardwareMachine.fVideoCaptureEnabled)
             m->sv = SettingsVersion_v1_12;
     }