diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 21:30:09 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 21:30:09 +0000 |
| commit | c480832def8f3153e59d491e5f95ca298e2ecdbe (patch) | |
| tree | 85e4f8371a09d2309d315a4bb6cc4fc32b4d2c20 /media/base/yuv_convert_unittest.cc | |
| parent | 8a7d8ddc0ba75454f55803bc7eaae79dacc23f61 (diff) | |
| download | chromium_src-c480832def8f3153e59d491e5f95ca298e2ecdbe.zip chromium_src-c480832def8f3153e59d491e5f95ca298e2ecdbe.tar.gz chromium_src-c480832def8f3153e59d491e5f95ca298e2ecdbe.tar.bz2 | |
Reverting 29019.
Reverting due to test_shell_tests Linux 64 release failures
TBR: fbarchard
Review URL: http://codereview.chromium.org/275021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/yuv_convert_unittest.cc')
| -rw-r--r-- | media/base/yuv_convert_unittest.cc | 55 |
1 files changed, 25 insertions, 30 deletions
diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc index 00152b6..d75488a 100644 --- a/media/base/yuv_convert_unittest.cc +++ b/media/base/yuv_convert_unittest.cc @@ -33,6 +33,7 @@ static const size_t kRGBSize = kWidth * kHeight * kBpp; static const size_t kRGBSizeConverted = kWidth * kHeight * kBpp; // Set to 100 to time ConvertYUVToRGB32. +// This will take approximately 40 to 200 ms. static const int kTestTimes = 1; TEST(YUVConvertTest, YV12) { @@ -98,18 +99,16 @@ TEST(YUVConvertTest, YV16) { reinterpret_cast<char*>(yuv_bytes.get()), static_cast<int>(kYUV16Size))); - for (int i = 0; i < kTestTimes; ++i) { - // Convert a frame of YUV to 32 bit ARGB. - media::ConvertYUVToRGB32(yuv_bytes.get(), // Y - yuv_bytes.get() + kWidth * kHeight, // U - yuv_bytes.get() + kWidth * kHeight * 3 / 2, // V - rgb_converted_bytes.get(), // RGB output - kWidth, kHeight, // Dimensions - kWidth, // YStride - kWidth / 2, // UVStride - kWidth * kBpp, // RGBStride - media::YV16); - } + // Convert a frame of YUV to 32 bit ARGB. + media::ConvertYUVToRGB32(yuv_bytes.get(), // Y + yuv_bytes.get() + kWidth * kHeight, // U + yuv_bytes.get() + kWidth * kHeight * 3 / 2, // V + rgb_converted_bytes.get(), // RGB output + kWidth, kHeight, // Dimensions + kWidth, // YStride + kWidth / 2, // UVStride + kWidth * kBpp, // RGBStride + media::YV16); unsigned int rgb_hash = DJB2Hash(rgb_converted_bytes.get(), kRGBSizeConverted, kDJB2HashSeed); @@ -144,19 +143,17 @@ TEST(YuvScaleTest, YV12) { const size_t size_of_rgb_scaled = kScaledWidth * kScaledHeight * kBpp; scoped_array<uint8> rgb_scaled_bytes(new uint8[size_of_rgb_scaled]); - for (int i = 0; i < kTestTimes; ++i) { - media::ScaleYUVToRGB32(yuv_bytes.get(), // Y + media::ScaleYUVToRGB32(yuv_bytes.get(), // Y yuv_bytes.get() + kWidth * kHeight, // U yuv_bytes.get() + kWidth * kHeight * 5 / 4, // V - rgb_scaled_bytes.get(), // Rgb output - kWidth, kHeight, // Dimensions - kScaledWidth, kScaledHeight, // Dimensions - kWidth, // YStride - kWidth / 2, // UvStride - kScaledWidth * kBpp, // RgbStride + rgb_scaled_bytes.get(), // Rgb output + kWidth, kHeight, // Dimensions + kScaledWidth, kScaledHeight, // Dimensions + kWidth, // YStride + kWidth / 2, // UvStride + kScaledWidth * kBpp, // RgbStride media::YV12, media::ROTATE_0); - } unsigned int rgb_hash = DJB2Hash(rgb_scaled_bytes.get(), size_of_rgb_scaled, kDJB2HashSeed); @@ -191,19 +188,17 @@ TEST(YuvScaleTest, YV16) { const size_t size_of_rgb_scaled = kScaledWidth * kScaledHeight * kBpp; scoped_array<uint8> rgb_scaled_bytes(new uint8[size_of_rgb_scaled]); - for (int i = 0; i < kTestTimes; ++i) { - media::ScaleYUVToRGB32(yuv_bytes.get(), // Y + media::ScaleYUVToRGB32(yuv_bytes.get(), // Y yuv_bytes.get() + kWidth * kHeight, // U yuv_bytes.get() + kWidth * kHeight * 3 / 2, // V - rgb_scaled_bytes.get(), // Rgb output - kWidth, kHeight, // Dimensions - kScaledWidth, kScaledHeight, // Dimensions - kWidth, // YStride - kWidth / 2, // UvStride - kScaledWidth * kBpp, // RgbStride + rgb_scaled_bytes.get(), // Rgb output + kWidth, kHeight, // Dimensions + kScaledWidth, kScaledHeight, // Dimensions + kWidth, // YStride + kWidth / 2, // UvStride + kScaledWidth * kBpp, // RgbStride media::YV16, media::ROTATE_0); - } unsigned int rgb_hash = DJB2Hash(rgb_scaled_bytes.get(), size_of_rgb_scaled, kDJB2HashSeed); |