儲存庫 vbox 的更動 65412

時間撮記:

2017-1-24 上午10:20:58 (8 年 以前)

作者:

vboxsync

訊息:

VideoRec: Renaming.

位置:

trunk/src/VBox/Main/src-client

檔案:

• DisplayImpl.cpp (修改) (3 筆差異)
• VideoRec.cpp (修改) (13 筆差異)
• VideoRec.h (修改) (1 筆差異)

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

@@ -2301 +2301 @@
         return VINF_SUCCESS;
 
-    return VideoRecSendAudio(mpVideoRecCtx, pvData, cbData, uTimestampMs);
+    return VideoRecSendAudioFrame(mpVideoRecCtx, pvData, cbData, uTimestampMs);
 #else
     RT_NOREF(pvData, cbData, uTimestampMs);
@@ -3241 +3241 @@
                                                                     &bitmapFormat);
                         if (SUCCEEDED(hr) && pbAddress)
-                            rc = VideoRecCopyToIntBuf(pDisplay->mpVideoRecCtx, uScreenId, 0, 0,
-                                                      BitmapFormat_BGR,
-                                                      ulBitsPerPixel, ulBytesPerLine, ulWidth, ulHeight,
-                                                      pbAddress, u64Now);
+                            rc = VideoRecSendVideoFrame(pDisplay->mpVideoRecCtx, uScreenId, 0, 0,
+                                                        BitmapFormat_BGR,
+                                                        ulBitsPerPixel, ulBytesPerLine, ulWidth, ulHeight,
+                                                        pbAddress, u64Now);
                         else
                             rc = VERR_NOT_SUPPORTED;
@@ -3629 +3629 @@
     Assert(mfCrOglVideoRecState == CRVREC_STATE_SUBMITTED);
 # ifdef VBOX_WITH_VIDEOREC
-    int rc = VideoRecCopyToIntBuf(mpVideoRecCtx, uScreen, x, y,
-                                  uPixelFormat,
-                                  uBitsPerPixel, uBytesPerLine,
-                                  uGuestWidth, uGuestHeight,
-                                  pu8BufferAddress, u64Timestamp);
+    int rc = VideoRecSendVideoFrame(mpVideoRecCtx, uScreen, x, y,
+                                    uPixelFormat,
+                                    uBitsPerPixel, uBytesPerLine,
+                                    uGuestWidth, uGuestHeight,
+                                    pu8BufferAddress, u64Timestamp);
     NOREF(rc);
     Assert(rc == VINF_SUCCESS /* || rc == VERR_TRY_AGAIN || rc == VINF_TRY_AGAIN*/);

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

@@ -119 +119 @@
     uint16_t            uScreen;
     /** Target X resolution (in pixels). */
-    uint32_t            uTargetWidth;
+    uint32_t            uDstWidth;
     /** Target Y resolution (in pixels). */
-    uint32_t            uTargetHeight;
+    uint32_t            uDstHeight;
     /** X resolution of the last encoded frame. */
-    uint32_t            uLastSourceWidth;
+    uint32_t            uSrcLastWidth;
     /** Y resolution of the last encoded frame. */
-    uint32_t            uLastSourceHeight;
+    uint32_t            uSrcLastHeight;
     /** Current frame number. */
     uint64_t            cFrame;
@@ -699 +699 @@
     pCtx->uMaxSizeMB = uMaxSizeMB;
 
-    pStream->uTargetWidth  = uWidth;
-    pStream->uTargetHeight = uHeight;
+    pStream->uDstWidth  = uWidth;
+    pStream->uDstHeight = uHeight;
     pStream->pu8RgbBuf = (uint8_t *)RTMemAllocZ(uWidth * uHeight * 4);
     AssertReturn(pStream->pu8RgbBuf, VERR_NO_MEMORY);
@@ -1013 +1013 @@
         case VIDEORECPIXELFMT_RGB32:
             LogFlow(("32 bit\n"));
