Changeset 75066 in vbox for trunk

Timestamp:

Oct 25, 2018 12:58:49 PM (6 years ago)

Author:

vboxsync

Message:

VideoRec/Main: More renaming.

Location:

trunk/src/VBox/Main

Files:

• include/VideoRecStream.h (modified) (1 diff)
• src-client/VideoRec.cpp (modified) (8 diffs)
• src-client/VideoRecStream.cpp (modified) (17 diffs)

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

@@ -166 +166 @@
 typedef std::vector <PVIDEORECSTREAM> VideoRecStreams;
 
-int videoRecStreamClose(PVIDEORECSTREAM pStream);
-PVIDEORECSTREAM videoRecStreamGet(PVIDEORECCONTEXT pCtx, uint32_t uScreen);
-int videoRecStreamOpen(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg);
+int VideoRecStreamClose(PVIDEORECSTREAM pStream);
+int VideoRecStreamOpen(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg);
 int VideoRecStreamProcess(PVIDEORECSTREAM pStream);
-int videoRecStreamUninit(PVIDEORECSTREAM pStream);
-int videoRecStreamUnitVideo(PVIDEORECSTREAM pStream);
-int videoRecStreamInitVideo(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg);
+int VideoRecStreamUninit(PVIDEORECSTREAM pStream);
+int VideoRecStreamUnitVideo(PVIDEORECSTREAM pStream);
+int VideoRecStreamInitVideo(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg);
 #ifdef VBOX_WITH_LIBVPX
-int videoRecStreamInitVideoVPX(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg);
-int videoRecStreamUninitVideoVPX(PVIDEORECSTREAM pStream);
-int videoRecStreamWriteVideoVPX(PVIDEORECSTREAM pStream, uint64_t uTimeStampMs, PVIDEORECVIDEOFRAME pFrame);
+int VideoRecStreamInitVideoVPX(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg);
+int VideoRecStreamUninitVideoVPX(PVIDEORECSTREAM pStream);
+int VideoRecStreamWriteVideoVPX(PVIDEORECSTREAM pStream, uint64_t uTimeStampMs, PVIDEORECVIDEOFRAME pFrame);
 #endif
-void videoRecStreamLock(PVIDEORECSTREAM pStream);
-void videoRecStreamUnlock(PVIDEORECSTREAM pStream);
+void VideoRecStreamLock(PVIDEORECSTREAM pStream);
+void VideoRecStreamUnlock(PVIDEORECSTREAM pStream);
 
 #endif /* ____H_VIDEOREC_STREAM */

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

@@ -320 +320 @@
             PVIDEORECSTREAM pStream = (*it);
 
-            videoRecStreamLock(pStream);
-
-            int rc2 = videoRecStreamClose(pStream);
+            VideoRecStreamLock(pStream);
+
+            int rc2 = VideoRecStreamClose(pStream);
             if (RT_SUCCESS(rc))
                 rc = rc2;
 
-            rc2 = videoRecStreamUninit(pStream);
+            rc2 = VideoRecStreamUninit(pStream);
             if (RT_SUCCESS(rc))
                 rc = rc2;
@@ -333 +333 @@
             it = pCtx->vecStreams.begin();
 
-            videoRecStreamUnlock(pStream);
+            VideoRecStreamUnlock(pStream);
 
             RTCritSectDelete(&pStream->CritSect);
