Changeset 50315 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 4, 2014 7:58:15 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92031

Message:

Main: build fix for VBOX_WITH_VPX disabled

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (3 diffs)
• src-client/DisplayImpl.cpp (modified) (6 diffs)

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

@@ -168 +168 @@
 #endif
 #ifdef VBOX_WITH_CRHGSMI
-    int handleCrCmdNotifyCmds();
+    int  handleCrCmdNotifyCmds();
     void handleCrHgsmiCommandProcess(PVBOXVDMACMD_CHROMIUM_CMD pCmd, uint32_t cbCmd);
     void handleCrHgsmiControlProcess(PVBOXVDMACMD_CHROMIUM_CTL pCtl, uint32_t cbCtl);
@@ -179 +179 @@
     void  handleCrAsyncCmdCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam);
     void  handleCrVRecScreenshotPerform(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 u64TimeStamp);
+                                        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 u64TimeStamp);
     bool handleCrVRecScreenshotBegin(uint32_t uScreen, uint64_t u64TimeStamp);
     void handleCrVRecScreenshotEnd(uint32_t uScreen, uint64_t u64TimeStamp);
-    void  handleVRecCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext);
+    void handleVRecCompletion(int32_t result, uint32_t u32Function, PVBOXHGCMSVCPARM pParam, void *pvContext);
 #endif
 
@@ -286 +286 @@
 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
     static DECLCALLBACK(void) displayCrVRecScreenshotPerform(void *pvCtx, uint32_t uScreen,
-                    uint32_t x, uint32_t y, uint32_t uBitsPerPixel,
-                    uint32_t uBytesPerLine, uint32_t uGuestWidth, uint32_t uGuestHeight,
-                    uint8_t *pu8BufferAddress, uint64_t u64TimeStamp);
+                                                             uint32_t x, uint32_t y,
+                                                             uint32_t uBitsPerPixel, uint32_t uBytesPerLine,
+                                                             uint32_t uGuestWidth, uint32_t uGuestHeight,
+                                                             uint8_t *pu8BufferAddress, uint64_t u64TimeStamp);
     static DECLCALLBACK(bool) displayCrVRecScreenshotBegin(void *pvCtx, uint32_t uScreen, uint64_t u64TimeStamp);
     static DECLCALLBACK(void) displayCrVRecScreenshotEnd(void *pvCtx, uint32_t uScreen, uint64_t u64TimeStamp);

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

@@ -3678 +3678 @@
     {
         do {
-#if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
+# if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
             BOOL is3denabled;
             pDisplay->mParent->machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled);
@@ -3718 +3718 @@
                 }
             }
-#endif
+# endif /* VBOX_WITH_HGCM && VBOX_WITH_CROGL */
+
             uint64_t u64Now = RTTimeProgramMilliTS();
             for (uScreenId = 0; uScreenId < pDisplay->mcMonitors; uScreenId++)
@@ -3755 +3756 @@
         } while (0);
     }
-#endif
+#endif /* VBOX_WITH_VPX */
 
 #ifdef DEBUG_sunlover
@@ -4209 +4210 @@
 bool  Display::handleCrVRecScreenshotBegin(uint32_t uScreen, uint64_t u64TimeStamp)
 {
+# if VBOX_WITH_VPX
     return VideoRecIsReady(mpVideoRecCtx, uScreen, u64TimeStamp);
+# else
+    return false;
+# endif
 }
 
@@ -4217 +4222 @@
 
 void  Display::handleCrVRecScreenshotPerform(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 u64TimeStamp)
+                                             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 u64TimeStamp)
 {
     Assert(mfCrOglVideoRecState == CRVREC_STATE_SUBMITTED);
+# if VBOX_WITH_VPX
     int rc = VideoRecCopyToIntBuf(mpVideoRecCtx, uScreen, x, y,
-                              uPixelFormat,
-                              uBitsPerPixel, uBytesPerLine,
-                              uGuestWidth, uGuestHeight,
-                              pu8BufferAddress, u64TimeStamp);
-    Assert(rc == VINF_SUCCESS/* || rc == VERR_TRY_AGAIN || rc == VINF_TRY_AGAIN*/);
+                                  uPixelFormat,
+                                  uBitsPerPixel, uBytesPerLine,
+                                  uGuestWidth, uGuestHeight,
+                                  pu8BufferAddress, u64TimeStamp);
+    Assert(rc == VINF_SUCCESS /* || rc == VERR_TRY_AGAIN || rc == VINF_TRY_AGAIN*/);
+# endif
 }
 
@@ -4237 +4245 @@
 
 DECLCALLBACK(void) Display::displayCrVRecScreenshotPerform(void *pvCtx, uint32_t uScreen,
-                uint32_t x, uint32_t y, uint32_t uBitsPerPixel,
-                uint32_t uBytesPerLine, uint32_t uGuestWidth, uint32_t uGuestHeight,
-                uint8_t *pu8BufferAddress, uint64_t u64TimeStamp)
+                                                           uint32_t x, uint32_t y,
+                                                           uint32_t uBitsPerPixel, uint32_t uBytesPerLine,
+                                                           uint32_t uGuestWidth, uint32_t uGuestHeight,
+                                                           uint8_t *pu8BufferAddress, uint64_t u64TimeStamp)
 {
     Display *pDisplay = (Display *)pvCtx;
     pDisplay->handleCrVRecScreenshotPerform(uScreen,
-            x, y, FramebufferPixelFormat_FOURCC_RGB, uBitsPerPixel,
-            uBytesPerLine, uGuestWidth, uGuestHeight,
-            pu8BufferAddress, u64TimeStamp);
+                                            x, y, FramebufferPixelFormat_FOURCC_RGB, uBitsPerPixel,
+                                            uBytesPerLine, uGuestWidth, uGuestHeight,
+                                            pu8BufferAddress, u64TimeStamp);
 }