Changeset 72014 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 25, 2018 1:28:31 PM (7 years ago)

Author:

vboxsync

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

122275

Message:

VideoRec/Main: Simplified recoding state checking by only using the IMachine::VideoCaptureEnabled getter. A bit of renaming.

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (2 diffs)
• src-client/DisplayImpl.cpp (modified) (11 diffs)
• src-client/VideoRec.cpp (modified) (8 diffs)
• src-client/VideoRec.h (modified) (5 diffs)

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

@@ -209 +209 @@
 #ifdef VBOX_WITH_VIDEOREC
     PVIDEORECCFG             i_videoRecGetConfig(void) { return &mVideoRecCfg; }
-    VIDEORECFEATURES         i_videoRecGetEnabled(void);
+    VIDEORECFEATURES         i_videoRecGetFeatures(void);
     bool                     i_videoRecStarted(void);
     void                     i_videoRecInvalidate();

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

@@ -5660 +5660 @@
             pDisplay->i_videoRecInvalidate();
 
+            BOOL fEnabled;
+            rc = mMachine->COMGETTER(VideoCaptureEnabled)(&fEnabled);
+            AssertComRCReturnRC(rc);
+
             int vrc;
 
-            if (!mDisplay->i_videoRecStarted())
+            if (fEnabled)
             {
 # ifdef VBOX_WITH_AUDIO_VIDEOREC
                 /* Attach the video recording audio driver if required. */
-                if (mDisplay->i_videoRecGetEnabled() & VIDEORECFEATURE_AUDIO)
+                if (mDisplay->i_videoRecGetFeatures() & VIDEORECFEATURE_AUDIO)
                     mAudioVideoRec->doAttachDriverViaEmt(mpUVM, &alock);
 # endif
@@ -9994 +9998 @@
         if (pDisplay)
         {
-            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;
+            BOOL fVideoRecEnabled = FALSE;
+            rc = pConsole->mMachine->COMGETTER(VideoCaptureEnabled)(&fVideoRecEnabled);
+            AssertComRCReturnVoid(rc);
+
+            if (fVideoRecEnabled)
+            {
+                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_videoRecGetEnabled() & VIDEORECFEATURE_AUDIO
-                && pConsole->mAudioVideoRec)
-                vrc2 = pConsole->mAudioVideoRec->doAttachDriverViaEmt(pConsole->mpUVM, &alock);
+                /* 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_videoRecGetEnabled()) /* Any video recording (audio and/or video) feature enabled? */
-            {
-                vrc2 = pDisplay->i_videoRecStart();
-                if (RT_SUCCESS(vrc2))
-                    fireVideoCaptureChangedEvent(pConsole->i_getEventSource());
+                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());
+                }
             }
         }

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

@@ -2402 +2402 @@
  * @returns Enables video capturing features.
  */
