vbox的更動 45926 路徑 trunk/src/VBox/Main/src-client

時間撮記:

2013-5-6 下午08:26:43 (12 年 以前)

作者:

vboxsync

訊息:

IMachine::VideoCaptureFps

位置:

trunk/src/VBox/Main/src-client

檔案:

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

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

@@ -496 +496 @@
         ULONG ulRate;
         mParent->machine()->COMGETTER(VideoCaptureRate)(&ulRate);
+        ULONG ulFps;
+        mParent->machine()->COMGETTER(VideoCaptureFps)(&ulFps);
         BSTR strFile;
         mParent->machine()->COMGETTER(VideoCaptureFile)(&strFile);
-        if (VideoRecContextInit(mpVideoRecCtx, strFile, ulWidth, ulHeight, ulRate))
+        if (VideoRecContextInit(mpVideoRecCtx, strFile, ulWidth, ulHeight, ulRate, ulFps))
         {
             LogFlow(("Failed to initialize video recording context!\n"));

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

@@ -97 +97 @@
     /* pixel format of the current frame */
     uint32_t            u32PixelFormat;
+    /* maximum number of frames per second */
+    uint32_t            uDelay;
+    uint64_t            u64LastTimeStamp;
     /* time stamp of the current frame */
     uint64_t            u64TimeStamp;
@@ -426 +429 @@
  */
 int VideoRecContextInit(PVIDEORECCONTEXT pVideoRecCtx, com::Bstr strFile,
-                        uint32_t uWidth, uint32_t uHeight, uint32_t uRate)
+                        uint32_t uWidth, uint32_t uHeight, uint32_t uRate, uint32_t uFps)
 {
     pVideoRecCtx->uTargetWidth  = uWidth;
@@ -460 +463 @@
     /* disable multithreading */
     pVideoRecCtx->VpxConfig.g_threads = 0;
+    pVideoRecCtx->uDelay = 1000 / uFps;
 
     struct vpx_rational arg_framerate = {30, 1};
@@ -643 +647 @@
  * @param   uSourceHeight      Height of the source image (framebuffer).
  * @param   pu8BufAddr         Pointer to source image(framebuffer).
- * @param   u64TimeStamp       Time stamp.
+ * @param   u64TimeStamp       Time stamp (milliseconds).
  */
 int VideoRecCopyToIntBuf(PVIDEORECCONTEXT pVideoRecCtx, uint32_t x, uint32_t y,
@@ -653 +657 @@
     AssertReturn(uSourceWidth, VERR_INVALID_PARAMETER);
     AssertReturn(uSourceHeight, VERR_INVALID_PARAMETER);
+
+    if (u64TimeStamp < pVideoRecCtx->u64LastTimeStamp + pVideoRecCtx->uDelay)
+        return VINF_TRY_AGAIN;
+    pVideoRecCtx->u64LastTimeStamp = u64TimeStamp;
 
     if (ASMAtomicReadBool(&pVideoRecCtx->fRgbFilled))

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

@@ -24 +24 @@
 int  VideoRecContextCreate(PVIDEORECCONTEXT *ppVideoRecContext);
 int  VideoRecContextInit(PVIDEORECCONTEXT pVideoRecContext, com::Bstr mFileName,
-                         uint32_t uWidth, uint32_t uHeight, uint32_t uRate);
+                         uint32_t uWidth, uint32_t uHeight, uint32_t uRate, uint32_t uFps);
 void VideoRecContextClose(PVIDEORECCONTEXT pVideoRecContext);
 bool VideoRecIsEnabled(PVIDEORECCONTEXT pVideoRecContext);