Changeset 68975 in vbox

Timestamp:

Oct 4, 2017 11:51:39 AM (7 years ago)

Author:

vboxsync

Message:

VideoRec: Renaming (be more consistent): video capture vs. video recording.

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (3 diffs)
• src-client/ConsoleImpl.cpp (modified) (3 diffs)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (21 diffs)

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

@@ -105 +105 @@
     {
         ComPtr<IDisplaySourceBitmap> pSourceBitmap;
-    } videoCapture;
+    } videoRec;
 #endif /* VBOX_WITH_VIDEOREC */
 } DISPLAYFBINFO;
@@ -209 +209 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-    PVIDEORECCFG             i_videoCaptureGetConfig(void) { return &mVideoRecCfg; }
-    VIDEORECFEATURES         i_videoCaptureGetEnabled(void);
-    bool                     i_videoCaptureStarted(void);
+    PVIDEORECCFG             i_videoRecGetConfig(void) { return &mVideoRecCfg; }
+    VIDEORECFEATURES         i_videoRecGetEnabled(void);
+    bool                     i_videoRecStarted(void);
 # ifdef VBOX_WITH_AUDIO_VIDEOREC
-    int                      i_videoCaptureConfigureAudioDriver(const Utf8Str& strAdapter, unsigned uInstance, unsigned uLun, bool fAttach);
+    int                      i_videoRecConfigureAudioDriver(const Utf8Str& strAdapter, unsigned uInstance, unsigned uLun, bool fAttach);
 # endif
-    static DECLCALLBACK(int) i_videoCaptureConfigure(Display *pThis, PVIDEORECCFG pCfg, bool fAttachDetach);
-    int                      i_videoCaptureSendAudio(const void *pvData, size_t cbData, uint64_t uDurationMs);
-    int                      i_videoCaptureStart(void);
-    void                     i_videoCaptureStop(void);
-    void                     i_videoCaptureScreenChanged(unsigned uScreenId);
+    static DECLCALLBACK(int) i_videoRecConfigure(Display *pThis, PVIDEORECCFG pCfg, bool fAttachDetach);
+    int                      i_videoRecSendAudio(const void *pvData, size_t cbData, uint64_t uDurationMs);
+    int                      i_videoRecStart(void);
+    void                     i_videoRecStop(void);
+    void                     i_videoRecScreenChanged(unsigned uScreenId);
 #endif
 
@@ -475 +475 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-    /* Serializes access to video capture source bitmaps. */
-    RTCRITSECT           mVideoCaptureLock;
+    /* Serializes access to video recording source bitmaps. */
+    RTCRITSECT           mVideoRecLock;
     /** The current video recording configuration being used. */
     VIDEORECCFG          mVideoRecCfg;

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

@@ -5517 +5517 @@
 
             int vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), VMCPUID_ANY /*idDstCpu*/,
-                                       (PFNRT)Display::i_videoCaptureConfigure, 3,
-                                       pDisplay, pDisplay->i_videoCaptureGetConfig(), true /* fAttachDetach */);
+                                       (PFNRT)Display::i_videoRecConfigure, 3,
+                                       pDisplay, pDisplay->i_videoRecGetConfig(), true /* fAttachDetach */);
             if (RT_SUCCESS(vrc))
             {
@@ -5524 +5524 @@
                 alock.acquire();
 
-                if (!mDisplay->i_videoCaptureStarted())
+                if (!mDisplay->i_videoRecStarted())
                 {
-                    vrc = mDisplay->i_videoCaptureStart();
+                    vrc = mDisplay->i_videoRecStart();
                     if (RT_FAILURE(vrc))
                         rc = setError(E_FAIL, tr("Unable to start video capturing (%Rrc)"), vrc);
                 }
                 else
-                    mDisplay->i_videoCaptureStop();
+                    mDisplay->i_videoRecStop();
             }
             else
@@ -6736 +6736 @@
     if (mDisplay)
     {
-        int rc2 = mDisplay->i_videoCaptureSendAudio(pvData, cbData, uDurationMs);
+        int rc2 = mDisplay->i_videoRecSendAudio(pvData, cbData, uDurationMs);
         AssertRC(rc2);
     }

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

@@ -3006 +3006 @@
                 /* Note: Don't do any driver attaching (fAttachDetach) here, as this will
                  *       be done automatically as part of the VM startup process. */
