儲存庫 vbox 的更動 63169

時間撮記:

2016-8-8 下午02:34:15 (8 年 以前)

作者:

vboxsync

訊息:

colorConvWriteYUV420p: Hope asserting on getRGB failure is ok, make MSC happier wrt variable initialization state. (Also avoid two unnecessary test/jcc instructions in debug builds.)

檔案:

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

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

@@ -290 +290 @@
  */
 template <class T>
-inline bool colorConvWriteYUV420p(unsigned aWidth, unsigned aHeight,
-                                  uint8_t *aDestBuf, uint8_t *aSrcBuf)
-{
-    AssertReturn(0 == (aWidth & 1), false);
-    AssertReturn(0 == (aHeight & 1), false);
-    bool rc = true;
+inline bool colorConvWriteYUV420p(unsigned aWidth, unsigned aHeight, uint8_t *aDestBuf, uint8_t *aSrcBuf)
+{
+    AssertReturn(!(aWidth & 1), false);
+    AssertReturn(!(aHeight & 1), false);
+    bool fRc = true;
     T iter1(aWidth, aHeight, aSrcBuf);
     T iter2 = iter1;
@@ -303 +302 @@
     unsigned offU = cPixels;
     unsigned offV = cPixels + cPixels / 4;
-    for (unsigned i = 0; (i < aHeight / 2) && rc; ++i)
-    {
-        for (unsigned j = 0; (j < aWidth / 2) && rc; ++j)
-        {
-            unsigned red, green, blue, u, v;
-            rc = iter1.getRGB(&red, &green, &blue);
-            if (rc)
-            {
-                aDestBuf[offY] = ((66 * red + 129 * green + 25 * blue + 128) >> 8) + 16;
-                u = (((-38 * red - 74 * green + 112 * blue + 128) >> 8) + 128) / 4;
-                v = (((112 * red - 94 * green - 18 * blue + 128) >> 8) + 128) / 4;
-                rc = iter1.getRGB(&red, &green, &blue);
-            }
-            if (rc)
-            {
-                aDestBuf[offY + 1] = ((66 * red + 129 * green + 25 * blue + 128) >> 8) + 16;
-                u += (((-38 * red - 74 * green + 112 * blue + 128) >> 8) + 128) / 4;
-                v += (((112 * red - 94 * green - 18 * blue + 128) >> 8) + 128) / 4;
-                rc = iter2.getRGB(&red, &green, &blue);
-            }
-            if (rc)
-            {
-                aDestBuf[offY + aWidth] = ((66 * red + 129 * green + 25 * blue + 128) >> 8) + 16;
-                u += (((-38 * red - 74 * green + 112 * blue + 128) >> 8) + 128) / 4;
-                v += (((112 * red - 94 * green - 18 * blue + 128) >> 8) + 128) / 4;
-                rc = iter2.getRGB(&red, &green, &blue);
-            }
-            if (rc)
-            {
-                aDestBuf[offY + aWidth + 1] = ((66 * red + 129 * green + 25 * blue + 128) >> 8) + 16;
-                u += (((-38 * red - 74 * green + 112 * blue + 128) >> 8) + 128) / 4;
-                v += (((112 * red - 94 * green - 18 * blue + 128) >> 8) + 128) / 4;
-                aDestBuf[offU] = u;
-                aDestBuf[offV] = v;
-                offY += 2;
-                ++offU;
-                ++offV;
-            }
-        }
-        if (rc)
-        {
-            iter1.skip(aWidth);
-            iter2.skip(aWidth);
-            offY += aWidth;
-        }
-    }
-    return rc;
+    unsigned const cyHalf = aHeight / 2;
+    unsigned const cxHalf = aWidth  / 2;
+    for (unsigned i = 0; i < cyHalf && fRc; ++i)
+    {
+        for (unsigned j = 0; j < cxHalf; ++j)
+        {
+            unsigned red, green, blue;
+            fRc = iter1.getRGB(&red, &green, &blue);
+            AssertReturn(fRc, false);
+            aDestBuf[offY] = ((66 * red + 129 * green + 25 * blue + 128) >> 8) + 16;
+            unsigned u = (((-38 * red - 74 * green + 112 * blue + 128) >> 8) + 128) / 4;
+            unsigned v = (((112 * red - 94 * green -  18 * blue + 128) >> 8) + 128) / 4;
+
+            fRc = iter1.getRGB(&red, &green, &blue);
+            AssertReturn(fRc, false);
+            aDestBuf[offY + 1] = ((66 * red + 129 * green + 25 * blue + 128) >> 8) + 16;
+            u += (((-38 * red - 74 * green + 112 * blue + 128) >> 8) + 128) / 4;
+            v += (((112 * red - 94 * green -  18 * blue + 128) >> 8) + 128) / 4;
+
+            fRc = iter2.getRGB(&red, &green, &blue);
+            AssertReturn(fRc, false);
+            aDestBuf[offY + aWidth] = ((66 * red + 129 * green + 25 * blue + 128) >> 8) + 16;
+            u += (((-38 * red - 74 * green + 112 * blue + 128) >> 8) + 128) / 4;
+            v += (((112 * red - 94 * green -  18 * blue + 128) >> 8) + 128) / 4;
+
+            fRc = iter2.getRGB(&red, &green, &blue);
+            AssertReturn(fRc, false);
+            aDestBuf[offY + aWidth + 1] = ((66 * red + 129 * green + 25 * blue + 128) >> 8) + 16;
+            u += (((-38 * red - 74 * green + 112 * blue + 128) >> 8) + 128) / 4;
+            v += (((112 * red - 94 * green -  18 * blue + 128) >> 8) + 128) / 4;
+
+            aDestBuf[offU] = u;
+            aDestBuf[offV] = v;
+            offY += 2;
+            ++offU;
+            ++offV;
+        }
+
+        iter1.skip(aWidth);
+        iter2.skip(aWidth);
+        offY += aWidth;
+    }
+
+    return true;
 }