@@ -382 +382 @@
 
 /**
+ * Retrieves a specific recording stream of a recording context.
+ *
+ * @returns Pointer to recording stream if found, or NULL if not found.
+ * @param   pCtx                Recording context to look up stream for.
+ * @param   uScreen             Screen number of recording stream to look up.
+ */
+PVIDEORECSTREAM videoRecGetStream(PVIDEORECCONTEXT pCtx, uint32_t uScreen)
+{
+    AssertPtrReturn(pCtx, NULL);
+
+    PVIDEORECSTREAM pStream;
+
+    try
+    {
+        pStream = pCtx->vecStreams.at(uScreen);
+    }
+    catch (std::out_of_range &)
+    {
+        pStream = NULL;
+    }
+
+    return pStream;
+}
+
+/**
  * Checks if recording engine is ready to accept new recording data for a given screen.
  *
@@ -399 +424 @@
     bool fIsReady = false;
 
-    PVIDEORECSTREAM pStream = videoRecStreamGet(pCtx, uScreen);
+    PVIDEORECSTREAM pStream = videoRecGetStream(pCtx, uScreen);
     if (pStream)
     {
-        videoRecStreamLock(pStream);
+        VideoRecStreamLock(pStream);
         fIsReady = pStream->fEnabled;
-        videoRecStreamUnlock(pStream);
+        VideoRecStreamUnlock(pStream);
     }
 
@@ -438 +463 @@
 bool VideoRecIsLimitReached(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t tsNowMs)
 {
-    PVIDEORECSTREAM pStream = videoRecStreamGet(pCtx, uScreen);
+    PVIDEORECSTREAM pStream = videoRecGetStream(pCtx, uScreen);
     if (   !pStream
         || !pStream->fEnabled)
@@ -583 +608 @@
     AssertRC(rc);
 
-    PVIDEORECSTREAM pStream = videoRecStreamGet(pCtx, uScreen);
+    PVIDEORECSTREAM pStream = videoRecGetStream(pCtx, uScreen);
     if (!pStream)
     {
@@ -592 +617 @@
     }
 
-    videoRecStreamLock(pStream);
+    VideoRecStreamLock(pStream);
 
     PVIDEORECVIDEOFRAME pFrame = NULL;
@@ -801 +826 @@
         VideoRecVideoFrameFree(pFrame);
 
-    videoRecStreamUnlock(pStream);
+    VideoRecStreamUnlock(pStream);
 
     int rc2 = RTCritSectLeave(&pCtx->CritSect);

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

@@ -43 +43 @@
 
 /**
- * Retrieves a specific recording stream of a recording context.
- *
- * @returns Pointer to recording stream if found, or NULL if not found.
- * @param   pCtx                Recording context to look up stream for.
- * @param   uScreen             Screen number of recording stream to look up.
- */
-PVIDEORECSTREAM videoRecStreamGet(PVIDEORECCONTEXT pCtx, uint32_t uScreen)
-{
-    AssertPtrReturn(pCtx, NULL);
-
-    PVIDEORECSTREAM pStream;
-
-    try
-    {
-        pStream = pCtx->vecStreams.at(uScreen);
-    }
-    catch (std::out_of_range &)
-    {
-        pStream = NULL;
-    }
-
-    return pStream;
-}
-
-/**
  * Locks a recording stream.
  *
  * @param   pStream             Recording stream to lock.
  */
