Index: media/base/yuv_convert_unittest.cc |
diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc |
index 21a82f1ea25a588c63a287000178f4769a940a63..c4c90b48b45b0e07f10f2341a5c5923c71fb370d 100644 |
--- a/media/base/yuv_convert_unittest.cc |
+++ b/media/base/yuv_convert_unittest.cc |
@@ -105,7 +105,8 @@ TEST(YUVConvertTest, YV12) { |
kSourceWidth, // YStride |
kSourceWidth / 2, // UVStride |
kSourceWidth * kBpp, // RGBStride |
- media::YV12); |
+ media::YV12, |
+ media::YUV_RANGE_RESTRICTED); |
#if defined(OS_ANDROID) |
SwapRedAndBlueChannels(rgb_converted_bytes.get(), kRGBSizeConverted); |
@@ -134,7 +135,8 @@ TEST(YUVConvertTest, YV16) { |
kSourceWidth, // YStride |
kSourceWidth / 2, // UVStride |
kSourceWidth * kBpp, // RGBStride |
- media::YV16); |
+ media::YV16, |
+ media::YUV_RANGE_RESTRICTED); |
#if defined(OS_ANDROID) |
SwapRedAndBlueChannels(rgb_converted_bytes.get(), kRGBSizeConverted); |
@@ -200,6 +202,7 @@ TEST_P(YUVScaleTest, NoScale) { |
kSourceWidth / 2, // UvStride |
kSourceWidth * kBpp, // RgbStride |
GetParam().yuv_type, |
+ media::YUV_RANGE_RESTRICTED, |
media::ROTATE_0, |
GetParam().scale_filter); |
@@ -213,7 +216,8 @@ TEST_P(YUVScaleTest, NoScale) { |
kSourceWidth, // YStride |
kSourceWidth / 2, // UVStride |
kSourceWidth * kBpp, // RGBStride |
- GetParam().yuv_type); |
+ GetParam().yuv_type, |
+ media::YUV_RANGE_RESTRICTED); |
uint32 rgb_hash = DJB2Hash(rgb_bytes_.get(), kRGBSize, kDJB2HashSeed); |
@@ -231,6 +235,7 @@ TEST_P(YUVScaleTest, Normal) { |
kSourceWidth / 2, // UvStride |
kScaledWidth * kBpp, // RgbStride |
GetParam().yuv_type, |
+ media::YUV_RANGE_RESTRICTED, |
media::ROTATE_0, |
GetParam().scale_filter); |
@@ -253,6 +258,7 @@ TEST_P(YUVScaleTest, ZeroSourceSize) { |
kSourceWidth / 2, // UvStride |
kScaledWidth * kBpp, // RgbStride |
GetParam().yuv_type, |
+ media::YUV_RANGE_RESTRICTED, |
media::ROTATE_0, |
GetParam().scale_filter); |
@@ -270,6 +276,7 @@ TEST_P(YUVScaleTest, ZeroDestinationSize) { |
kSourceWidth / 2, // UvStride |
kScaledWidth * kBpp, // RgbStride |
GetParam().yuv_type, |
+ media::YUV_RANGE_RESTRICTED, |
media::ROTATE_0, |
GetParam().scale_filter); |
@@ -287,6 +294,7 @@ TEST_P(YUVScaleTest, OddWidthAndHeightNotCrash) { |
kSourceWidth / 2, // UvStride |
kScaledWidth * kBpp, // RgbStride |
GetParam().yuv_type, |
+ media::YUV_RANGE_RESTRICTED, |
media::ROTATE_0, |
GetParam().scale_filter); |
} |
@@ -323,7 +331,8 @@ TEST(YUVConvertTest, Clamp) { |
0, // YStride |
0, // UVStride |
0, // RGBStride |
- media::YV12); |
+ media::YV12, |
+ media::YUV_RANGE_RESTRICTED); |
#if defined(OS_ANDROID) |
SwapRedAndBlueChannels(rgb, kBpp); |
@@ -384,7 +393,8 @@ TEST(YUVConvertTest, RGB32ToYUV) { |
kSourceWidth, // YStride |
kSourceWidth / 2, // UVStride |
kSourceWidth * kBpp, // RGBStride |
- media::YV12); |
+ media::YV12, |
+ media::YUV_RANGE_RESTRICTED); |
// Convert RGB32 to YV12. |
media::ConvertRGB32ToYUV(rgb_bytes.get(), |
@@ -405,7 +415,8 @@ TEST(YUVConvertTest, RGB32ToYUV) { |
kSourceWidth, // YStride |
kSourceWidth / 2, // UVStride |
kSourceWidth * kBpp, // RGBStride |
- media::YV12); |
+ media::YV12, |
+ media::YUV_RANGE_RESTRICTED); |
int error = 0; |
for (int i = 0; i < kRGBSize; ++i) { |
@@ -539,7 +550,8 @@ TEST(YUVConvertTest, RGB32ToYUV_SSE2_MatchReference) { |
kSourceWidth, // YStride |
kSourceWidth / 2, // UVStride |
kSourceWidth * kBpp, // RGBStride |
- media::YV12); |
+ media::YV12, |
+ media::YUV_RANGE_RESTRICTED); |
// Convert RGB32 to YV12 with SSE2 version. |
media::ConvertRGB32ToYUV_SSE2( |