vbox的更動 45941 路徑 trunk/src/VBox/Main/src-client/VideoRec.cpp

時間撮記:

2013-5-8 上午08:47:02 (12 年 以前)

作者:

vboxsync

訊息:

Main/VPX: some code restructuring to be able to log errors / success during initialization

檔案:

• trunk/src/VBox/Main/src-client/VideoRec.cpp (修改) (7 筆差異)

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

@@ -39 +39 @@
 static int videoRecEncodeAndWrite(PVIDEORECCONTEXT pVideoRecCtx);
 static int videoRecRGBToYUV(PVIDEORECCONTEXT pVideoRecCtx);
-
-/* RGB buffer */
-enum
-{
-    /* RGB buffer empty */
-    VIDREC_RGB_EMPTY = 0,
-    /* RGB buffer filled */
-    VIDREC_RGB_FILLED
-};
 
 /* encoding */
@@ -97 +88 @@
     /* pixel format of the current frame */
     uint32_t            u32PixelFormat;
-    /* maximum number of frames per second */
+    /* minimal delay between two frames */
     uint32_t            uDelay;
+    /* time stamp of the last frame we encoded */
     uint64_t            u64LastTimeStamp;
     /* time stamp of the current frame */
@@ -428 +420 @@
  * @param   uTargetHeight       Height of the target image in video recording file.
  */
-int VideoRecContextInit(PVIDEORECCONTEXT pVideoRecCtx, com::Bstr strFile,
+int VideoRecContextInit(PVIDEORECCONTEXT pVideoRecCtx, const char *pszFile,
                         uint32_t uWidth, uint32_t uHeight, uint32_t uRate, uint32_t uFps)
 {
@@ -436 +428 @@
     AssertReturn(pVideoRecCtx->pu8RgbBuf, VERR_NO_MEMORY);
 
-    int rc = RTFileOpen(&pVideoRecCtx->ebml.file,
-                        com::Utf8Str(strFile).c_str(),
+    int rc = RTFileOpen(&pVideoRecCtx->ebml.file, pszFile,
                         RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_NONE);
     if (RT_FAILURE(rc))
     {
-        LogFlow(("Failed to open the output File \n"));
-        return VERR_GENERAL_FAILURE;
+        LogFlow(("Failed to open the output File\n"));
+        return rc;
     }
 
@@ -448 +439 @@
     if (rcv != VPX_CODEC_OK)
     {
-        LogFlow(("Failed to configure codec \n", vpx_codec_err_to_string(rcv)));
-        return VERR_GENERAL_FAILURE;
+        LogFlow(("Failed to configure codec\n", vpx_codec_err_to_string(rcv)));
+        return rc;
     }
 
@@ -487 +478 @@
     pVideoRecCtx->pu8YuvBuf = pVideoRecCtx->VpxRawImage.planes[0];
 
-    int vrc = RTSemEventCreate(&pVideoRecCtx->WaitEvent);
-    AssertRCReturn(vrc, vrc);
-
-    vrc = RTThreadCreate(&pVideoRecCtx->Thread, VideoRecThread,
-                         (void*)pVideoRecCtx, 0,
-                         RTTHREADTYPE_MAIN_WORKER, 0, "VideoRec");
-    AssertRCReturn(vrc, vrc);
+    rc = RTSemEventCreate(&pVideoRecCtx->WaitEvent);
+    AssertRCReturn(rc, rc);
+
+    rc = RTThreadCreate(&pVideoRecCtx->Thread, VideoRecThread,
+                        (void*)pVideoRecCtx, 0,
+                        RTTHREADTYPE_MAIN_WORKER, 0, "VideoRec");
+    AssertRCReturn(rc, rc);
 
     pVideoRecCtx->fEnabled = true;
@@ -542 +533 @@
 bool VideoRecIsEnabled(PVIDEORECCONTEXT pVideoRecCtx)
 {
-    AssertPtr(pVideoRecCtx);
+    if (!pVideoRecCtx)
+        return false;
+
     return pVideoRecCtx->fEnabled;
 }