Changeset 51504 in vbox for trunk/src/VBox

Timestamp:

Jun 3, 2014 8:43:49 AM (11 years ago)

Author:

vboxsync

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

94118

Message:

VBoxHeadless: use VideoCapture API.

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxHeadless.cpp (modified) (16 diffs)
• VBoxHeadless.h (modified) (2 diffs)

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

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

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

@@ -43 +43 @@
 #include <VBox/VBoxVideo.h>
 
-#ifdef VBOX_WITH_VIDEO_REC
-#include <cstdlib>
-#include <cerrno>
-#include "VBoxHeadless.h"
-#include <iprt/env.h>
-#include <iprt/param.h>
+#ifdef VBOX_WITH_VPX
 #include <iprt/process.h>
-#include <VBox/sup.h>
 #endif
 
@@ -510 +504 @@
              "   --settingspw <pw>                     Specify the settings password\n"
              "   --settingspwfile <file>               Specify a file containing the settings password\n"
-#ifdef VBOX_WITH_VIDEO_REC
+#ifdef VBOX_WITH_VPX
              "   -c, -capture, --capture               Record the VM screen output to a file\n"
              "   -w, --width                           Frame width when recording\n"
@@ -521 +515 @@
 }
 
-#ifdef VBOX_WITH_VIDEO_REC
+#ifdef VBOX_WITH_VPX
 /**
  * Parse the environment for variables which can influence the VIDEOREC settings.
@@ -570 +564 @@
         *ppszFileName = pszEnvTemp;
 }
-#endif /* VBOX_WITH_VIDEO_REC defined */
+#endif /* VBOX_WITH_VPX defined */
 
 static RTEXITCODE readPasswordFile(const char *pszFilename, com::Utf8Str *pPasswd)
@@ -656 +650 @@
     unsigned fPATM  = ~0U;
     unsigned fCSAM  = ~0U;
-#ifdef VBOX_WITH_VIDEO_REC
+#ifdef VBOX_WITH_VPX
     bool fVideoRec = 0;
     unsigned long ulFrameWidth = 800;
@@ -663 +657 @@
     char szMpegFile[RTPATH_MAX];
     const char *pszFileNameParam = "VBox-%d.vob";
-#endif /* VBOX_WITH_VIDEO_REC */
+#endif /* VBOX_WITH_VPX */
 
     LogFlow(("VBoxHeadless STARTED.\n"));
@@ -670 +664 @@
              "All rights reserved.\n\n");
 
-#ifdef VBOX_WITH_VIDEO_REC
+#ifdef VBOX_WITH_VPX
     /* Parse the environment */
     parse_environ(&ulFrameWidth, &ulFrameHeight, &ulBitRate, &pszFileNameParam);
@@ -722 +716 @@
         { "--settingspw", OPT_SETTINGSPW, RTGETOPT_REQ_STRING },
         { "--settingspwfile", OPT_SETTINGSPW_FILE, RTGETOPT_REQ_STRING },
-#ifdef VBOX_WITH_VIDEO_REC
+#ifdef VBOX_WITH_VPX
         { "-capture", 'c', 0 },
         { "--capture", 'c', 0 },
@@ -729 +723 @@
         { "--bitrate", 'r', RTGETOPT_REQ_UINT32 },
         { "--filename", 'f', RTGETOPT_REQ_STRING },
-#endif /* VBOX_WITH_VIDEO_REC defined */
+#endif /* VBOX_WITH_VPX defined */
         { "-comment", OPT_COMMENT, RTGETOPT_REQ_STRING },
         { "--comment", OPT_COMMENT, RTGETOPT_REQ_STRING }
@@ -797 +791 @@
                 pcszSettingsPwFile = ValueUnion.psz;
                 break;
-#ifdef VBOX_WITH_VIDEO_REC
+#ifdef VBOX_WITH_VPX
             case 'c':
                 fVideoRec = true;
@@ -810 +804 @@
                 pszFileNameParam = ValueUnion.psz;
                 break;
-#endif /* VBOX_WITH_VIDEO_REC defined */
+#endif /* VBOX_WITH_VPX defined */
             case 'h':
-#ifdef VBOX_WITH_VIDEO_REC
+#ifdef VBOX_WITH_VPX
                 if ((GetState.pDef->fFlags & RTGETOPT_REQ_MASK) != RTGETOPT_REQ_NOTHING)
                 {
@@ -834 +828 @@
     }
 
-#ifdef VBOX_WITH_VIDEO_REC
+#ifdef VBOX_WITH_VPX
     if (ulFrameWidth < 512 || ulFrameWidth > 2048 || ulFrameWidth % 2)
     {
@@ -864 +858 @@
     }
     RTStrPrintf(&szMpegFile[0], RTPATH_MAX, pszFileNameParam, RTProcSelf());
-#endif /* defined VBOX_WITH_VIDEO_REC */
+#endif /* defined VBOX_WITH_VPX */
 
     if (!pcszNameOrUUID)
@@ -972 +966 @@
         CHECK_ERROR_BREAK(console, COMGETTER(Display)(display.asOutParam()));
 
