Fix the WebRTC color bug.

media/base/yuv_convert_unittest.cc

Index: media/base/yuv_convert_unittest.cc
diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc
index 1ac2a2d17cafa5738bacb2f84d92ee1dfacb5231..f41a968593fe99b132fd51ef98f65063e9d6d205 100644
--- a/media/base/yuv_convert_unittest.cc
+++ b/media/base/yuv_convert_unittest.cc
@@ -76,6 +76,14 @@ static void ReadYUY2Data(scoped_ptr<uint8[]>* data) {
   ReadData(FILE_PATH_LITERAL("bali_640x360_YUY2.yuv"), kYUY2Size, data);
 }
 
+// Helper for converting image format from BGRA to RGBA.
+static void ConvertBGRAToRGBA(unsigned char* pixels, size_t buffer_size) {

[scherkus (not reviewing), 2013/06/20 00:28:08]

wait ... isn't this backwards?

your comment in media/base/simd/convert_yuv_to_rgb_c.cc says that desktop is
BGRA and Android is RGBA

regardless, I suggest sidestepping the issue by renaming this function
"SwapRedAndBlueChannels" since it can be used to convert to AND from BGRA<->RGBA
;)

[hkuang1, 2013/06/20 03:45:33]

Yes, my bad. Should be RGBA to BGRA. "SwapRedAndBlueChannels" is a better name.
Change the name to be SwapRedAndBlueChannels

+  // Swizzle red and blue channels.
+  for (size_t i = 0; i < buffer_size; i += 4) {
+    std::swap(pixels[i], pixels[i + 2]);
+  }
+}
+
 namespace media {
 
 TEST(YUVConvertTest, YV12) {
@@ -98,6 +106,10 @@ TEST(YUVConvertTest, YV12) {
                            kSourceWidth * kBpp,                  // RGBStride
                            media::YV12);
 
+#if defined(OS_ANDROID)
+  ConvertBGRAToRGBA(rgb_converted_bytes.get(), kRGBSizeConverted);
+#endif
+
   uint32 rgb_hash = DJB2Hash(rgb_converted_bytes.get(), kRGBSizeConverted,
                              kDJB2HashSeed);
   EXPECT_EQ(2413171226u, rgb_hash);
@@ -123,6 +135,10 @@ TEST(YUVConvertTest, YV16) {
                            kSourceWidth * kBpp,                    // RGBStride
                            media::YV16);
 
+#if defined(OS_ANDROID)
+  ConvertBGRAToRGBA(rgb_converted_bytes.get(), kRGBSizeConverted);
+#endif
+
   uint32 rgb_hash = DJB2Hash(rgb_converted_bytes.get(), kRGBSizeConverted,
                              kDJB2HashSeed);
   EXPECT_EQ(4222342047u, rgb_hash);
@@ -217,6 +233,10 @@ TEST_P(YUVScaleTest, Normal) {
                          media::ROTATE_0,
                          GetParam().scale_filter);
 
+#if defined(OS_ANDROID)
+  ConvertBGRAToRGBA(rgb_bytes_.get(), kRGBSizeScaled);
+#endif
+
   uint32 rgb_hash = DJB2Hash(rgb_bytes_.get(), kRGBSizeScaled, kDJB2HashSeed);
   EXPECT_EQ(GetParam().rgb_hash, rgb_hash);
 }
@@ -304,6 +324,10 @@ TEST(YUVConvertTest, Clamp) {
                            0,        // RGBStride
                            media::YV12);
 
+#if defined(OS_ANDROID)
+  ConvertBGRAToRGBA(rgb, kBpp);
+#endif
+
   int expected_test = memcmp(rgb, expected, sizeof(expected));
   EXPECT_EQ(0, expected_test);
 }
@@ -328,6 +352,7 @@ TEST(YUVConvertTest, RGB24ToYUV) {
 
   uint32 rgb_hash = DJB2Hash(yuv_converted_bytes.get(), kYUV12Size,
                              kDJB2HashSeed);
+

[scherkus (not reviewing), 2013/06/20 00:28:08]

remove extra line that snuck in

[hkuang1, 2013/06/20 03:45:33]

Done.

   EXPECT_EQ(320824432u, rgb_hash);
 }