Changeset 41956 in vbox for trunk/src/VBox

Timestamp:

Jun 28, 2012 11:15:26 AM (13 years ago)

Author:

vboxsync

Message:

VBoxHeadless: Corrected the C define "VBOX_FFMPEG" to more meaningful one "VBOX_WITH_VIDEO_REC" .

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxHeadless.cpp (modified) (19 diffs)

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

@@ -47 +47 @@
 #
 VBoxHeadless_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
-VBoxHeadless_DEFS       = VBOX_FFMPEG
+VBoxHeadless_DEFS      += \
+                 VBOX_WITH_VIDEO_REC 
 VBoxHeadless_SOURCES    = VBoxHeadless.cpp
 VBoxHeadless_SOURCES  += Framebuffer.cpp

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

@@ -43 +43 @@
 #include <VBox/VBoxVideo.h>
 
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC ||
 #include <cstdlib>
 #include <cerrno>
@@ -471 +471 @@
              "                                         \"TCP/Address\" - interface IP the VRDE server\n"
              "                                         will bind to\n"
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC
              "   -c, -capture, --capture               Record the VM screen output to a file\n"
              "   -w, --width                           Frame width when recording\n"
@@ -483 +483 @@
 }
 
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC
 /**
  * Parse the environment for variables which can influence the FFMPEG settings.
@@ -527 +527 @@
         *ppszFileName = pszEnvTemp;
 }
-#endif /* VBOX_FFMPEG defined */
+#endif /* VBOX_WITH_VIDEO_REC defined */
 
 #ifdef RT_OS_WINDOWS
@@ -548 +548 @@
     unsigned fPATM  = ~0U;
     unsigned fCSAM  = ~0U;
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC
     unsigned fFFMPEG = 0;
     unsigned long ulFrameWidth = 800;
@@ -555 +555 @@
     char pszMPEGFile[RTPATH_MAX];
     const char *pszFileNameParam = "VBox-%d.vob";
-#endif /* VBOX_FFMPEG */
+#endif /* VBOX_WITH_VIDEO_REC */
 
     LogFlow (("VBoxHeadless STARTED.\n"));
@@ -562 +562 @@
               "All rights reserved.\n\n");
 
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC
     /* Parse the environment */
     parse_environ(&ulFrameWidth, &ulFrameHeight, &ulBitRate, &pszFileNameParam);
@@ -610 +610 @@
         { "-nocsam", OPT_NO_CSAM, 0 },
         { "--nocsam", OPT_NO_CSAM, 0 },
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC
         { "-capture", 'c', 0 },
         { "--capture", 'c', 0 },
@@ -617 +617 @@
         { "--bitrate", 'r', RTGETOPT_REQ_UINT32 },
         { "--filename", 'f', RTGETOPT_REQ_STRING },
-#endif /* VBOX_FFMPEG defined */
+#endif /* VBOX_WITH_VIDEO_REC defined */
         { "-comment", OPT_COMMENT, RTGETOPT_REQ_STRING },
         { "--comment", OPT_COMMENT, RTGETOPT_REQ_STRING }
@@ -677 +677 @@
                 fCSAM = false;
                 break;
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC
             case 'c':
                 fFFMPEG = true;
@@ -690 +690 @@
                 pszFileNameParam = ValueUnion.psz;
                 break;
-#endif /* VBOX_FFMPEG defined */
+#endif /* VBOX_WITH_VIDEO_REC defined */
             case 'h':
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC
                 if ((GetState.pDef->fFlags & RTGETOPT_REQ_MASK) != RTGETOPT_REQ_NOTHING)
                 {
@@ -714 +714 @@
     }
 
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC
     if (ulFrameWidth < 512 || ulFrameWidth > 2048 || ulFrameWidth % 2)
     {
@@ -744 +744 @@
     }
     RTStrPrintf(&pszMPEGFile[0], RTPATH_MAX, pszFileNameParam, RTProcSelf());
-#endif /* defined VBOX_FFMPEG */
+#endif /* defined VBOX_WITH_VIDEO_REC */
 
     if (!pcszNameOrUUID)
@@ -840 +840 @@
         CHECK_ERROR_BREAK(console, COMGETTER(Display)(display.asOutParam()));
 
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC
         IFramebuffer *pFramebuffer = 0;
         RTLDRMOD hLdrFFmpegFB;
@@ -851 +851 @@
             RTERRINFOSTATIC ErrInfo;
 
-            Log2(("VBoxHeadless: loading VBoxFFmpegFB shared library\n"));
+            Log2(("VBoxHeadless: loading VBoxFFmpegFB and libvpx shared library\n"));
             RTErrInfoInitStatic(&ErrInfo);
             rrc = SUPR3HardenedLdrLoadAppPriv("VBoxFFmpegFB", &hLdrFFmpegFB, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
@@ -887 +887 @@
             break;
         }
-#endif /* defined(VBOX_FFMPEG) */
+#endif /* defined(VBOX_WITH_VIDEO_REC) */
         ULONG cMonitors = 1;
         machine->COMGETTER(MonitorCount)(&cMonitors);
@@ -894 +894 @@
         for (uScreenId = 0; uScreenId < cMonitors; uScreenId++)
         {
-# ifdef VBOX_FFMPEG
+# ifdef VBOX_WITH_VIDEO_REC
             if (fFFMPEG && uScreenId == 0)
             {
@@ -1179 +1179 @@
         Log(("VBoxHeadless: event loop has terminated...\n"));
 
-#ifdef VBOX_FFMPEG
+#ifdef VBOX_WITH_VIDEO_REC
         if (pFramebuffer)
         {
@@ -1186 +1186 @@
             pFramebuffer = NULL;
         }
-#endif /* defined(VBOX_FFMPEG) */
+#endif /* defined(VBOX_WITH_VIDEO_REC) */
 
         /* we don't have to disable VRDE here because we don't save the settings of the VM */