Changeset 65263 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Jan 12, 2017 3:25:30 PM (8 years ago)

Author:

vboxsync

Message:

VideoRec: Made the feature less dependent from the codec(s) being used by renaming VBOX_WITH_VPX to VBOX_WITH_VIDEOREC. The feature itself then relies on codecs we do / don't provide on compile time, e.g. VBOX_WITH_LIBVPX.

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxHeadless.cpp (modified) (18 diffs)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2016 Oracle Corporation
+# Copyright (C) 2006-2017 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -45 +45 @@
 #
 VBoxHeadless_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
-VBoxHeadless_DEFS      += $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,)
+VBoxHeadless_DEFS      += $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC,)
 VBoxHeadless_SOURCES    = VBoxHeadless.cpp
 ifdef VBOX_WITH_GUEST_PROPS

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -44 +44 @@
 #include <VBox/VBoxVideo.h>
 
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
 # include <cstdlib>
 # include <cerrno>
@@ -464 +464 @@
              "                                       settings password\n"
              "   -start-paused, --start-paused     Start the VM in paused state\n"
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
              "   -c, -capture, --capture           Record the VM screen output to a file\n"
              "   -w, --width                       Frame width when recording\n"
@@ -475 +475 @@
 }
 
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
 /**
  * Parse the environment for variables which can influence the VIDEOREC settings.
@@ -524 +524 @@
         *ppszFileName = pszEnvTemp;
 }
-#endif /* VBOX_WITH_VPX defined */
+#endif /* VBOX_WITH_VIDEOREC defined */
 
 static RTEXITCODE readPasswordFile(const char *pszFilename, com::Utf8Str *pPasswd)
@@ -626 +626 @@
     unsigned fCSAM  = ~0U;
     unsigned fPaused = 0;
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
     bool fVideoRec = 0;
     unsigned long ulFrameWidth = 800;
@@ -633 +633 @@
     char szMpegFile[RTPATH_MAX];
     const char *pszFileNameParam = "VBox-%d.vob";
-#endif /* VBOX_WITH_VPX */
+#endif /* VBOX_WITH_VIDEOREC */
 #ifdef RT_OS_WINDOWS
     ATL::CComModule _Module; /* Required internally by ATL (constructor records instance in global variable). */
@@ -643 +643 @@
              "All rights reserved.\n\n");
 
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
     /* Parse the environment */
     parse_environ(&ulFrameWidth, &ulFrameHeight, &ulBitRate, &pszFileNameParam);
@@ -696 +696 @@
         { "--settingspw", OPT_SETTINGSPW, RTGETOPT_REQ_STRING },
         { "--settingspwfile", OPT_SETTINGSPW_FILE, RTGETOPT_REQ_STRING },
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
         { "-capture", 'c', 0 },
         { "--capture", 'c', 0 },
@@ -703 +703 @@
         { "--bitrate", 'r', RTGETOPT_REQ_UINT32 },
         { "--filename", 'f', RTGETOPT_REQ_STRING },
-#endif /* VBOX_WITH_VPX defined */
+#endif /* VBOX_WITH_VIDEOREC defined */
         { "-comment", OPT_COMMENT, RTGETOPT_REQ_STRING },
         { "--comment", OPT_COMMENT, RTGETOPT_REQ_STRING },
@@ -780 +780 @@
                 fPaused = true;
                 break;
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
             case 'c':
                 fVideoRec = true;
@@ -793 +793 @@
                 pszFileNameParam = ValueUnion.psz;
                 break;
-#endif /* VBOX_WITH_VPX defined */
+#endif /* VBOX_WITH_VIDEOREC defined */
             case 'h':
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
                 if ((GetState.pDef->fFlags & RTGETOPT_REQ_MASK) != RTGETOPT_REQ_NOTHING)
                 {
@@ -817 +817 @@
     }
 
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
     if (ulFrameWidth < 512 || ulFrameWidth > 2048 || ulFrameWidth % 2)
     {
@@ -847 +847 @@
     }
     RTStrPrintf(&szMpegFile[0], RTPATH_MAX, pszFileNameParam, RTProcSelf());
-#endif /* defined VBOX_WITH_VPX */
+#endif /* defined VBOX_WITH_VIDEOREC */
 
     if (!pcszNameOrUUID)
@@ -958 +958 @@
         CHECK_ERROR_BREAK(console, COMGETTER(Display)(display.asOutParam()));
 
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
         if (fVideoRec)
         {
@@ -967 +967 @@
             CHECK_ERROR_BREAK(machine, COMSETTER(VideoCaptureEnabled)(TRUE));
         }
-#endif /* defined(VBOX_WITH_VPX) */
+#endif /* defined(VBOX_WITH_VIDEOREC) */
 
         /* get the machine debugger (isn't necessarily available) */
@@ -1216 +1216 @@
         Log(("VBoxHeadless: event loop has terminated...\n"));
 
-#ifdef VBOX_WITH_VPX
+#ifdef VBOX_WITH_VIDEOREC
         if (fVideoRec)
         {
@@ -1222 +1222 @@
                 machine->COMSETTER(VideoCaptureEnabled)(FALSE);
         }
-#endif /* defined(VBOX_WITH_VPX) */
+#endif /* defined(VBOX_WITH_VIDEOREC) */
 
         /* we don't have to disable VRDE here because we don't save the settings of the VM */