Changeset 74984 in vbox for trunk/src/VBox

Timestamp:

Oct 22, 2018 8:33:59 PM (6 years ago)

Author:

vboxsync

Message:

VideoRec/Main: Moved the video codec's pointer to the YUV plane into its according struct.

File:

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

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

@@ -106 +106 @@
             /** VPX image context. */
             vpx_image_t         RawImage;
+            /** Pointer to the codec's internal YUV buffer. */
+            uint8_t            *pu8YuvBuf;
         } VPX;
 #endif /* VBOX_WITH_LIBVPX */
@@ -293 +295 @@
         /** Time stamp (in ms) of the last video frame we encoded. */
         uint64_t            uLastTimeStampMs;
-        /** Pointer to the codec's internal YUV buffer. */
-        uint8_t            *pu8YuvBuf;
         /** Number of failed attempts to encode the current video frame in a row. */
         uint16_t            cFailedEncodingFrames;
@@ -753 +753 @@
                     AssertPtr(pBlock);
 
+#ifdef VBOX_WITH_LIBVPX
                     if (pBlock->enmType == VIDEORECBLOCKTYPE_VIDEO)
                     {
@@ -759 +760 @@
                         rc = videoRecRGBToYUV(pVideoFrame->uPixelFormat,
                                               /* Destination */
-                                              pStream->Video.pu8YuvBuf, pVideoFrame->uWidth, pVideoFrame->uHeight,
+                                              pStream->Video.Codec.VPX.pu8YuvBuf, pVideoFrame->uWidth, pVideoFrame->uHeight,
                                               /* Source */
                                               pVideoFrame->pu8RGBBuf, pStream->Video.uWidth, pStream->Video.uHeight);
@@ -765 +766 @@
                             rc = videoRecEncodeAndWrite(pStream, uTimeStampMs, pVideoFrame);
                     }
-
+#endif
                     videoRecBlockFree(pBlock);
                     pBlock = NULL;
@@ -1414 +1415 @@
 
     /* Save a pointer to the first raw YUV plane. */
-    pStream->Video.pu8YuvBuf = pVC->VPX.RawImage.planes[0];
+    pStream->Video.Codec.VPX.pu8YuvBuf = pVC->VPX.RawImage.planes[0];
 #endif
     pStream->fEnabled = true;