Changeset 65175 in vbox for trunk

Timestamp:

Jan 6, 2017 10:04:49 AM (8 years ago)

Author:

vboxsync

Message:

VideoRec: cScreens not not needed anymore; covered by the vector now, renaming.

File:

• trunk/src/VBox/Main/src-client/VideoRec.cpp (modified) (12 diffs)

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

@@ -121 +121 @@
     /** Worker thread. */
     RTTHREAD            Thread;
-    /** Number of stream contexts */
-    uint32_t            cScreens;
     /** Maximal time stamp. */
     uint64_t            u64MaxTimeStamp;
@@ -128 +126 @@
     uint32_t            uMaxFileSize;
     /** Vector of current video recording stream contexts. */
-    VideoRecStreams     lstStreams;
+    VideoRecStreams     vecStreams;
 } VIDEORECCONTEXT, *PVIDEORECCONTEXT;
 
@@ -412 +410 @@
             break;
 
-        for (VideoRecStreams::iterator it = pCtx->lstStreams.begin(); it != pCtx->lstStreams.end(); it++)
+        for (VideoRecStreams::iterator it = pCtx->vecStreams.begin(); it != pCtx->vecStreams.end(); it++)
         {
             PVIDEORECSTREAM pStream = (*it);
@@ -473 +471 @@
         try
         {
-            pCtx->lstStreams.push_back(pStream);
+            pCtx->vecStreams.push_back(pStream);
 
             pStream->pEBML = new WebMWriter();
@@ -486 +484 @@
     if (RT_SUCCESS(rc))
     {
-        pCtx->cScreens = cScreens;
-
         rc = RTSemEventCreate(&pCtx->WaitEvent);
         AssertRCReturn(rc, rc);
@@ -506 +502 @@
     {
         /* Roll back allocations on error. */
-        VideoRecStreams::iterator it = pCtx->lstStreams.begin();
-        while (it != pCtx->lstStreams.end())
+        VideoRecStreams::iterator it = pCtx->vecStreams.begin();
+        while (it != pCtx->vecStreams.end())
         {
             PVIDEORECSTREAM pStream = (*it);
@@ -517 +513 @@
             pStream = NULL;
 
-            it = pCtx->lstStreams.erase(it);
-        }
-
-        Assert(pCtx->lstStreams.empty());
+            it = pCtx->vecStreams.erase(it);
+        }
+
+        Assert(pCtx->vecStreams.empty());
     }
 
@@ -557 +553 @@
     RTSemEventDestroy(pCtx->TermEvent);
 
-    for (VideoRecStreams::iterator it = pCtx->lstStreams.begin(); it != pCtx->lstStreams.end(); it++)
+    for (VideoRecStreams::iterator it = pCtx->vecStreams.begin(); it != pCtx->vecStreams.end(); it++)
     {
         PVIDEORECSTREAM pStream = (*it);
@@ -607 +603 @@
                        uint32_t uMaxTime, uint32_t uMaxFileSize, const char *pszOptions)
 {
-    AssertPtrReturn(pCtx,                  VERR_INVALID_PARAMETER);
-    AssertReturn(uScreen < pCtx->cScreens, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pCtx,                           VERR_INVALID_PARAMETER);
+    AssertReturn(uScreen < pCtx->vecStreams.size(), VERR_INVALID_PARAMETER);
 
     pCtx->u64MaxTimeStamp = (uMaxTime > 0 ? RTTimeProgramMilliTS() + uMaxTime * 1000 : 0);
     pCtx->uMaxFileSize = uMaxFileSize;
 
-    PVIDEORECSTREAM pStream = pCtx->lstStreams.at(uScreen);
+    PVIDEORECSTREAM pStream = pCtx->vecStreams.at(uScreen);
 
     pStream->uTargetWidth  = uWidth;
@@ -738 +734 @@
         return false;
 
-    PVIDEORECSTREAM pStream = pCtx->lstStreams.at(uScreen);
+    PVIDEORECSTREAM pStream = pCtx->vecStreams.at(uScreen);
     if (!pStream->fEnabled)
         return false;
@@ -763 +759 @@
 bool VideoRecIsFull(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t u64TimeStamp)
 {
-    PVIDEORECSTREAM pStream = pCtx->lstStreams.at(uScreen);
+    PVIDEORECSTREAM pStream = pCtx->vecStreams.at(uScreen);
     if(!pStream->fEnabled)
         return false;
@@ -902 +898 @@
     do
     {
-        AssertPtrBreakStmt(pu8BufAddr, rc = VERR_INVALID_PARAMETER);
-        AssertBreakStmt(uSourceWidth, rc = VERR_INVALID_PARAMETER);
-        AssertBreakStmt(uSourceHeight, rc = VERR_INVALID_PARAMETER);
-        AssertBreakStmt(uScreen < pCtx->cScreens, rc = VERR_INVALID_PARAMETER);
-
-        PVIDEORECSTREAM pStream = pCtx->lstStreams.at(uScreen);
+        AssertPtrBreakStmt(pu8BufAddr,                     rc = VERR_INVALID_PARAMETER);
+        AssertBreakStmt(uSourceWidth,                      rc = VERR_INVALID_PARAMETER);
+        AssertBreakStmt(uSourceHeight,                     rc = VERR_INVALID_PARAMETER);
+        AssertBreakStmt(uScreen < pCtx->vecStreams.size(), rc = VERR_INVALID_PARAMETER);
+
+        PVIDEORECSTREAM pStream = pCtx->vecStreams.at(uScreen);
         if (!pStream->fEnabled)
         {