-void videoRecStreamLock(PVIDEORECSTREAM pStream)
+void VideoRecStreamLock(PVIDEORECSTREAM pStream)
 {
     int rc = RTCritSectEnter(&pStream->CritSect);
@@ -83 +58 @@
  * @param   pStream             Recording stream to unlock.
  */
-void videoRecStreamUnlock(PVIDEORECSTREAM pStream)
+void VideoRecStreamUnlock(PVIDEORECSTREAM pStream)
 {
     int rc = RTCritSectLeave(&pStream->CritSect);
@@ -96 +71 @@
  * @param   pCfg                Recording configuration to use.
  */
-int videoRecStreamOpen(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg)
+int VideoRecStreamOpen(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg)
 {
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
@@ -209 +184 @@
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
-    videoRecStreamLock(pStream);
+    VideoRecStreamLock(pStream);
 
     if (!pStream->fEnabled)
     {
-        videoRecStreamUnlock(pStream);
+        VideoRecStreamUnlock(pStream);
         return VINF_SUCCESS;
     }
@@ -247 +222 @@
                 if (RT_SUCCESS(rc))
                 {
-                    rc = videoRecStreamWriteVideoVPX(pStream, uTimeStampMs, pVideoFrame);
+                    rc = VideoRecStreamWriteVideoVPX(pStream, uTimeStampMs, pVideoFrame);
                 }
                 else
@@ -325 +300 @@
 #endif
 
-    videoRecStreamUnlock(pStream);
+    VideoRecStreamUnlock(pStream);
 
     return rc;
@@ -331 +306 @@
 
 /**
- * VideoRec utility function to initialize video recording context.
- *
- * @returns IPRT status code.
- * @param   pCtx                Pointer to video recording context.
+ * Initializes a recording stream.
+ *
+ * @returns IPRT status code.
+ * @param   pStream             Recording stream to initialize.
+ * @param   pCtx                Recording context to use for initialization.
  * @param   uScreen             Screen number to record.
  */
-int VideoRecStreamInit(PVIDEORECCONTEXT pCtx, uint32_t uScreen)
-{
-    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+int VideoRecStreamInit(PVIDEORECSTREAM pStream, PVIDEORECCONTEXT pCtx, uint32_t uScreen)
+{
+    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCtx,    VERR_INVALID_POINTER);
 
     PVIDEORECCFG pCfg = &pCtx->Cfg;
@@ -353 +330 @@
 #endif
 
-    PVIDEORECSTREAM pStream = videoRecStreamGet(pCtx, uScreen);
-    if (!pStream)
-        return VERR_NOT_FOUND;
-
-    int rc = videoRecStreamOpen(pStream, pCfg);
+    int rc = VideoRecStreamOpen(pStream, pCfg);
     if (RT_FAILURE(rc))
         return rc;
 
-    pStream->pCtx = pCtx;
-
     if (pCfg->Video.fEnabled)
-        rc = videoRecStreamInitVideo(pStream, pCfg);
+        rc = VideoRecStreamInitVideo(pStream, pCfg);
 
     switch (pStream->enmDst)
@@ -448 +419 @@
     if (RT_FAILURE(rc))
     {
-        int rc2 = videoRecStreamClose(pStream);
+        int rc2 = VideoRecStreamClose(pStream);
         AssertRC(rc2);
         return rc;
@@ -467 +438 @@
  *
  */
-int videoRecStreamClose(PVIDEORECSTREAM pStream)
+int VideoRecStreamClose(PVIDEORECSTREAM pStream)
 {
     int rc = VINF_SUCCESS;
@@ -548 +519 @@
  * @param   pStream             Recording stream to uninitialize.
  */
-int videoRecStreamUninit(PVIDEORECSTREAM pStream)
+int VideoRecStreamUninit(PVIDEORECSTREAM pStream)
 {
     int rc = VINF_SUCCESS;
@@ -554 +525 @@
     if (pStream->pCtx->Cfg.Video.fEnabled)
     {
-        int rc2 = videoRecStreamUnitVideo(pStream);
+        int rc2 = VideoRecStreamUnitVideo(pStream);
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -568 +539 @@
  * @param   pStream             Recording stream to uninitialize video recording for.
  */
-int videoRecStreamUnitVideo(PVIDEORECSTREAM pStream)
+int VideoRecStreamUnitVideo(PVIDEORECSTREAM pStream)
 {
 #ifdef VBOX_WITH_LIBVPX
     /* At the moment we only have VPX. */
-    return videoRecStreamUninitVideoVPX(pStream);
+    return VideoRecStreamUninitVideoVPX(pStream);
 #else
     return VERR_NOT_SUPPORTED;
@@ -585 +556 @@
  * @param   pStream             Recording stream to uninitialize VPX codec for.
  */
-int videoRecStreamUninitVideoVPX(PVIDEORECSTREAM pStream)
+int VideoRecStreamUninitVideoVPX(PVIDEORECSTREAM pStream)
 {
     vpx_img_free(&pStream->Video.Codec.VPX.RawImage);
@@ -602 +573 @@
  * @param   pCfg                Video recording configuration to use for initialization.
  */
-int videoRecStreamInitVideo(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg)
+int VideoRecStreamInitVideo(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg)
 {
 #ifdef VBOX_WITH_LIBVPX
     /* At the moment we only have VPX. */
-    return videoRecStreamInitVideoVPX(pStream, pCfg);
+    return VideoRecStreamInitVideoVPX(pStream, pCfg);
 #else
     return VERR_NOT_SUPPORTED;
@@ -620 +591 @@
  * @param   pCfg                Video recording configuration to use for initialization.
  */
-int videoRecStreamInitVideoVPX(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg)
+int VideoRecStreamInitVideoVPX(PVIDEORECSTREAM pStream, PVIDEORECCFG pCfg)
 {
     pStream->Video.uWidth                = pCfg->Video.uWidth;
@@ -687 +658 @@
  * @param   pFrame              Frame to encode and submit.
  */
-int videoRecStreamWriteVideoVPX(PVIDEORECSTREAM pStream, uint64_t uTimeStampMs, PVIDEORECVIDEOFRAME pFrame)
+int VideoRecStreamWriteVideoVPX(PVIDEORECSTREAM pStream, uint64_t uTimeStampMs, PVIDEORECVIDEOFRAME pFrame)
 {
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);