-                pDisplay->i_videoCaptureConfigure(pDisplay, pDisplay->i_videoCaptureGetConfig(), false /* fAttachDetach */);
+                pDisplay->i_videoRecConfigure(pDisplay, pDisplay->i_videoRecGetConfig(), false /* fAttachDetach */);
             }
 #endif /* VBOX_WITH_AUDIO_VIDEOREC */

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

@@ -147 +147 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-    rc = RTCritSectInit(&mVideoCaptureLock);
+    rc = RTCritSectInit(&mVideoRecLock);
     AssertRC(rc);
 
@@ -180 +180 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-    if (RTCritSectIsInitialized(&mVideoCaptureLock))
-    {
-        RTCritSectDelete(&mVideoCaptureLock);
-        RT_ZERO(mVideoCaptureLock);
+    if (RTCritSectIsInitialized(&mVideoRecLock))
+    {
+        RTCritSectDelete(&mVideoRecLock);
+        RT_ZERO(mVideoRecLock);
     }
 #endif
@@ -731 +731 @@
         maFramebuffers[uScreenId].pFramebuffer.setNull();
 #ifdef VBOX_WITH_VIDEOREC
-        maFramebuffers[uScreenId].videoCapture.pSourceBitmap.setNull();
+        maFramebuffers[uScreenId].videoRec.pSourceBitmap.setNull();
 #endif
     }
@@ -1059 +1059 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-    i_videoCaptureScreenChanged(uScreenId);
+    i_videoRecScreenChanged(uScreenId);
 #endif
 
@@ -2402 +2402 @@
  * @returns Enables video capturing features.
  */
