Changeset 74765 in vbox

Timestamp:

Oct 11, 2018 11:42:31 AM (6 years ago)

Author:

vboxsync

Message:

VideoRec/Main: Condensed code for enabling / disabling video (audio) recording at VM startup and onVideoCaptureChange handler.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -200 +200 @@
 #ifdef VBOX_WITH_USB_CARDREADER
     UsbCardReader *i_getUsbCardReader() { return mUsbCardReader; }
+#endif
+
+#ifdef VBOX_WITH_VIDEOREC
+    int i_videoCaptureEnable(BOOL fEnable, util::AutoWriteLock *pAutoLock);
 #endif
 

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

@@ -5602 +5602 @@
 }
 
-HRESULT Console::i_onVideoCaptureChange()
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC(autoCaller.rc());
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    HRESULT rc = S_OK;
-
 #ifdef VBOX_WITH_VIDEOREC
-    /* Don't trigger video capture changes if the VM isn't running. */
-    SafeVMPtrQuiet ptrVM(this);
-    if (ptrVM.isOk())
-    {
-        if (mDisplay)
-        {
-            Display *pDisplay = mDisplay;
-            AssertPtr(pDisplay);
+/**
+ * Enables or disables video (audio) capturing of a VM.
+ *
+ * @returns IPRT status code. Will return VERR_NO_CHANGE if the capturing state has not been changed.
+ * @param   fEnable             Whether to enable or disable the capturing.
+ * @param   pAutoLock           Pointer to auto write lock to use for attaching/detaching required driver(s) at runtime.
+ */
+int Console::i_videoCaptureEnable(BOOL fEnable, util::AutoWriteLock *pAutoLock)
+{
+    AssertPtrReturn(pAutoLock, VERR_INVALID_POINTER);
+
+    int vrc = VINF_SUCCESS;
+
+    Display *pDisplay = i_getDisplay();
+    if (pDisplay)
+    {
+        if (RT_BOOL(fEnable) != pDisplay->i_videoRecStarted())
+        {
+            LogRel(("VideoRec: %s\n", fEnable ? "Enabling" : "Disabling"));
 
             pDisplay->i_videoRecInvalidate();
 
-            BOOL fEnabled;
-            rc = mMachine->COMGETTER(VideoCaptureEnabled)(&fEnabled);
-            AssertComRCReturnRC(rc);
-
-            int vrc;
-
-            if (fEnabled)
+            if (fEnable)
             {
 # ifdef VBOX_WITH_AUDIO_VIDEOREC
                 /* Attach the video recording audio driver if required. */
-                if (mDisplay->i_videoRecGetFeatures() & VIDEORECFEATURE_AUDIO)
-                    mAudioVideoRec->doAttachDriverViaEmt(mpUVM, &alock);
+                if (   pDisplay->i_videoRecGetFeatures() & VIDEORECFEATURE_AUDIO
+                    && mAudioVideoRec)
+                    vrc = mAudioVideoRec->doAttachDriverViaEmt(mpUVM, pAutoLock);
 # endif
-                vrc = mDisplay->i_videoRecStart();
-                if (RT_FAILURE(vrc))
-                    rc = setErrorBoth(E_FAIL, vrc, tr("Unable to start video capturing (%Rrc)"), vrc);
+                if (   RT_SUCCESS(vrc)
+                    && pDisplay->i_videoRecGetFeatures()) /* Any video recording (audio and/or video) feature enabled? */
+                {
+                    vrc = pDisplay->i_videoRecStart();
+                }
             }
             else
@@ -5644 +5643 @@
                 mDisplay->i_videoRecStop();
 # ifdef VBOX_WITH_AUDIO_VIDEOREC
-                mAudioVideoRec->doDetachDriverViaEmt(mpUVM, &alock);
+                mAudioVideoRec->doDetachDriverViaEmt(mpUVM, pAutoLock);
 # endif
             }
+
+            if (RT_FAILURE(vrc))
+                LogRel(("VideoRec: %s failed with %Rrc\n", fEnable ? "Enabling" : "Disabling", vrc));
+        }
+        else /* Should not happen. */
+            vrc = VERR_NO_CHANGE;
+    }
+
+    return vrc;
+}
+#endif /* VBOX_WITH_VIDEOREC */
+
+HRESULT Console::i_onVideoCaptureChange()
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = S_OK;
+#ifdef VBOX_WITH_VIDEOREC
+    /* Don't trigger video capture changes if the VM isn't running. */
+    SafeVMPtrQuiet ptrVM(this);
+    if (ptrVM.isOk())
+    {
+        BOOL fEnabled;
+        rc = mMachine->COMGETTER(VideoCaptureEnabled)(&fEnabled);
+        AssertComRCReturnRC(rc);
+
+        int vrc = i_videoCaptureEnable(fEnabled, &alock);
+        if (RT_SUCCESS(vrc))
+        {
+            alock.release();
+            fireVideoCaptureChangedEvent(mEventSource);
         }
 
@@ -5652 +5685 @@
     }
 #endif /* VBOX_WITH_VIDEOREC */
-
-    /* Notify console callbacks on success. */
-    if (SUCCEEDED(rc))
-    {
-        alock.release();
-        fireVideoCaptureChangedEvent(mEventSource);
-    }
 
     return rc;
@@ -9925 +9951 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-        Display *pDisplay = pConsole->i_getDisplay();
-        AssertPtr(pDisplay);
-        if (pDisplay)
-        {
-            BOOL fVideoRecEnabled = FALSE;
-            rc = pConsole->mMachine->COMGETTER(VideoCaptureEnabled)(&fVideoRecEnabled);
-            AssertComRCReturnVoid(rc);
-
-            if (fVideoRecEnabled)
+        BOOL fVideoRecEnabled = FALSE;
+        rc = pConsole->mMachine->COMGETTER(VideoCaptureEnabled)(&fVideoRecEnabled);
+        AssertComRCReturnVoid(rc);
+
+        if (fVideoRecEnabled)
+        {
+            int vrc2 = pConsole->i_videoCaptureEnable(fVideoRecEnabled, &alock);
+            if (RT_SUCCESS(vrc2))
             {
-                pDisplay->i_videoRecInvalidate();
-
-                /* If video recording fails for whatever reason here, this is
-                 * non-critical and should not be returned at this point -- otherwise
-                 * the display driver construction fails completely. */
-                int vrc2 = VINF_SUCCESS;
-
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
-                /* Attach the video recording audio driver if required. */
-                if (   pDisplay->i_videoRecGetFeatures() & VIDEORECFEATURE_AUDIO
-                    && pConsole->mAudioVideoRec)
-                    vrc2 = pConsole->mAudioVideoRec->doAttachDriverViaEmt(pConsole->mpUVM, &alock);
-#endif
-                if (   RT_SUCCESS(vrc2)
-                    && pDisplay->i_videoRecGetFeatures()) /* Any video recording (audio and/or video) feature enabled? */
-                {
-                    vrc2 = pDisplay->i_videoRecStart();
-                    if (RT_SUCCESS(vrc2))
-                        fireVideoCaptureChangedEvent(pConsole->i_getEventSource());
-                }
+                fireVideoCaptureChangedEvent(pConsole->mEventSource);
             }
+            else
+               LogRel(("VideoRec: Failed with %Rrc on VM power up\n", vrc2));
+
+            /** Note: Do not use vrc here, as starting the video recording isn't critical to
+             *        powering up the VM. */
         }
 #endif