-            if (!colorConvWriteYUV420p<ColorConvBGRA32Iter>(pStrm->uTargetWidth,
-                                                            pStrm->uTargetHeight,
+            if (!colorConvWriteYUV420p<ColorConvBGRA32Iter>(pStrm->uDstWidth,
+                                                            pStrm->uDstHeight,
                                                             pStrm->pu8YuvBuf,
                                                             pStrm->pu8RgbBuf))
@@ -1021 +1021 @@
         case VIDEORECPIXELFMT_RGB24:
             LogFlow(("24 bit\n"));
-            if (!colorConvWriteYUV420p<ColorConvBGR24Iter>(pStrm->uTargetWidth,
-                                                           pStrm->uTargetHeight,
+            if (!colorConvWriteYUV420p<ColorConvBGR24Iter>(pStrm->uDstWidth,
+                                                           pStrm->uDstHeight,
                                                            pStrm->pu8YuvBuf,
                                                            pStrm->pu8RgbBuf))
@@ -1029 +1029 @@
         case VIDEORECPIXELFMT_RGB565:
             LogFlow(("565 bit\n"));
-            if (!colorConvWriteYUV420p<ColorConvBGR565Iter>(pStrm->uTargetWidth,
-                                                            pStrm->uTargetHeight,
+            if (!colorConvWriteYUV420p<ColorConvBGR565Iter>(pStrm->uDstWidth,
+                                                            pStrm->uDstHeight,
                                                             pStrm->pu8YuvBuf,
                                                             pStrm->pu8RgbBuf))
@@ -1041 +1041 @@
 }
 
-int VideoRecSendAudio(PVIDEORECCONTEXT pCtx, const void *pvData, size_t cbData, uint64_t uTimestampMs)
+int VideoRecSendAudioFrame(PVIDEORECCONTEXT pCtx, const void *pvData, size_t cbData, uint64_t uTimestampMs)
 {
     RT_NOREF(pCtx, pvData, cbData, uTimestampMs);
@@ -1061 +1061 @@
  * @param   uBitsPerPixel      Bits Per Pixel
  * @param   uBytesPerLine      Bytes per source scanlineName.
- * @param   uSourceWidth       Width of the source image (framebuffer).
- * @param   uSourceHeight      Height of the source image (framebuffer).
- * @param   pu8BufAddr         Pointer to source image(framebuffer).
+ * @param   uSrcWidth          Width of the source frame.
+ * @param   uSrcHeight         Height of the source frame.
+ * @param   puSrcData          Pointer to source frame data.
  * @param   u64TimeStampMs     Time stamp (in ms).
  */
-int VideoRecCopyToIntBuf(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint32_t x, uint32_t y,
-                         uint32_t uPixelFormat, uint32_t uBitsPerPixel, uint32_t uBytesPerLine,
-                         uint32_t uSourceWidth, uint32_t uSourceHeight, uint8_t *pu8BufAddr,
-                         uint64_t uTimeStampMs)
+int VideoRecSendVideoFrame(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint32_t x, uint32_t y,
+                           uint32_t uPixelFormat, uint32_t uBitsPerPixel, uint32_t uBytesPerLine,
+                           uint32_t uSrcWidth, uint32_t uSrcHeight, uint8_t *puSrcData,
+                           uint64_t uTimeStampMs)
 {
     /* Do not execute during termination and guard against termination */
@@ -1078 +1078 @@
     do
     {
-        AssertPtrBreakStmt(pCtx,       rc = VERR_INVALID_POINTER);
-        AssertPtrBreakStmt(pu8BufAddr, rc = VERR_INVALID_POINTER);
-        AssertBreakStmt(uSourceWidth,  rc = VERR_INVALID_PARAMETER);
-        AssertBreakStmt(uSourceHeight, rc = VERR_INVALID_PARAMETER);
+        AssertPtrBreakStmt(pCtx,      rc = VERR_INVALID_POINTER);
+        AssertBreakStmt(uSrcWidth,    rc = VERR_INVALID_PARAMETER);
+        AssertBreakStmt(uSrcHeight,   rc = VERR_INVALID_PARAMETER);
+        AssertPtrBreakStmt(puSrcData, rc = VERR_INVALID_POINTER);
 
         PVIDEORECSTREAM pStream = videoRecStreamGet(pCtx, uScreen);
@@ -1108 +1108 @@
         pStream->uLastTimeStampMs = uTimeStampMs;
 
-        int xDiff = ((int)pStream->uTargetWidth - (int)uSourceWidth) / 2;
-        uint32_t w = uSourceWidth;
+        int xDiff = ((int)pStream->uDstWidth - (int)uSrcWidth) / 2;
+        uint32_t w = uSrcWidth;
         if ((int)w + xDiff + (int)x <= 0)  /* nothing visible */
         {
@@ -1126 +1126 @@
             destX = x + xDiff;
 
-        uint32_t h = uSourceHeight;
-        int yDiff = ((int)pStream->uTargetHeight - (int)uSourceHeight) / 2;
+        uint32_t h = uSrcHeight;
+        int yDiff = ((int)pStream->uDstHeight - (int)uSrcHeight) / 2;
         if ((int)h + yDiff + (int)y <= 0)  /* nothing visible */
         {
@@ -1144 +1144 @@
             destY = y + yDiff;
 
-        if (   destX > pStream->uTargetWidth
-            || destY > pStream->uTargetHeight)
+        if (   destX > pStream->uDstWidth
+            || destY > pStream->uDstHeight)
         {
             rc = VERR_INVALID_PARAMETER;  /* nothing visible */
@@ -1151 +1151 @@
         }
 
-        if (destX + w > pStream->uTargetWidth)
-            w = pStream->uTargetWidth - destX;
-
-        if (destY + h > pStream->uTargetHeight)
-            h = pStream->uTargetHeight - destY;
+        if (destX + w > pStream->uDstWidth)
+            w = pStream->uDstWidth - destX;
+
+        if (destY + h > pStream->uDstHeight)
+            h = pStream->uDstHeight - destY;
 
         /* Calculate bytes per pixel */
@@ -1185 +1185 @@
         /* One of the dimensions of the current frame is smaller than before so
          * clear the entire buffer to prevent artifacts from the previous frame */
-        if (   uSourceWidth  < pStream->uLastSourceWidth
-            || uSourceHeight < pStream->uLastSourceHeight)
-            memset(pStream->pu8RgbBuf, 0, pStream->uTargetWidth * pStream->uTargetHeight * 4);
-
-        pStream->uLastSourceWidth  = uSourceWidth;
-        pStream->uLastSourceHeight = uSourceHeight;
+        if (   uSrcWidth  < pStream->uSrcLastWidth
+            || uSrcHeight < pStream->uSrcLastHeight)
+            memset(pStream->pu8RgbBuf, 0, pStream->uDstWidth * pStream->uDstHeight * 4);
+
+        pStream->uSrcLastWidth  = uSrcWidth;
+        pStream->uSrcLastHeight = uSrcHeight;
 
         /* Calculate start offset in source and destination buffers */
         uint32_t offSrc = y * uBytesPerLine + x * bpp;
-        uint32_t offDst = (destY * pStream->uTargetWidth + destX) * bpp;
+        uint32_t offDst = (destY * pStream->uDstWidth + destX) * bpp;
         /* do the copy */
         for (unsigned int i = 0; i < h; i++)
         {
             /* Overflow check */
-            Assert(offSrc + w * bpp <= uSourceHeight * uBytesPerLine);
-            Assert(offDst + w * bpp <= pStream->uTargetHeight * pStream->uTargetWidth * bpp);
-            memcpy(pStream->pu8RgbBuf + offDst, pu8BufAddr + offSrc, w * bpp);
+            Assert(offSrc + w * bpp <= uSrcHeight * uBytesPerLine);
+            Assert(offDst + w * bpp <= pStream->uDstHeight * pStream->uDstWidth * bpp);
+            memcpy(pStream->pu8RgbBuf + offDst, puSrcData + offSrc, w * bpp);
             offSrc += uBytesPerLine;
-            offDst += pStream->uTargetWidth * bpp;
+            offDst += pStream->uDstWidth * bpp;
         }
 

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

@@ -33 +33 @@
 
 bool VideoRecIsEnabled(PVIDEORECCONTEXT pCtx);
-int  VideoRecSendAudio(PVIDEORECCONTEXT pCtx, const void *pvData, size_t cbData, uint64_t uTimestampMs);
-int  VideoRecCopyToIntBuf(PVIDEORECCONTEXT pCtx, uint32_t uScreen,
-                          uint32_t x, uint32_t y, uint32_t uPixelFormat, uint32_t uBitsPerPixel,
-                          uint32_t uBytesPerLine, uint32_t uGuestWidth, uint32_t uGuestHeight,
-                          uint8_t *pu8BufferAddress, uint64_t u64TimeStampMs);
+int  VideoRecSendAudioFrame(PVIDEORECCONTEXT pCtx, const void *pvData, size_t cbData, uint64_t uTimestampMs);
+int  VideoRecSendVideoFrame(PVIDEORECCONTEXT pCtx, uint32_t uScreen,
+                            uint32_t x, uint32_t y, uint32_t uPixelFormat, uint32_t uBitsPerPixel,
+                            uint32_t uBytesPerLine, uint32_t uGuestWidth, uint32_t uGuestHeight,
+                            uint8_t *pu8BufferAddress, uint64_t u64TimeStampMs);
 bool VideoRecIsReady(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t u64TimeStampMs);
 bool VideoRecLimitReached(PVIDEORECCONTEXT pCtx, uint32_t uScreen, uint64_t u64TimeStampMs);