Changeset 42861 in vbox for trunk/src/VBox

Timestamp:

Aug 17, 2012 12:06:25 PM (12 years ago)

Author:

vboxsync

Message:

main/VideoCaptureAndEncoding: Error checking, formatting. Still under testing and development

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (2 diffs)
• Main/src-client/DisplayImpl.cpp (modified) (8 diffs)
• Main/src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -333 +333 @@
     { "--chipset",                  MODIFYVM_CHIPSET,                   RTGETOPT_REQ_STRING },
 #ifdef VBOX_WITH_VPX
-    { "--videocapture",             MODIFYVM_VCP    ,                   RTGETOPT_REQ_BOOL_ONOFF },
-    { "--vcpfilename",              MODIFYVM_VCP_FILENAME,              RTGETOPT_REQ_STRING },
+    { "--vcpenabled",               MODIFYVM_VCP,                       RTGETOPT_REQ_BOOL_ONOFF },
+    { "--vcpfile",                  MODIFYVM_VCP_FILENAME,              RTGETOPT_REQ_STRING },
     { "--vcpwidth",                 MODIFYVM_VCP_WIDTH,                 RTGETOPT_REQ_UINT32 },
     { "--vcpheight",                MODIFYVM_VCP_HEIGHT,                RTGETOPT_REQ_UINT32 },
@@ -2412 +2412 @@
             case MODIFYVM_VCP_FILENAME:
             {
-                //CHECK_ERROR(machine, COMSETTER(VideoRecFilename)(ValueUnion.psz));
+                Bstr bstr(ValueUnion.psz);
+                CHECK_ERROR(machine, COMSETTER(VideoCaptureFile)(bstr.raw()));
                 break;
             }

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

@@ -430 +430 @@
 HRESULT Display::init (Console *aParent)
 {
-    LogRelFlowFunc(("this=%p: aParent=%p\n", this, aParent));
-
     ComAssertRet(aParent, E_INVALIDARG);
-
+    HRESULT res;
     /* Enclose the state transition NotReady->InInit->Ready */
     AutoInitSpan autoInitSpan(this);
@@ -449 +447 @@
     ULONG ulVideoCaptureHorzRes;
     ULONG ulVideoCaptureVertRes;
-    char *pchVideoCaptureFile;
     BSTR strVideoCaptureFile;
-    bool Enabled;
-    LogFlow(("Init And Create\n"));
-    int res = VideoRecContextCreate(&pVideoRecContext);
+    BOOL fEnabled = false;
+    if (VideoRecContextCreate(&pVideoRecContext))
+    {
+        LogFlow(("Failed to create Video Recording Context \n"));
+        return E_FAIL;
+    }
     res = RTCritSectInit(&pVideoRecContext->CritSect);
-    AssertReturn(res == VINF_SUCCESS, E_UNEXPECTED);
+    AssertReturn(res == S_OK, E_UNEXPECTED);
+    pVideoRecContext->fEnabled = false;
     mParent->machine()->COMGETTER(VideoCaptureWidth)(&ulVideoCaptureHorzRes);
     mParent->machine()->COMGETTER(VideoCaptureHeight)(&ulVideoCaptureVertRes);
     mParent->machine()->COMGETTER(VideoCaptureFile)(&strVideoCaptureFile);
-    if(res == VINF_SUCCESS)
-        res = VideoRecContextInit(pVideoRecContext,strVideoCaptureFile, ulVideoCaptureHorzRes, ulVideoCaptureVertRes);
+    mParent->machine()->COMGETTER(VideoCaptureEnabled)(&fEnabled);
+    if (fEnabled)
+    {
+        LogFlow(("VidoeRecording VPX enabled \n"));
+        if (VideoRecContextInit(pVideoRecContext,strVideoCaptureFile,
+                                  ulVideoCaptureHorzRes, ulVideoCaptureVertRes))
+        {
+            LogFlow(("Failed to initialize video recording context \n"));
+            return E_FAIL;
+        }
+        pVideoRecContext->fEnabled = true;
+    }
 #endif
     mcMonitors = ul;
@@ -549 +560 @@
     mpVMMDev = NULL;
     mfVMMDevInited = true;
+
+#ifdef VBOX_WITH_VPX
+    VideoRecContextClose(pVideoRecContext);
+#endif
 }
 
@@ -3260 +3275 @@
         }
     }
+
 #ifdef VBOX_WITH_VPX
     uint32_t u32VideoRecImgFormat = VPX_IMG_FMT_NONE;
@@ -3302 +3318 @@
                     break;
                 case 24:
-                    u32VideoRecImgFormat  = VPX_IMG_FMT_RGB24;
+                    u32VideoRecImgFormat = VPX_IMG_FMT_RGB24;
                     Log2(("FFmpeg::RequestResize: setting ffmpeg pixel format to VPX_IMG_FMT_RGB24\n"));
                     break;
@@ -3315 +3331 @@
         }
 
-        if (u32VideoRecImgFormat != VPX_IMG_FMT_NONE && address != NULL)
+        if (u32VideoRecImgFormat != VPX_IMG_FMT_NONE && address != NULL
+            && pVideoRecContext->fEnabled)
         {
             VideoRecCopyToIntBuffer(pVideoRecContext, pFBInfo->xOrigin, pFBInfo->yOrigin,
@@ -3348 +3365 @@
     LogRelFlowFunc (("\n"));
 
-    /* Disable VBVA mode. */
+   /* Disable VBVA mode. */
     pDrv->pDisplay->VideoAccelEnable (false, NULL);
 }
@@ -3543 +3560 @@
             if (uScreenId != VBOX_VIDEO_PRIMARY_SCREEN)
             {
-                /* Primary screen resize is initiated by the VGA device. */
+                /* Primary screen resize is eeeeeeeee by the VGA device. */
                 if (pFBInfo->fDisabled)
                 {

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

@@ -1696 +1696 @@
 STDMETHODIMP Machine::COMSETTER(VideoCaptureFile)(IN_BSTR aFile)
 {
+    Utf8Str strFile(aFile);
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    mHWData->mVideoCaptureFile = aFile;
+    if(strFile.isEmpty())
+       strFile = "VideoCap.webm";
+    mHWData->mVideoCaptureFile = strFile;
     return S_OK;
 }