-#ifdef VBOX_WITH_VIDEO_REC
-        IFramebuffer *pFramebuffer = 0;
-        RTLDRMOD hLdrVideoRecFB;
-        PFNREGISTERVIDEORECFB pfnRegisterVideoRecFB;
-
+#ifdef VBOX_WITH_VPX
         if (fVideoRec)
         {
-            HRESULT         rcc = S_OK;
-            int             rrc = VINF_SUCCESS;
-            RTERRINFOSTATIC ErrInfo;
-
-            Log2(("VBoxHeadless: loading VBoxVideoRecFB and libvpx shared library\n"));
-            RTErrInfoInitStatic(&ErrInfo);
-            rrc = SUPR3HardenedLdrLoadAppPriv("VBoxVideoRecFB", &hLdrVideoRecFB, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
-
-            if (RT_SUCCESS(rrc))
-            {
-                Log2(("VBoxHeadless: looking up symbol VBoxRegisterVideoRecFB\n"));
-                rrc = RTLdrGetSymbol(hLdrVideoRecFB, "VBoxRegisterVideoRecFB",
-                                     reinterpret_cast<void **>(&pfnRegisterVideoRecFB));
-                if (RT_FAILURE(rrc))
-                    LogError("Failed to load the video capture extension, possibly due to a damaged file\n", rrc);
-            }
-            else
-                LogError("Failed to load the video capture extension\n", rrc); /** @todo stupid function, no formatting options. */
-            if (RT_SUCCESS(rrc))
-            {
-                Log2(("VBoxHeadless: calling pfnRegisterVideoRecFB\n"));
-                rcc = pfnRegisterVideoRecFB(ulFrameWidth, ulFrameHeight, ulBitRate,
-                                         szMpegFile, &pFramebuffer);
-                if (rcc != S_OK)
-                    LogError("Failed to initialise video capturing - make sure that the file format\n"
-                             "you wish to use is supported on your system\n", rcc);
-            }
-            if (RT_SUCCESS(rrc) && rcc == S_OK)
-            {
-                Log2(("VBoxHeadless: Registering framebuffer\n"));
-                pFramebuffer->AddRef();
-                display->AttachFramebuffer(VBOX_VIDEO_PRIMARY_SCREEN, pFramebuffer);
-            }
-            if (!RT_SUCCESS(rrc) || rcc != S_OK)
-                rc = E_FAIL;
-        }
-        if (rc != S_OK)
-        {
-            break;
-        }
-#endif /* defined(VBOX_WITH_VIDEO_REC) */
+            CHECK_ERROR_BREAK(machine, COMSETTER(VideoCaptureFile)(Bstr(szMpegFile).raw()));
+            CHECK_ERROR_BREAK(machine, COMSETTER(VideoCaptureWidth)(ulFrameWidth));
+            CHECK_ERROR_BREAK(machine, COMSETTER(VideoCaptureHeight)(ulFrameHeight));
+            CHECK_ERROR_BREAK(machine, COMSETTER(VideoCaptureRate)(ulBitRate));
+            CHECK_ERROR_BREAK(machine, COMSETTER(VideoCaptureEnabled)(TRUE));
+        }
+#endif /* defined(VBOX_WITH_VPX) */
         ULONG cMonitors = 1;
         machine->COMGETTER(MonitorCount)(&cMonitors);
@@ -1026 +982 @@
         for (uScreenId = 0; uScreenId < cMonitors; uScreenId++)
         {
-# ifdef VBOX_WITH_VIDEO_REC
-            if (fVideoRec && uScreenId == 0)
-            {
-                /* Already registered. */
-                continue;
-            }
-# endif
             VRDPFramebuffer *pVRDPFramebuffer = new VRDPFramebuffer();
             if (!pVRDPFramebuffer)
@@ -1316 +1265 @@
         Log(("VBoxHeadless: event loop has terminated...\n"));
 
-#ifdef VBOX_WITH_VIDEO_REC
-        if (pFramebuffer)
-        {
-            pFramebuffer->Release();
-            Log(("Released framebuffer\n"));
-            pFramebuffer = NULL;
-        }
-#endif /* defined(VBOX_WITH_VIDEO_REC) */
+#ifdef VBOX_WITH_VPX
+        if (fVideoRec)
+        {
+            if (!machine.isNull())
+                machine->COMSETTER(VideoCaptureEnabled)(FALSE);
+        }
+#endif /* defined(VBOX_WITH_VPX) */
 
         /* we don't have to disable VRDE here because we don't save the settings of the VM */

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

@@ -2 +2 @@
  *
  * VBox frontends: VRDE (headless Remote Desktop server):
- * Header file with registration call for VideoRec framebuffer
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +29 @@
 #include <iprt/critsect.h>
 
-/**
- * Callback function to register an VideoRec framebuffer.
- *
- * @returns COM status code.
- * @param   width        Framebuffer width.
- * @param   height       Framebuffer height.
- * @param   bitrate      Bitrate of mpeg file to be created.
- * @param   pixelFormat  Framebuffer pixel format
- * @param   filename     Name of mpeg file to be created
- * @retval  retVal       The new framebuffer
- */
-typedef DECLCALLBACK(HRESULT) FNREGISTERVIDEORECFB(ULONG width,
-                                     ULONG height, ULONG bitrate,
-                                     com::Bstr filename,
-                                     IFramebuffer **retVal);
-typedef FNREGISTERVIDEORECFB *PFNREGISTERVIDEORECFB;
-
 #endif // __H_VBOXHEADLESS