-VIDEORECFEATURES Display::i_videoRecGetEnabled(void)
-{
-    return VideoRecGetEnabled(&mVideoRecCfg);
+VIDEORECFEATURES Display::i_videoRecGetFeatures(void)
+{
+    return VideoRecGetFeatures(&mVideoRecCfg);
 }
 
@@ -2414 +2414 @@
 bool Display::i_videoRecStarted(void)
 {
-    return VideoRecIsActive(mpVideoRecCtx);
+    return VideoRecIsStarted(mpVideoRecCtx);
 }
 
@@ -2431 +2431 @@
      * Cache parameters from API.
      */
-    BOOL fEnabled;
-    HRESULT hrc = pMachine->COMGETTER(VideoCaptureEnabled)(&fEnabled);
-    AssertComRCReturnVoid(hrc);
-    mVideoRecCfg.fEnabled = RT_BOOL(fEnabled);
-
     com::SafeArray<BOOL> aScreens;
-    hrc = pMachine->COMGETTER(VideoCaptureScreens)(ComSafeArrayAsOutParam(aScreens));
+    HRESULT hrc = pMachine->COMGETTER(VideoCaptureScreens)(ComSafeArrayAsOutParam(aScreens));
     AssertComRCReturnVoid(hrc);
 
@@ -2465 +2460 @@
      * Set sensible defaults.
      */
-    mVideoRecCfg.Video.fEnabled = mVideoRecCfg.fEnabled;
+    mVideoRecCfg.Video.fEnabled = true; /* Enabled by default. */
 
     if (!mVideoRecCfg.Video.uFPS) /* Prevent division by zero. */
@@ -2474 +2469 @@
 #endif
 
-    /* Note: Audio support is considered as being experimental, thus it's disabled by default.
-     * There be dragons! */
 #ifdef VBOX_WITH_AUDIO_VIDEOREC
-    mVideoRecCfg.Audio.fEnabled  = false;
+    mVideoRecCfg.Audio.fEnabled  = false; /* Disabled by default, unless set otherwise below. */
     /* By default we use 48kHz, 16-bit, stereo for the audio track. */
     mVideoRecCfg.Audio.uHz       = 48000;
@@ -2582 +2575 @@
 int Display::i_videoRecSendAudio(const void *pvData, size_t cbData, uint64_t uTimestampMs)
 {
-    if (   VideoRecIsActive(mpVideoRecCtx)
-        && VideoRecGetEnabled(&mVideoRecCfg) & VIDEORECFEATURE_AUDIO)
+    if (   VideoRecIsStarted(mpVideoRecCtx)
+        && VideoRecGetFeatures(&mVideoRecCfg) & VIDEORECFEATURE_AUDIO)
     {
         return VideoRecSendAudioFrame(mpVideoRecCtx, pvData, cbData, uTimestampMs);
@@ -2599 +2592 @@
 int Display::i_videoRecStart(void)
 {
-    if (VideoRecIsActive(mpVideoRecCtx))
+    if (VideoRecIsStarted(mpVideoRecCtx))
         return VINF_SUCCESS;
+
+    LogRel(("VideoRec: Starting ...\n"));
 
     int rc = VideoRecContextCreate(mcMonitors, &mVideoRecCfg, &mpVideoRecCtx);
@@ -2631 +2626 @@
 void Display::i_videoRecStop(void)
 {
-    if (!VideoRecIsActive(mpVideoRecCtx))
+    if (!VideoRecIsStarted(mpVideoRecCtx))
         return;
+
+    LogRel(("VideoRec: Stopping ...\n"));
 
     VideoRecContextDestroy(mpVideoRecCtx);
@@ -2644 +2641 @@
 void Display::i_videoRecScreenChanged(unsigned uScreenId)
 {
-    if (   !VideoRecIsActive(mpVideoRecCtx)
+    if (   !VideoRecIsStarted(mpVideoRecCtx)
         || !maVideoRecEnabled[uScreenId])
     {
@@ -3366 +3363 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-    if (   VideoRecIsActive(pDisplay->mpVideoRecCtx)
-        && VideoRecGetEnabled(&pDisplay->mVideoRecCfg) & VIDEORECFEATURE_VIDEO)
+    if (   VideoRecIsStarted(pDisplay->mpVideoRecCtx)
+        && VideoRecGetFeatures(&pDisplay->mVideoRecCfg) & VIDEORECFEATURE_VIDEO)
     {
         do {
@@ -3832 +3829 @@
     Assert(mfCrOglVideoRecState == CRVREC_STATE_SUBMITTED);
 # ifdef VBOX_WITH_VIDEOREC
-    if (   VideoRecIsActive(mpVideoRecCtx)
-        && VideoRecGetEnabled(&mVideoRecCfg) & VIDEORECFEATURE_VIDEO)
+    if (   VideoRecIsStarted(mpVideoRecCtx)
+        && VideoRecGetFeatures(&mVideoRecCfg) & VIDEORECFEATURE_VIDEO)
     {
         int rc2 = VideoRecSendVideoFrame(mpVideoRecCtx, uScreen, x, y,

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

@@ -227 +227 @@
     /** Semaphore to signal the encoding worker thread. */
     RTSEMEVENT          WaitEvent;
-    /** Whether this conext is enabled or not. */
-    bool                fEnabled;
+    /** Whether this conext is in started state or not. */
+    bool                fStarted;
     /** Shutdown indicator. */
     bool                fShutdown;
@@ -721 +721 @@
         pCtx->tsStartMs = RTTimeMilliTS();
         pCtx->enmState  = VIDEORECSTS_UNINITIALIZED;
+        pCtx->fStarted  = false;
         pCtx->fShutdown = false;
 
@@ -738 +739 @@
         {
             pCtx->enmState = VIDEORECSTS_INITIALIZED;
-            pCtx->fEnabled = true;
+            pCtx->fStarted = true;
 
             if (ppCtx)
@@ -763 +764 @@
     if (!pCtx)
         return VINF_SUCCESS;
-
-    /* First, disable the context. */
-    ASMAtomicWriteBool(&pCtx->fEnabled, false);
 
     if (pCtx->enmState == VIDEORECSTS_INITIALIZED)
@@ -778 +776 @@
         if (RT_FAILURE(rc))
             return rc;
+
+        /* Disable the context. */
+        ASMAtomicWriteBool(&pCtx->fStarted, false);
 
         rc = RTSemEventDestroy(pCtx->WaitEvent);
@@ -1065 +1066 @@
     PVIDEORECCFG pCfg = &pCtx->Cfg;
 
-    pStream->pCtx          = pCtx;
+    pStream->pCtx = pCtx;
 
     /** @todo Make the following parameters configurable on a per-stream basis? */
@@ -1226 +1227 @@
  * @param   pCfg                Pointer to recording configuration.
  */
-VIDEORECFEATURES VideoRecGetEnabled(PVIDEORECCFG pCfg)
-{
-    if (   !pCfg
-        || !pCfg->fEnabled)
-    {
+VIDEORECFEATURES VideoRecGetFeatures(PVIDEORECCFG pCfg)
+{
+    if (!pCfg)
         return VIDEORECFEATURE_NONE;
-    }
 
     VIDEORECFEATURES fFeatures = VIDEORECFEATURE_NONE;
@@ -1278 +1276 @@
 
 /**
- * Returns whether video recording for a given recording context is active or not.
+ * Returns whether a given recording context has been started or not.
  *
  * @returns true if active, false if not.
  * @param   pCtx                 Pointer to video recording context.
  */
-bool VideoRecIsActive(PVIDEORECCONTEXT pCtx)
+bool VideoRecIsStarted(PVIDEORECCONTEXT pCtx)
 {
     if (!pCtx)
         return false;
 
-    return ASMAtomicReadBool(&pCtx->fEnabled);
+    return ASMAtomicReadBool(&pCtx->fStarted);
 }
 

trunk/src/VBox/Main/src-client/VideoRec.h

@@ -58 +58 @@
 {
     VIDEORECCFG(void)
-        : fEnabled(false)
-        , enmDst(VIDEORECDEST_INVALID)
+        :  enmDst(VIDEORECDEST_INVALID)
         , uMaxTimeS(0)
     {
@@ -69 +68 @@
 
     /** Whether recording is enabled or not (as a whole). */
-    bool                    fEnabled;
+    //bool                    fEnabled;
     /** Array of all screens containing whether they're enabled
      *  for recording or not.  */
@@ -143 +142 @@
     VIDEORECCFG& operator=(const VIDEORECCFG &that)
     {
-        fEnabled = that.fEnabled;
-
         aScreens.resize(that.aScreens.size());
         for (size_t i = 0; i < that.aScreens.size(); ++i)
@@ -179 +176 @@
 int VideoRecStreamUninit(PVIDEORECCONTEXT pCtx, uint32_t uScreen);
 
-VIDEORECFEATURES VideoRecGetEnabled(PVIDEORECCFG pCfg);
+VIDEORECFEATURES VideoRecGetFeatures(PVIDEORECCFG pCfg);
 
 int VideoRecSendAudioFrame(PVIDEORECCONTEXT pCtx, const void *pvData, size_t cbData, uint64_t uTimestampMs);
@@ -187 +184 @@
                             uint8_t *puSrcData, uint64_t uTimeStampMs);
 bool VideoRecIsReady(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t uTimeStampMs);
-bool VideoRecIsActive(PVIDEORECCONTEXT pCtx);
+bool VideoRecIsStarted(PVIDEORECCONTEXT pCtx);
 bool VideoRecIsLimitReached(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t tsNowMs);