Changeset 42341 in vbox

Timestamp:

Jul 24, 2012 9:35:00 AM (13 years ago)

Author:

vboxsync

Message:

VBoxHeadless: bogus assertion and a few style fixes

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.cpp

@@ -44 +44 @@
  */
 extern "C" DECLEXPORT(HRESULT) VBoxRegisterFFmpegFB(ULONG width,
-                                     ULONG height, ULONG bitrate,
-                                     com::Bstr filename,
-                                     IFramebuffer **retVal)
+                                                    ULONG height, ULONG bitrate,
+                                                    com::Bstr filename,
+                                                    IFramebuffer **retVal)
 {
     Log2(("VBoxRegisterFFmpegFB: called\n"));
@@ -110 +110 @@
     /* For temporary RGB frame we allocate enough memory to deal with
        RGB16 to RGB32 */
-    mTempRGBBuffer = reinterpret_cast<uint8_t *>(malloc(cPixels * 4));
-    if (mTempRGBBuffer == 0)
+    mTempRGBBuffer = reinterpret_cast<uint8_t *>(RTMemAlloc(cPixels * 4));
+    if (!mTempRGBBuffer)
         goto nomem_temp_rgb_buffer;
-    mYUVBuffer = reinterpret_cast<uint8_t *>(malloc(mYUVFrameSize));
-    if (mYUVBuffer == 0)
+    mYUVBuffer = reinterpret_cast<uint8_t *>(RTMemAlloc(mYUVFrameSize));
+    if (!mYUVBuffer)
         goto nomem_yuv_buffer;
     return;
@@ -121 +121 @@
 nomem_yuv_buffer:
     Log(("Failed to allocate memory for mYUVBuffer\n"));
-    free(mYUVBuffer);
+    RTMemFree(mYUVBuffer);
 nomem_temp_rgb_buffer:
     Log(("Failed to allocate memory for mTempRGBBuffer\n"));
-    free(mTempRGBBuffer);
+    RTMemFree(mTempRGBBuffer);
     mOutOfMemory = true;
 #else
@@ -133 +133 @@
        RGB16 to RGB32 */
     mTempRGBBuffer = reinterpret_cast<uint8_t *>(av_malloc(cPixels * 4));
-    if (mTempRGBBuffer == 0)
+    if (!mTempRGBBuffer)
         goto nomem_temp_rgb_buffer;
     mYUVBuffer = reinterpret_cast<uint8_t *>(av_malloc(mYUVFrameSize));
-    if (mYUVBuffer == 0)
+    if (!mYUVBuffer)
         goto nomem_yuv_buffer;
     mFrame = avcodec_alloc_frame();
-    if (mFrame == 0)
+    if (!mFrame)
         goto nomem_mframe;
     mOutBuf = reinterpret_cast<uint8_t *>(av_malloc(mYUVFrameSize * 2));
-    if (mOutBuf == 0)
+    if (!mOutBuf)
         goto nomem_moutbuf;
 
@@ -189 +189 @@
 
     /* We have already freed the stream above */
-    if (mTempRGBBuffer != 0)
-        free(mTempRGBBuffer);
-    if (mYUVBuffer != 0)
-        free(mYUVBuffer);
-    if (mRGBBuffer != 0)
+    if (mTempRGBBuffer)
+        RTMemFree(mTempRGBBuffer);
+    if (mYUVBuffer)
+        RTMemFree(mYUVBuffer);
+    if (mRGBBuffer)
         RTMemFree(mRGBBuffer);
 #else
@@ -232 +232 @@
     /* We have already freed the stream above */
     mpStream = 0;
-    if (mTempRGBBuffer != 0)
+    if (mTempRGBBuffer)
         av_free(mTempRGBBuffer);
-    if (mYUVBuffer != 0)
+    if (mYUVBuffer)
         av_free(mYUVBuffer);
-    if (mFrame != 0)
+    if (mFrame)
         av_free(mFrame);
-    if (mOutBuf != 0)
+    if (mOutBuf)
         av_free(mOutBuf);
-    if (mRGBBuffer != 0)
+    if (mRGBBuffer)
         RTMemFree(mRGBBuffer);
 #endif
@@ -1109 +1109 @@
     if (mYUVBuffer != NULL)
     {
-        AssertReturn(VpxRawImage.w*VpxRawImage.h*3/2 <= sizeof(mYUVFrameSize), E_UNEXPECTED);
+// BOGUS! AssertReturn(VpxRawImage.w*VpxRawImage.h*3/2 <= sizeof(mYUVFrameSize), E_UNEXPECTED);
         memcpy(VpxRawImage.planes[0], (uint8_t *)mYUVBuffer, VpxRawImage.w*VpxRawImage.h*3/2);
     }