-VIDEORECFEATURES Display::i_videoCaptureGetEnabled(void)
+VIDEORECFEATURES Display::i_videoRecGetEnabled(void)
 {
     return VideoRecGetEnabled(&mVideoRecCfg);
@@ -2412 +2412 @@
  * @returns True if video capturing is active, false if not.
  */
-bool Display::i_videoCaptureStarted(void)
+bool Display::i_videoRecStarted(void)
 {
     return VideoRecIsActive(mpVideoRecCtx);
@@ -2429 +2429 @@
  * @thread EMT
  */
-int Display::i_videoCaptureConfigureAudioDriver(const Utf8Str& strDevice,
+int Display::i_videoRecConfigureAudioDriver(const Utf8Str& strDevice,
                                                 unsigned       uInstance,
                                                 unsigned       uLun,
@@ -2502 +2502 @@
  */
 /* static */
-DECLCALLBACK(int) Display::i_videoCaptureConfigure(Display *pThis, PVIDEORECCFG pCfg, bool fAttachDetach)
+DECLCALLBACK(int) Display::i_videoRecConfigure(Display *pThis, PVIDEORECCFG pCfg, bool fAttachDetach)
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
@@ -2664 +2664 @@
         if (pCfg->Audio.fEnabled) /* Enable */
         {
-            vrc2 = pThis->i_videoCaptureConfigureAudioDriver(strAudioDev, uInstance, uLun, true /* fAttach */);
+            vrc2 = pThis->i_videoRecConfigureAudioDriver(strAudioDev, uInstance, uLun, true /* fAttach */);
             if (   RT_SUCCESS(vrc2)
                 && fAttachDetach)
@@ -2682 +2682 @@
             if (RT_SUCCESS(vrc2))
             {
-                vrc2 = pThis->i_videoCaptureConfigureAudioDriver(strAudioDev, uInstance, uLun, false /* fAttach */);
+                vrc2 = pThis->i_videoRecConfigureAudioDriver(strAudioDev, uInstance, uLun, false /* fAttach */);
             }
 
@@ -2707 +2707 @@
 
         if (fChanged && i < pThis->mcMonitors)
-            pThis->i_videoCaptureScreenChanged(i);
+            pThis->i_videoRecScreenChanged(i);
 
     }
@@ -2723 +2723 @@
  * @param   uTimestampMs        Timestamp (in ms) of the audio data.
  */
-int Display::i_videoCaptureSendAudio(const void *pvData, size_t cbData, uint64_t uTimestampMs)
+int Display::i_videoRecSendAudio(const void *pvData, size_t cbData, uint64_t uTimestampMs)
 {
     if (   VideoRecIsActive(mpVideoRecCtx)
@@ -2740 +2740 @@
  * @returns IPRT status code.
  */
-int Display::i_videoCaptureStart(void)
+int Display::i_videoRecStart(void)
 {
     if (VideoRecIsActive(mpVideoRecCtx))
@@ -2757 +2757 @@
         if (RT_SUCCESS(rc2))
         {
-            i_videoCaptureScreenChanged(uScreen);
+            i_videoRecScreenChanged(uScreen);
         }
         else
-            LogRel(("Display::VideoCaptureStart: Failed to initialize video recording context #%u (%Rrc)\n", uScreen, rc2));
+            LogRel(("VideoRec: Failed to initialize video recording context #%u (%Rrc)\n", uScreen, rc2));
 
         if (RT_SUCCESS(rc))
@@ -2771 +2771 @@
  * Stops video capturing. Does nothing if video capturing is not active.
  */
-void Display::i_videoCaptureStop(void)
+void Display::i_videoRecStop(void)
 {
     if (!VideoRecIsActive(mpVideoRecCtx))
@@ -2781 +2781 @@
     unsigned uScreenId;
     for (uScreenId = 0; uScreenId < mcMonitors; ++uScreenId)
-        i_videoCaptureScreenChanged(uScreenId);
-}
-
-void Display::i_videoCaptureScreenChanged(unsigned uScreenId)
+        i_videoRecScreenChanged(uScreenId);
+}
+
+void Display::i_videoRecScreenChanged(unsigned uScreenId)
 {
     if (   !VideoRecIsActive(mpVideoRecCtx)
@@ -2793 +2793 @@
     }
 
-    /* Get a new source bitmap which will be used by video capture code. */
+    /* Get a new source bitmap which will be used by video recording code. */
     ComPtr<IDisplaySourceBitmap> pSourceBitmap;
     QuerySourceBitmap(uScreenId, pSourceBitmap.asOutParam());
 
-    int rc2 = RTCritSectEnter(&mVideoCaptureLock);
+    int rc2 = RTCritSectEnter(&mVideoRecLock);
     if (RT_SUCCESS(rc2))
     {
-        maFramebuffers[uScreenId].videoCapture.pSourceBitmap = pSourceBitmap;
-
-        rc2 = RTCritSectLeave(&mVideoCaptureLock);
+        maFramebuffers[uScreenId].videoRec.pSourceBitmap = pSourceBitmap;
+
+        rc2 = RTCritSectLeave(&mVideoRecLock);
         AssertRC(rc2);
     }
@@ -3555 +3555 @@
                 if (VideoRecIsLimitReached(pDisplay->mpVideoRecCtx, uScreenId, u64Now))
                 {
-                    pDisplay->i_videoCaptureStop();
+                    pDisplay->i_videoRecStop();
                     pDisplay->mParent->i_machine()->COMSETTER(VideoCaptureEnabled)(false);
                     break;
@@ -3564 +3564 @@
                 {
                     ComPtr<IDisplaySourceBitmap> pSourceBitmap;
-                    int rc2 = RTCritSectEnter(&pDisplay->mVideoCaptureLock);
+                    int rc2 = RTCritSectEnter(&pDisplay->mVideoRecLock);
                     if (RT_SUCCESS(rc2))
                     {
-                        pSourceBitmap = pFBInfo->videoCapture.pSourceBitmap;
-                        RTCritSectLeave(&pDisplay->mVideoCaptureLock);
+                        pSourceBitmap = pFBInfo->videoRec.pSourceBitmap;
+                        RTCritSectLeave(&pDisplay->mVideoRecLock);
                     }
 
@@ -4591 +4591 @@
         AutoWriteLock displayLock(pThis->pDisplay COMMA_LOCKVAL_SRC_POS);
 #ifdef VBOX_WITH_VIDEOREC
-        pThis->pDisplay->i_videoCaptureStop();
+        pThis->pDisplay->i_videoRecStop();
 #endif
 #ifdef VBOX_WITH_CRHGSMI
@@ -4704 +4704 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-LogRel(("Display: Debug: Calling i_videoCaptureGetEnabled\n"));
-    if (pDisplay->i_videoCaptureGetEnabled())
-    {
-LogRel(("Display: Debug: Calling i_videoCaptureStart\n"));
-        int rc2 = pDisplay->i_videoCaptureStart();
+LogRel(("Display: Debug: Calling i_videoRecGetEnabled\n"));
+    if (pDisplay->i_videoRecGetEnabled())
+    {
+LogRel(("Display: Debug: Calling i_videoRecStart\n"));
+        int rc2 = pDisplay->i_videoRecStart();
         if (RT_SUCCESS(rc2))
             fireVideoCaptureChangedEvent(pDisplay->mParent->i_getEventSource());
 
-        /* If video capturing fails for whatever reason here, this is
+        /* 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. */