diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/convolve_test.cc | 300 | ||||
-rw-r--r-- | test/dct16x16_test.cc | 28 | ||||
-rw-r--r-- | test/dct32x32_test.cc | 12 | ||||
-rw-r--r-- | test/fdct4x4_test.cc | 36 | ||||
-rw-r--r-- | test/fdct8x8_test.cc | 28 | ||||
-rw-r--r-- | test/vp9_intrapred_test.cc | 266 |
6 files changed, 353 insertions, 317 deletions
diff --git a/test/convolve_test.cc b/test/convolve_test.cc index 3342e107e..470c43643 100644 --- a/test/convolve_test.cc +++ b/test/convolve_test.cc @@ -36,7 +36,7 @@ struct ConvolveFunctions { ConvolveFunc hv8, ConvolveFunc hv8_avg, int bd) : h8_(h8), v8_(v8), hv8_(hv8), h8_avg_(h8_avg), v8_avg_(v8_avg), - hv8_avg_(hv8_avg), use_high_bd_(bd) {} + hv8_avg_(hv8_avg), use_highbd_(bd) {} ConvolveFunc h8_; ConvolveFunc v8_; @@ -44,7 +44,7 @@ struct ConvolveFunctions { ConvolveFunc h8_avg_; ConvolveFunc v8_avg_; ConvolveFunc hv8_avg_; - int use_high_bd_; // 0 if high bitdepth not used, else the actual bit depth. + int use_highbd_; // 0 if high bitdepth not used, else the actual bit depth. }; typedef std::tr1::tuple<int, int, const ConvolveFunctions *> ConvolveParam; @@ -170,15 +170,15 @@ void filter_average_block2d_8_c(const uint8_t *src_ptr, } #if CONFIG_VP9_HIGHBITDEPTH -void high_filter_block2d_8_c(const uint16_t *src_ptr, - const unsigned int src_stride, - const int16_t *HFilter, - const int16_t *VFilter, - uint16_t *dst_ptr, - unsigned int dst_stride, - unsigned int output_width, - unsigned int output_height, - int bd) { +void highbd_filter_block2d_8_c(const uint16_t *src_ptr, + const unsigned int src_stride, + const int16_t *HFilter, + const int16_t *VFilter, + uint16_t *dst_ptr, + unsigned int dst_stride, + unsigned int output_width, + unsigned int output_height, + int bd) { // Between passes, we use an intermediate buffer whose height is extended to // have enough horizontally filtered values as input for the vertical pass. // This buffer is allocated to be big enough for the largest block type we @@ -254,13 +254,13 @@ void high_filter_block2d_8_c(const uint16_t *src_ptr, } } -void high_block2d_average_c(uint16_t *src, - unsigned int src_stride, - uint16_t *output_ptr, - unsigned int output_stride, - unsigned int output_width, - unsigned int output_height, - int bd) { +void highbd_block2d_average_c(uint16_t *src, + unsigned int src_stride, + uint16_t *output_ptr, + unsigned int output_stride, + unsigned int output_width, + unsigned int output_height, + int bd) { unsigned int i, j; for (i = 0; i < output_height; ++i) { for (j = 0; j < output_width; ++j) { @@ -270,23 +270,23 @@ void high_block2d_average_c(uint16_t *src, } } -void high_filter_average_block2d_8_c(const uint16_t *src_ptr, - const unsigned int src_stride, - const int16_t *HFilter, - const int16_t *VFilter, - uint16_t *dst_ptr, - unsigned int dst_stride, - unsigned int output_width, - unsigned int output_height, - int bd) { +void highbd_filter_average_block2d_8_c(const uint16_t *src_ptr, + const unsigned int src_stride, + const int16_t *HFilter, + const int16_t *VFilter, + uint16_t *dst_ptr, + unsigned int dst_stride, + unsigned int output_width, + unsigned int output_height, + int bd) { uint16_t tmp[kMaxDimension * kMaxDimension]; assert(output_width <= kMaxDimension); assert(output_height <= kMaxDimension); - high_filter_block2d_8_c(src_ptr, src_stride, HFilter, VFilter, tmp, 64, - output_width, output_height, bd); - high_block2d_average_c(tmp, 64, dst_ptr, dst_stride, - output_width, output_height, bd); + highbd_filter_block2d_8_c(src_ptr, src_stride, HFilter, VFilter, tmp, 64, + output_width, output_height, bd); + highbd_block2d_average_c(tmp, 64, dst_ptr, dst_stride, + output_width, output_height, bd); } #endif // CONFIG_VP9_HIGHBITDEPTH @@ -346,8 +346,8 @@ class ConvolveTest : public ::testing::TestWithParam<ConvolveParam> { virtual void SetUp() { UUT_ = GET_PARAM(2); #if CONFIG_VP9_HIGHBITDEPTH - if (UUT_->use_high_bd_ != 0) - mask_ = (1 << UUT_->use_high_bd_) - 1; + if (UUT_->use_highbd_ != 0) + mask_ = (1 << UUT_->use_highbd_) - 1; else mask_ = 255; #endif @@ -391,7 +391,7 @@ class ConvolveTest : public ::testing::TestWithParam<ConvolveParam> { uint8_t *input() const { #if CONFIG_VP9_HIGHBITDEPTH - if (UUT_->use_high_bd_ == 0) { + if (UUT_->use_highbd_ == 0) { return input_ + BorderTop() * kOuterBlockSize + BorderLeft(); } else { return CONVERT_TO_BYTEPTR(input16_ + BorderTop() * kOuterBlockSize + @@ -404,7 +404,7 @@ class ConvolveTest : public ::testing::TestWithParam<ConvolveParam> { uint8_t *output() const { #if CONFIG_VP9_HIGHBITDEPTH - if (UUT_->use_high_bd_ == 0) { + if (UUT_->use_highbd_ == 0) { return output_ + BorderTop() * kOuterBlockSize + BorderLeft(); } else { return CONVERT_TO_BYTEPTR(output16_ + BorderTop() * kOuterBlockSize + @@ -417,7 +417,7 @@ class ConvolveTest : public ::testing::TestWithParam<ConvolveParam> { uint16_t lookup(uint8_t *list, int index) const { #if CONFIG_VP9_HIGHBITDEPTH - if (UUT_->use_high_bd_ == 0) { + if (UUT_->use_highbd_ == 0) { return list[index]; } else { return CONVERT_TO_SHORTPTR(list)[index]; @@ -429,7 +429,7 @@ class ConvolveTest : public ::testing::TestWithParam<ConvolveParam> { void assign_val(uint8_t *list, int index, uint16_t val) const { #if CONFIG_VP9_HIGHBITDEPTH - if (UUT_->use_high_bd_ == 0) { + if (UUT_->use_highbd_ == 0) { list[index] = (uint8_t) val; } else { CONVERT_TO_SHORTPTR(list)[index] = val; @@ -448,16 +448,16 @@ class ConvolveTest : public ::testing::TestWithParam<ConvolveParam> { unsigned int output_width, unsigned int output_height) { #if CONFIG_VP9_HIGHBITDEPTH - if (UUT_->use_high_bd_ == 0) { + if (UUT_->use_highbd_ == 0) { filter_average_block2d_8_c(src_ptr, src_stride, HFilter, VFilter, dst_ptr, dst_stride, output_width, output_height); } else { - high_filter_average_block2d_8_c(CONVERT_TO_SHORTPTR(src_ptr), src_stride, - HFilter, VFilter, - CONVERT_TO_SHORTPTR(dst_ptr), dst_stride, - output_width, output_height, - UUT_->use_high_bd_); + highbd_filter_average_block2d_8_c(CONVERT_TO_SHORTPTR(src_ptr), + src_stride, HFilter, VFilter, + CONVERT_TO_SHORTPTR(dst_ptr), + dst_stride, output_width, output_height, + UUT_->use_highbd_); } #else filter_average_block2d_8_c(src_ptr, src_stride, HFilter, VFilter, @@ -475,14 +475,14 @@ class ConvolveTest : public ::testing::TestWithParam<ConvolveParam> { unsigned int output_width, unsigned int output_height) { #if CONFIG_VP9_HIGHBITDEPTH - if (UUT_->use_high_bd_ == 0) { + if (UUT_->use_highbd_ == 0) { filter_block2d_8_c(src_ptr, src_stride, HFilter, VFilter, dst_ptr, dst_stride, output_width, output_height); } else { - high_filter_block2d_8_c(CONVERT_TO_SHORTPTR(src_ptr), src_stride, - HFilter, VFilter, - CONVERT_TO_SHORTPTR(dst_ptr), dst_stride, - output_width, output_height, UUT_->use_high_bd_); + highbd_filter_block2d_8_c(CONVERT_TO_SHORTPTR(src_ptr), src_stride, + HFilter, VFilter, + CONVERT_TO_SHORTPTR(dst_ptr), dst_stride, + output_width, output_height, UUT_->use_highbd_); } #else filter_block2d_8_c(src_ptr, src_stride, HFilter, VFilter, @@ -598,7 +598,7 @@ TEST_P(ConvolveTest, MatchesReferenceSubpixelFilter) { uint8_t ref8[kOutputStride * kMaxDimension]; uint16_t ref16[kOutputStride * kMaxDimension]; uint8_t* ref; - if (UUT_->use_high_bd_ == 0) { + if (UUT_->use_highbd_ == 0) { ref = ref8; } else { ref = CONVERT_TO_BYTEPTR(ref16); @@ -657,7 +657,7 @@ TEST_P(ConvolveTest, MatchesReferenceAveragingSubpixelFilter) { uint8_t ref8[kOutputStride * kMaxDimension]; uint16_t ref16[kOutputStride * kMaxDimension]; uint8_t* ref; - if (UUT_->use_high_bd_ == 0) { + if (UUT_->use_highbd_ == 0) { ref = ref8; } else { ref = CONVERT_TO_BYTEPTR(ref16); @@ -672,7 +672,7 @@ TEST_P(ConvolveTest, MatchesReferenceAveragingSubpixelFilter) { for (int x = 0; x < Width(); ++x) { uint16_t r; #if CONFIG_VP9_HIGHBITDEPTH - if (UUT_->use_high_bd_ == 0 || UUT_->use_high_bd_ == 8) { + if (UUT_->use_highbd_ == 0 || UUT_->use_highbd_ == 8) { r = prng.Rand8Extremes(); } else { r = prng.Rand16() & mask_; @@ -736,7 +736,7 @@ TEST_P(ConvolveTest, FilterExtremes) { uint8_t ref8[kOutputStride * kMaxDimension]; uint16_t ref16[kOutputStride * kMaxDimension]; uint8_t *ref; - if (UUT_->use_high_bd_ == 0) { + if (UUT_->use_highbd_ == 0) { ref = ref8; } else { ref = CONVERT_TO_BYTEPTR(ref16); @@ -751,7 +751,7 @@ TEST_P(ConvolveTest, FilterExtremes) { for (int x = 0; x < Width(); ++x) { uint16_t r; #if CONFIG_VP9_HIGHBITDEPTH - if (UUT_->use_high_bd_ == 0 || UUT_->use_high_bd_ == 8) { + if (UUT_->use_highbd_ == 0 || UUT_->use_highbd_ == 8) { r = prng.Rand8Extremes(); } else { r = prng.Rand16() & mask_; @@ -978,9 +978,9 @@ void wrap_convolve8_horiz_sse2_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_horiz_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 8); + vp9_highbd_convolve8_horiz_sse2(src, src_stride, dst, dst_stride, filter_x, + filter_x_stride, filter_y, filter_y_stride, + w, h, 8); } void wrap_convolve8_avg_horiz_sse2_8(const uint8_t *src, ptrdiff_t src_stride, @@ -990,8 +990,9 @@ void wrap_convolve8_avg_horiz_sse2_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_horiz_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 8); + vp9_highbd_convolve8_avg_horiz_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_vert_sse2_8(const uint8_t *src, ptrdiff_t src_stride, @@ -1001,8 +1002,9 @@ void wrap_convolve8_vert_sse2_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_vert_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 8); + vp9_highbd_convolve8_vert_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_avg_vert_sse2_8(const uint8_t *src, ptrdiff_t src_stride, @@ -1012,9 +1014,9 @@ void wrap_convolve8_avg_vert_sse2_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_vert_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 8); + vp9_highbd_convolve8_avg_vert_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_sse2_8(const uint8_t *src, ptrdiff_t src_stride, @@ -1024,8 +1026,9 @@ void wrap_convolve8_sse2_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 8); + vp9_highbd_convolve8_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_avg_sse2_8(const uint8_t *src, ptrdiff_t src_stride, @@ -1035,8 +1038,9 @@ void wrap_convolve8_avg_sse2_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 8); + vp9_highbd_convolve8_avg_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_horiz_sse2_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1046,8 +1050,9 @@ void wrap_convolve8_horiz_sse2_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_horiz_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 10); + vp9_highbd_convolve8_horiz_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_avg_horiz_sse2_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1057,8 +1062,9 @@ void wrap_convolve8_avg_horiz_sse2_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_horiz_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 10); + vp9_highbd_convolve8_avg_horiz_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_vert_sse2_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1068,8 +1074,9 @@ void wrap_convolve8_vert_sse2_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_vert_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 10); + vp9_highbd_convolve8_vert_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_avg_vert_sse2_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1079,8 +1086,9 @@ void wrap_convolve8_avg_vert_sse2_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_vert_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 10); + vp9_highbd_convolve8_avg_vert_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_sse2_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1090,8 +1098,9 @@ void wrap_convolve8_sse2_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 10); + vp9_highbd_convolve8_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_avg_sse2_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1101,9 +1110,9 @@ void wrap_convolve8_avg_sse2_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 10); + vp9_highbd_convolve8_avg_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_horiz_sse2_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1113,9 +1122,9 @@ void wrap_convolve8_horiz_sse2_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_horiz_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 12); + vp9_highbd_convolve8_horiz_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } void wrap_convolve8_avg_horiz_sse2_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1125,9 +1134,9 @@ void wrap_convolve8_avg_horiz_sse2_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_horiz_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 12); + vp9_highbd_convolve8_avg_horiz_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } void wrap_convolve8_vert_sse2_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1137,9 +1146,9 @@ void wrap_convolve8_vert_sse2_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_vert_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 12); + vp9_highbd_convolve8_vert_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } void wrap_convolve8_avg_vert_sse2_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1149,8 +1158,9 @@ void wrap_convolve8_avg_vert_sse2_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_vert_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 12); + vp9_highbd_convolve8_avg_vert_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } void wrap_convolve8_sse2_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1160,8 +1170,9 @@ void wrap_convolve8_sse2_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 12); + vp9_highbd_convolve8_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } void wrap_convolve8_avg_sse2_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1171,8 +1182,9 @@ void wrap_convolve8_avg_sse2_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_sse2(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 12); + vp9_highbd_convolve8_avg_sse2(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } #endif // HAVE_SSE2 && ARCH_X86_64 @@ -1183,8 +1195,9 @@ void wrap_convolve8_horiz_c_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_horiz_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 8); + vp9_highbd_convolve8_horiz_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_avg_horiz_c_8(const uint8_t *src, ptrdiff_t src_stride, @@ -1194,8 +1207,9 @@ void wrap_convolve8_avg_horiz_c_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_horiz_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 8); + vp9_highbd_convolve8_avg_horiz_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_vert_c_8(const uint8_t *src, ptrdiff_t src_stride, @@ -1205,8 +1219,9 @@ void wrap_convolve8_vert_c_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_vert_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 8); + vp9_highbd_convolve8_vert_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_avg_vert_c_8(const uint8_t *src, ptrdiff_t src_stride, @@ -1216,8 +1231,9 @@ void wrap_convolve8_avg_vert_c_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_vert_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 8); + vp9_highbd_convolve8_avg_vert_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_c_8(const uint8_t *src, ptrdiff_t src_stride, @@ -1227,8 +1243,9 @@ void wrap_convolve8_c_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 8); + vp9_highbd_convolve8_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_avg_c_8(const uint8_t *src, ptrdiff_t src_stride, @@ -1238,9 +1255,9 @@ void wrap_convolve8_avg_c_8(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 8); + vp9_highbd_convolve8_avg_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 8); } void wrap_convolve8_horiz_c_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1250,8 +1267,9 @@ void wrap_convolve8_horiz_c_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_horiz_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 10); + vp9_highbd_convolve8_horiz_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_avg_horiz_c_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1261,9 +1279,9 @@ void wrap_convolve8_avg_horiz_c_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_horiz_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 10); + vp9_highbd_convolve8_avg_horiz_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_vert_c_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1273,8 +1291,9 @@ void wrap_convolve8_vert_c_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_vert_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 10); + vp9_highbd_convolve8_vert_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_avg_vert_c_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1284,8 +1303,9 @@ void wrap_convolve8_avg_vert_c_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_vert_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 10); + vp9_highbd_convolve8_avg_vert_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_c_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1295,8 +1315,9 @@ void wrap_convolve8_c_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 10); + vp9_highbd_convolve8_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_avg_c_10(const uint8_t *src, ptrdiff_t src_stride, @@ -1306,8 +1327,9 @@ void wrap_convolve8_avg_c_10(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, w, h, 10); + vp9_highbd_convolve8_avg_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 10); } void wrap_convolve8_horiz_c_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1317,9 +1339,9 @@ void wrap_convolve8_horiz_c_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_horiz_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 12); + vp9_highbd_convolve8_horiz_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } void wrap_convolve8_avg_horiz_c_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1329,9 +1351,9 @@ void wrap_convolve8_avg_horiz_c_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_horiz_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 12); + vp9_highbd_convolve8_avg_horiz_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } void wrap_convolve8_vert_c_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1341,9 +1363,9 @@ void wrap_convolve8_vert_c_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_vert_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 12); + vp9_highbd_convolve8_vert_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } void wrap_convolve8_avg_vert_c_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1353,9 +1375,9 @@ void wrap_convolve8_avg_vert_c_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_vert_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 12); + vp9_highbd_convolve8_avg_vert_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } void wrap_convolve8_c_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1365,9 +1387,9 @@ void wrap_convolve8_c_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 12); + vp9_highbd_convolve8_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } void wrap_convolve8_avg_c_12(const uint8_t *src, ptrdiff_t src_stride, @@ -1377,9 +1399,9 @@ void wrap_convolve8_avg_c_12(const uint8_t *src, ptrdiff_t src_stride, const int16_t *filter_y, int filter_y_stride, int w, int h) { - vp9_high_convolve8_avg_c(src, src_stride, dst, dst_stride, filter_x, - filter_x_stride, filter_y, filter_y_stride, - w, h, 12); + vp9_highbd_convolve8_avg_c(src, src_stride, dst, dst_stride, + filter_x, filter_x_stride, + filter_y, filter_y_stride, w, h, 12); } const ConvolveFunctions convolve8_c( diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc index 75ed1d8c9..5222d494e 100644 --- a/test/dct16x16_test.cc +++ b/test/dct16x16_test.cc @@ -287,11 +287,11 @@ void iht16x16_ref(const tran_low_t *in, uint8_t *dest, int stride, #if CONFIG_VP9_HIGHBITDEPTH void idct16x16_10(const tran_low_t *in, uint8_t *out, int stride) { - vp9_high_idct16x16_256_add_c(in, out, stride, 10); + vp9_highbd_idct16x16_256_add_c(in, out, stride, 10); } void idct16x16_12(const tran_low_t *in, uint8_t *out, int stride) { - vp9_high_idct16x16_256_add_c(in, out, stride, 12); + vp9_highbd_idct16x16_256_add_c(in, out, stride, 12); } void idct16x16_10_ref(const tran_low_t *in, uint8_t *out, int stride, @@ -305,11 +305,11 @@ void idct16x16_12_ref(const tran_low_t *in, uint8_t *out, int stride, } void iht16x16_10(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { - vp9_high_iht16x16_256_add_c(in, out, stride, tx_type, 10); + vp9_highbd_iht16x16_256_add_c(in, out, stride, tx_type, 10); } void iht16x16_12(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { - vp9_high_iht16x16_256_add_c(in, out, stride, tx_type, 12); + vp9_highbd_iht16x16_256_add_c(in, out, stride, tx_type, 12); } #endif @@ -709,8 +709,8 @@ using std::tr1::make_tuple; INSTANTIATE_TEST_CASE_P( C, Trans16x16DCT, ::testing::Values( - make_tuple(&vp9_high_fdct16x16_c, &idct16x16_10, 0, VPX_BITS_10), - make_tuple(&vp9_high_fdct16x16_c, &idct16x16_12, 0, VPX_BITS_12), + make_tuple(&vp9_highbd_fdct16x16_c, &idct16x16_10, 0, VPX_BITS_10), + make_tuple(&vp9_highbd_fdct16x16_c, &idct16x16_12, 0, VPX_BITS_12), make_tuple(&vp9_fdct16x16_c, &vp9_idct16x16_256_add_c, 0, VPX_BITS_8))); #else INSTANTIATE_TEST_CASE_P( @@ -723,14 +723,14 @@ INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P( C, Trans16x16HT, ::testing::Values( - make_tuple(&vp9_high_fht16x16_c, &iht16x16_10, 0, VPX_BITS_10), - make_tuple(&vp9_high_fht16x16_c, &iht16x16_10, 1, VPX_BITS_10), - make_tuple(&vp9_high_fht16x16_c, &iht16x16_10, 2, VPX_BITS_10), - make_tuple(&vp9_high_fht16x16_c, &iht16x16_10, 3, VPX_BITS_10), - make_tuple(&vp9_high_fht16x16_c, &iht16x16_12, 0, VPX_BITS_12), - make_tuple(&vp9_high_fht16x16_c, &iht16x16_12, 1, VPX_BITS_12), - make_tuple(&vp9_high_fht16x16_c, &iht16x16_12, 2, VPX_BITS_12), - make_tuple(&vp9_high_fht16x16_c, &iht16x16_12, 3, VPX_BITS_12), + make_tuple(&vp9_highbd_fht16x16_c, &iht16x16_10, 0, VPX_BITS_10), + make_tuple(&vp9_highbd_fht16x16_c, &iht16x16_10, 1, VPX_BITS_10), + make_tuple(&vp9_highbd_fht16x16_c, &iht16x16_10, 2, VPX_BITS_10), + make_tuple(&vp9_highbd_fht16x16_c, &iht16x16_10, 3, VPX_BITS_10), + make_tuple(&vp9_highbd_fht16x16_c, &iht16x16_12, 0, VPX_BITS_12), + make_tuple(&vp9_highbd_fht16x16_c, &iht16x16_12, 1, VPX_BITS_12), + make_tuple(&vp9_highbd_fht16x16_c, &iht16x16_12, 2, VPX_BITS_12), + make_tuple(&vp9_highbd_fht16x16_c, &iht16x16_12, 3, VPX_BITS_12), make_tuple(&vp9_fht16x16_c, &vp9_iht16x16_256_add_c, 0, VPX_BITS_8), make_tuple(&vp9_fht16x16_c, &vp9_iht16x16_256_add_c, 1, VPX_BITS_8), make_tuple(&vp9_fht16x16_c, &vp9_iht16x16_256_add_c, 2, VPX_BITS_8), diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc index 044373e74..4f08be570 100644 --- a/test/dct32x32_test.cc +++ b/test/dct32x32_test.cc @@ -80,11 +80,11 @@ typedef std::tr1::tuple<FwdTxfmFunc, InvTxfmFunc, int, vpx_bit_depth_t> #if CONFIG_VP9_HIGHBITDEPTH void idct32x32_10(const tran_low_t *in, uint8_t *out, int stride) { - vp9_high_idct32x32_1024_add_c(in, out, stride, 10); + vp9_highbd_idct32x32_1024_add_c(in, out, stride, 10); } void idct32x32_12(const tran_low_t *in, uint8_t *out, int stride) { - vp9_high_idct32x32_1024_add_c(in, out, stride, 12); + vp9_highbd_idct32x32_1024_add_c(in, out, stride, 12); } #endif @@ -311,13 +311,13 @@ using std::tr1::make_tuple; INSTANTIATE_TEST_CASE_P( C, Trans32x32Test, ::testing::Values( - make_tuple(&vp9_high_fdct32x32_c, + make_tuple(&vp9_highbd_fdct32x32_c, &idct32x32_10, 0, VPX_BITS_10), - make_tuple(&vp9_high_fdct32x32_rd_c, + make_tuple(&vp9_highbd_fdct32x32_rd_c, &idct32x32_10, 1, VPX_BITS_10), - make_tuple(&vp9_high_fdct32x32_c, + make_tuple(&vp9_highbd_fdct32x32_c, &idct32x32_12, 0, VPX_BITS_12), - make_tuple(&vp9_high_fdct32x32_rd_c, + make_tuple(&vp9_highbd_fdct32x32_rd_c, &idct32x32_12, 1, VPX_BITS_12), make_tuple(&vp9_fdct32x32_c, &vp9_idct32x32_1024_add_c, 0, VPX_BITS_8), diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc index d75bd69f3..ef3590232 100644 --- a/test/fdct4x4_test.cc +++ b/test/fdct4x4_test.cc @@ -53,27 +53,27 @@ void fwht4x4_ref(const int16_t *in, tran_low_t *out, int stride, #if CONFIG_VP9_HIGHBITDEPTH void idct4x4_10(const tran_low_t *in, uint8_t *out, int stride) { - vp9_high_idct4x4_16_add_c(in, out, stride, 10); + vp9_highbd_idct4x4_16_add_c(in, out, stride, 10); } void idct4x4_12(const tran_low_t *in, uint8_t *out, int stride) { - vp9_high_idct4x4_16_add_c(in, out, stride, 12); + vp9_highbd_idct4x4_16_add_c(in, out, stride, 12); } void iht4x4_10(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { - vp9_high_iht4x4_16_add_c(in, out, stride, tx_type, 10); + vp9_highbd_iht4x4_16_add_c(in, out, stride, tx_type, 10); } void iht4x4_12(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { - vp9_high_iht4x4_16_add_c(in, out, stride, tx_type, 12); + vp9_highbd_iht4x4_16_add_c(in, out, stride, tx_type, 12); } void iwht4x4_10(const tran_low_t *in, uint8_t *out, int stride) { - vp9_high_iwht4x4_16_add_c(in, out, stride, 10); + vp9_highbd_iwht4x4_16_add_c(in, out, stride, 10); } void iwht4x4_12(const tran_low_t *in, uint8_t *out, int stride) { - vp9_high_iwht4x4_16_add_c(in, out, stride, 12); + vp9_highbd_iwht4x4_16_add_c(in, out, stride, 12); } #endif @@ -408,8 +408,8 @@ using std::tr1::make_tuple; INSTANTIATE_TEST_CASE_P( C, Trans4x4DCT, ::testing::Values( - make_tuple(&vp9_high_fdct4x4_c, &idct4x4_10, 0, VPX_BITS_10), - make_tuple(&vp9_high_fdct4x4_c, &idct4x4_12, 0, VPX_BITS_12), + make_tuple(&vp9_highbd_fdct4x4_c, &idct4x4_10, 0, VPX_BITS_10), + make_tuple(&vp9_highbd_fdct4x4_c, &idct4x4_12, 0, VPX_BITS_12), make_tuple(&vp9_fdct4x4_c, &vp9_idct4x4_16_add_c, 0, VPX_BITS_8))); #else INSTANTIATE_TEST_CASE_P( @@ -422,14 +422,14 @@ INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P( C, Trans4x4HT, ::testing::Values( - make_tuple(&vp9_high_fht4x4_c, &iht4x4_10, 0, VPX_BITS_10), - make_tuple(&vp9_high_fht4x4_c, &iht4x4_10, 1, VPX_BITS_10), - make_tuple(&vp9_high_fht4x4_c, &iht4x4_10, 2, VPX_BITS_10), - make_tuple(&vp9_high_fht4x4_c, &iht4x4_10, 3, VPX_BITS_10), - make_tuple(&vp9_high_fht4x4_c, &iht4x4_12, 0, VPX_BITS_12), - make_tuple(&vp9_high_fht4x4_c, &iht4x4_12, 1, VPX_BITS_12), - make_tuple(&vp9_high_fht4x4_c, &iht4x4_12, 2, VPX_BITS_12), - make_tuple(&vp9_high_fht4x4_c, &iht4x4_12, 3, VPX_BITS_12), + make_tuple(&vp9_highbd_fht4x4_c, &iht4x4_10, 0, VPX_BITS_10), + make_tuple(&vp9_highbd_fht4x4_c, &iht4x4_10, 1, VPX_BITS_10), + make_tuple(&vp9_highbd_fht4x4_c, &iht4x4_10, 2, VPX_BITS_10), + make_tuple(&vp9_highbd_fht4x4_c, &iht4x4_10, 3, VPX_BITS_10), + make_tuple(&vp9_highbd_fht4x4_c, &iht4x4_12, 0, VPX_BITS_12), + make_tuple(&vp9_highbd_fht4x4_c, &iht4x4_12, 1, VPX_BITS_12), + make_tuple(&vp9_highbd_fht4x4_c, &iht4x4_12, 2, VPX_BITS_12), + make_tuple(&vp9_highbd_fht4x4_c, &iht4x4_12, 3, VPX_BITS_12), make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_c, 0, VPX_BITS_8), make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_c, 1, VPX_BITS_8), make_tuple(&vp9_fht4x4_c, &vp9_iht4x4_16_add_c, 2, VPX_BITS_8), @@ -448,8 +448,8 @@ INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P( C, Trans4x4WHT, ::testing::Values( - make_tuple(&vp9_high_fwht4x4_c, &iwht4x4_10, 0, VPX_BITS_10), - make_tuple(&vp9_high_fwht4x4_c, &iwht4x4_12, 0, VPX_BITS_12), + make_tuple(&vp9_highbd_fwht4x4_c, &iwht4x4_10, 0, VPX_BITS_10), + make_tuple(&vp9_highbd_fwht4x4_c, &iwht4x4_12, 0, VPX_BITS_12), make_tuple(&vp9_fwht4x4_c, &vp9_iwht4x4_16_add_c, 0, VPX_BITS_8))); #else INSTANTIATE_TEST_CASE_P( diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc index 44a26545e..103556df0 100644 --- a/test/fdct8x8_test.cc +++ b/test/fdct8x8_test.cc @@ -82,19 +82,19 @@ void fht8x8_ref(const int16_t *in, tran_low_t *out, int stride, int tx_type) { #if CONFIG_VP9_HIGHBITDEPTH void idct8x8_10(const tran_low_t *in, uint8_t *out, int stride) { - vp9_high_idct8x8_64_add_c(in, out, stride, 10); + vp9_highbd_idct8x8_64_add_c(in, out, stride, 10); } void idct8x8_12(const tran_low_t *in, uint8_t *out, int stride) { - vp9_high_idct8x8_64_add_c(in, out, stride, 12); + vp9_highbd_idct8x8_64_add_c(in, out, stride, 12); } void iht8x8_10(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { - vp9_high_iht8x8_64_add_c(in, out, stride, tx_type, 10); + vp9_highbd_iht8x8_64_add_c(in, out, stride, tx_type, 10); } void iht8x8_12(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { - vp9_high_iht8x8_64_add_c(in, out, stride, tx_type, 12); + vp9_highbd_iht8x8_64_add_c(in, out, stride, tx_type, 12); } #endif @@ -532,8 +532,8 @@ using std::tr1::make_tuple; INSTANTIATE_TEST_CASE_P( C, FwdTrans8x8DCT, ::testing::Values( - make_tuple(&vp9_high_fdct8x8_c, &idct8x8_10, 0, VPX_BITS_10), - make_tuple(&vp9_high_fdct8x8_c, &idct8x8_12, 0, VPX_BITS_12), + make_tuple(&vp9_highbd_fdct8x8_c, &idct8x8_10, 0, VPX_BITS_10), + make_tuple(&vp9_highbd_fdct8x8_c, &idct8x8_12, 0, VPX_BITS_12), make_tuple(&vp9_fdct8x8_c, &vp9_idct8x8_64_add_c, 0, VPX_BITS_8))); #else INSTANTIATE_TEST_CASE_P( @@ -546,14 +546,14 @@ INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P( C, FwdTrans8x8HT, ::testing::Values( - make_tuple(&vp9_high_fht8x8_c, &iht8x8_10, 0, VPX_BITS_10), - make_tuple(&vp9_high_fht8x8_c, &iht8x8_10, 1, VPX_BITS_10), - make_tuple(&vp9_high_fht8x8_c, &iht8x8_10, 2, VPX_BITS_10), - make_tuple(&vp9_high_fht8x8_c, &iht8x8_10, 3, VPX_BITS_10), - make_tuple(&vp9_high_fht8x8_c, &iht8x8_12, 0, VPX_BITS_12), - make_tuple(&vp9_high_fht8x8_c, &iht8x8_12, 1, VPX_BITS_12), - make_tuple(&vp9_high_fht8x8_c, &iht8x8_12, 2, VPX_BITS_12), - make_tuple(&vp9_high_fht8x8_c, &iht8x8_12, 3, VPX_BITS_12), + make_tuple(&vp9_highbd_fht8x8_c, &iht8x8_10, 0, VPX_BITS_10), + make_tuple(&vp9_highbd_fht8x8_c, &iht8x8_10, 1, VPX_BITS_10), + make_tuple(&vp9_highbd_fht8x8_c, &iht8x8_10, 2, VPX_BITS_10), + make_tuple(&vp9_highbd_fht8x8_c, &iht8x8_10, 3, VPX_BITS_10), + make_tuple(&vp9_highbd_fht8x8_c, &iht8x8_12, 0, VPX_BITS_12), + make_tuple(&vp9_highbd_fht8x8_c, &iht8x8_12, 1, VPX_BITS_12), + make_tuple(&vp9_highbd_fht8x8_c, &iht8x8_12, 2, VPX_BITS_12), + make_tuple(&vp9_highbd_fht8x8_c, &iht8x8_12, 3, VPX_BITS_12), make_tuple(&vp9_fht8x8_c, &vp9_iht8x8_64_add_c, 0, VPX_BITS_8), make_tuple(&vp9_fht8x8_c, &vp9_iht8x8_64_add_c, 1, VPX_BITS_8), make_tuple(&vp9_fht8x8_c, &vp9_iht8x8_64_add_c, 2, VPX_BITS_8), diff --git a/test/vp9_intrapred_test.cc b/test/vp9_intrapred_test.cc index 7d08d9ee4..694db1b8b 100644 --- a/test/vp9_intrapred_test.cc +++ b/test/vp9_intrapred_test.cc @@ -134,150 +134,164 @@ using std::tr1::make_tuple; #if ARCH_X86_64 INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest, ::testing::Values( - make_tuple(&vp9_high_dc_predictor_32x32_sse2, - &vp9_high_dc_predictor_32x32_c, 32, 8), - make_tuple(&vp9_high_tm_predictor_16x16_sse2, - &vp9_high_tm_predictor_16x16_c, 16, 8), - make_tuple(&vp9_high_tm_predictor_32x32_sse2, - &vp9_high_tm_predictor_32x32_c, 32, 8), - make_tuple(&vp9_high_dc_predictor_4x4_sse, - &vp9_high_dc_predictor_4x4_c, 4, 8), - make_tuple(&vp9_high_dc_predictor_8x8_sse2, - &vp9_high_dc_predictor_8x8_c, 8, 8), - make_tuple(&vp9_high_dc_predictor_16x16_sse2, - &vp9_high_dc_predictor_16x16_c, 16, 8), - make_tuple(&vp9_high_v_predictor_4x4_sse, - &vp9_high_v_predictor_4x4_c, 4, 8), - make_tuple(&vp9_high_v_predictor_8x8_sse2, - &vp9_high_v_predictor_8x8_c, 8, 8), - make_tuple(&vp9_high_v_predictor_16x16_sse2, - &vp9_high_v_predictor_16x16_c, 16, 8), - make_tuple(&vp9_high_v_predictor_32x32_sse2, - &vp9_high_v_predictor_32x32_c, 32, 8), - make_tuple(&vp9_high_tm_predictor_4x4_sse, - &vp9_high_tm_predictor_4x4_c, 4, 8), - make_tuple(&vp9_high_tm_predictor_8x8_sse2, - &vp9_high_tm_predictor_8x8_c, 8, 8))); + make_tuple(&vp9_highbd_dc_predictor_32x32_sse2, + &vp9_highbd_dc_predictor_32x32_c, 32, 8), + make_tuple(&vp9_highbd_tm_predictor_16x16_sse2, + &vp9_highbd_tm_predictor_16x16_c, 16, 8), + make_tuple(&vp9_highbd_tm_predictor_32x32_sse2, + &vp9_highbd_tm_predictor_32x32_c, 32, 8), + make_tuple(&vp9_highbd_dc_predictor_4x4_sse, + &vp9_highbd_dc_predictor_4x4_c, 4, 8), + make_tuple(&vp9_highbd_dc_predictor_8x8_sse2, + &vp9_highbd_dc_predictor_8x8_c, 8, 8), + make_tuple(&vp9_highbd_dc_predictor_16x16_sse2, + &vp9_highbd_dc_predictor_16x16_c, 16, 8), + make_tuple(&vp9_highbd_v_predictor_4x4_sse, + &vp9_highbd_v_predictor_4x4_c, 4, 8), + make_tuple(&vp9_highbd_v_predictor_8x8_sse2, + &vp9_highbd_v_predictor_8x8_c, 8, 8), + make_tuple(&vp9_highbd_v_predictor_16x16_sse2, + &vp9_highbd_v_predictor_16x16_c, 16, 8), + make_tuple(&vp9_highbd_v_predictor_32x32_sse2, + &vp9_highbd_v_predictor_32x32_c, 32, 8), + make_tuple(&vp9_highbd_tm_predictor_4x4_sse, + &vp9_highbd_tm_predictor_4x4_c, 4, 8), + make_tuple(&vp9_highbd_tm_predictor_8x8_sse2, + &vp9_highbd_tm_predictor_8x8_c, 8, 8))); #else INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, VP9IntraPredTest, ::testing::Values( - make_tuple(&vp9_high_dc_predictor_4x4_sse, - &vp9_high_dc_predictor_4x4_c, 4, 8), - make_tuple(&vp9_high_dc_predictor_8x8_sse2, - &vp9_high_dc_predictor_8x8_c, 8, 8), - make_tuple(&vp9_high_dc_predictor_16x16_sse2, - &vp9_high_dc_predictor_16x16_c, 16, 8), - make_tuple(&vp9_high_v_predictor_4x4_sse, - &vp9_high_v_predictor_4x4_c, 4, 8), - make_tuple(&vp9_high_v_predictor_8x8_sse2, - &vp9_high_v_predictor_8x8_c, 8, 8), - make_tuple(&vp9_high_v_predictor_16x16_sse2, - &vp9_high_v_predictor_16x16_c, 16, 8), - make_tuple(&vp9_high_v_predictor_32x32_sse2, - &vp9_high_v_predictor_32x32_c, 32, 8), - make_tuple(&vp9_high_tm_predictor_4x4_sse, - &vp9_high_tm_predictor_4x4_c, 4, 8), - make_tuple(&vp9_high_tm_predictor_8x8_sse2, - &vp9_high_tm_predictor_8x8_c, 8, 8))); + make_tuple(&vp9_highbd_dc_predictor_4x4_sse, + &vp9_highbd_dc_predictor_4x4_c, 4, 8), + make_tuple(&vp9_highbd_dc_predictor_8x8_sse2, + &vp9_highbd_dc_predictor_8x8_c, 8, 8), + make_tuple(&vp9_highbd_dc_predictor_16x16_sse2, + &vp9_highbd_dc_predictor_16x16_c, 16, 8), + make_tuple(&vp9_highbd_v_predictor_4x4_sse, + &vp9_highbd_v_predictor_4x4_c, 4, 8), + make_tuple(&vp9_highbd_v_predictor_8x8_sse2, + &vp9_highbd_v_predictor_8x8_c, 8, 8), + make_tuple(&vp9_highbd_v_predictor_16x16_sse2, + &vp9_highbd_v_predictor_16x16_c, 16, 8), + make_tuple(&vp9_highbd_v_predictor_32x32_sse2, + &vp9_highbd_v_predictor_32x32_c, 32, 8), + make_tuple(&vp9_highbd_tm_predictor_4x4_sse, + &vp9_highbd_tm_predictor_4x4_c, 4, 8), + make_tuple(&vp9_highbd_tm_predictor_8x8_sse2, + &vp9_highbd_tm_predictor_8x8_c, 8, 8))); #endif #if ARCH_X86_64 INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest, ::testing::Values( - make_tuple(&vp9_high_dc_predictor_32x32_sse2, - &vp9_high_dc_predictor_32x32_c, 32, 10), - make_tuple(&vp9_high_tm_predictor_16x16_sse2, - &vp9_high_tm_predictor_16x16_c, 16, 10), - make_tuple(&vp9_high_tm_predictor_32x32_sse2, - &vp9_high_tm_predictor_32x32_c, 32, 10), - make_tuple(&vp9_high_dc_predictor_4x4_sse, - &vp9_high_dc_predictor_4x4_c, 4, 10), - make_tuple(&vp9_high_dc_predictor_8x8_sse2, - &vp9_high_dc_predictor_8x8_c, 8, 10), - make_tuple(&vp9_high_dc_predictor_16x16_sse2, - &vp9_high_dc_predictor_16x16_c, 16, 10), - make_tuple(&vp9_high_v_predictor_4x4_sse, - &vp9_high_v_predictor_4x4_c, 4, 10), - make_tuple(&vp9_high_v_predictor_8x8_sse2, - &vp9_high_v_predictor_8x8_c, 8, 10), - make_tuple(&vp9_high_v_predictor_16x16_sse2, - &vp9_high_v_predictor_16x16_c, 16, 10), - make_tuple(&vp9_high_v_predictor_32x32_sse2, - &vp9_high_v_predictor_32x32_c, 32, 10), - make_tuple(&vp9_high_tm_predictor_4x4_sse, - &vp9_high_tm_predictor_4x4_c, 4, 10), - make_tuple(&vp9_high_tm_predictor_8x8_sse2, - &vp9_high_tm_predictor_8x8_c, 8, 10))); + make_tuple(&vp9_highbd_dc_predictor_32x32_sse2, + &vp9_highbd_dc_predictor_32x32_c, 32, + 10), + make_tuple(&vp9_highbd_tm_predictor_16x16_sse2, + &vp9_highbd_tm_predictor_16x16_c, 16, + 10), + make_tuple(&vp9_highbd_tm_predictor_32x32_sse2, + &vp9_highbd_tm_predictor_32x32_c, 32, + 10), + make_tuple(&vp9_highbd_dc_predictor_4x4_sse, + &vp9_highbd_dc_predictor_4x4_c, 4, 10), + make_tuple(&vp9_highbd_dc_predictor_8x8_sse2, + &vp9_highbd_dc_predictor_8x8_c, 8, 10), + make_tuple(&vp9_highbd_dc_predictor_16x16_sse2, + &vp9_highbd_dc_predictor_16x16_c, 16, + 10), + make_tuple(&vp9_highbd_v_predictor_4x4_sse, + &vp9_highbd_v_predictor_4x4_c, 4, 10), + make_tuple(&vp9_highbd_v_predictor_8x8_sse2, + &vp9_highbd_v_predictor_8x8_c, 8, 10), + make_tuple(&vp9_highbd_v_predictor_16x16_sse2, + &vp9_highbd_v_predictor_16x16_c, 16, + 10), + make_tuple(&vp9_highbd_v_predictor_32x32_sse2, + &vp9_highbd_v_predictor_32x32_c, 32, + 10), + make_tuple(&vp9_highbd_tm_predictor_4x4_sse, + &vp9_highbd_tm_predictor_4x4_c, 4, 10), + make_tuple(&vp9_highbd_tm_predictor_8x8_sse2, + &vp9_highbd_tm_predictor_8x8_c, 8, 10))); #else INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, VP9IntraPredTest, ::testing::Values( - make_tuple(&vp9_high_dc_predictor_4x4_sse, - &vp9_high_dc_predictor_4x4_c, 4, 10), - make_tuple(&vp9_high_dc_predictor_8x8_sse2, - &vp9_high_dc_predictor_8x8_c, 8, 10), - make_tuple(&vp9_high_dc_predictor_16x16_sse2, - &vp9_high_dc_predictor_16x16_c, 16, 10), - make_tuple(&vp9_high_v_predictor_4x4_sse, - &vp9_high_v_predictor_4x4_c, 4, 10), - make_tuple(&vp9_high_v_predictor_8x8_sse2, - &vp9_high_v_predictor_8x8_c, 8, 10), - make_tuple(&vp9_high_v_predictor_16x16_sse2, - &vp9_high_v_predictor_16x16_c, 16, 10), - make_tuple(&vp9_high_v_predictor_32x32_sse2, - &vp9_high_v_predictor_32x32_c, 32, 10), - make_tuple(&vp9_high_tm_predictor_4x4_sse, - &vp9_high_tm_predictor_4x4_c, 4, 10), - make_tuple(&vp9_high_tm_predictor_8x8_sse2, - &vp9_high_tm_predictor_8x8_c, 8, 10))); + make_tuple(&vp9_highbd_dc_predictor_4x4_sse, + &vp9_highbd_dc_predictor_4x4_c, 4, 10), + make_tuple(&vp9_highbd_dc_predictor_8x8_sse2, + &vp9_highbd_dc_predictor_8x8_c, 8, 10), + make_tuple(&vp9_highbd_dc_predictor_16x16_sse2, + &vp9_highbd_dc_predictor_16x16_c, 16, + 10), + make_tuple(&vp9_highbd_v_predictor_4x4_sse, + &vp9_highbd_v_predictor_4x4_c, 4, 10), + make_tuple(&vp9_highbd_v_predictor_8x8_sse2, + &vp9_highbd_v_predictor_8x8_c, 8, 10), + make_tuple(&vp9_highbd_v_predictor_16x16_sse2, + &vp9_highbd_v_predictor_16x16_c, 16, 10), + make_tuple(&vp9_highbd_v_predictor_32x32_sse2, + &vp9_highbd_v_predictor_32x32_c, 32, 10), + make_tuple(&vp9_highbd_tm_predictor_4x4_sse, + &vp9_highbd_tm_predictor_4x4_c, 4, 10), + make_tuple(&vp9_highbd_tm_predictor_8x8_sse2, + &vp9_highbd_tm_predictor_8x8_c, 8, 10))); #endif #if ARCH_X86_64 INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest, ::testing::Values( - make_tuple(&vp9_high_dc_predictor_32x32_sse2, - &vp9_high_dc_predictor_32x32_c, 32, 12), - make_tuple(&vp9_high_tm_predictor_16x16_sse2, - &vp9_high_tm_predictor_16x16_c, 16, 12), - make_tuple(&vp9_high_tm_predictor_32x32_sse2, - &vp9_high_tm_predictor_32x32_c, 32, 12), - make_tuple(&vp9_high_dc_predictor_4x4_sse, - &vp9_high_dc_predictor_4x4_c, 4, 12), - make_tuple(&vp9_high_dc_predictor_8x8_sse2, - &vp9_high_dc_predictor_8x8_c, 8, 12), - make_tuple(&vp9_high_dc_predictor_16x16_sse2, - &vp9_high_dc_predictor_16x16_c, 16, 12), - make_tuple(&vp9_high_v_predictor_4x4_sse, - &vp9_high_v_predictor_4x4_c, 4, 12), - make_tuple(&vp9_high_v_predictor_8x8_sse2, - &vp9_high_v_predictor_8x8_c, 8, 12), - make_tuple(&vp9_high_v_predictor_16x16_sse2, - &vp9_high_v_predictor_16x16_c, 16, 12), - make_tuple(&vp9_high_v_predictor_32x32_sse2, - &vp9_high_v_predictor_32x32_c, 32, 12), - make_tuple(&vp9_high_tm_predictor_4x4_sse, - &vp9_high_tm_predictor_4x4_c, 4, 12), - make_tuple(&vp9_high_tm_predictor_8x8_sse2, - &vp9_high_tm_predictor_8x8_c, 8, 12))); + make_tuple(&vp9_highbd_dc_predictor_32x32_sse2, + &vp9_highbd_dc_predictor_32x32_c, 32, + 12), + make_tuple(&vp9_highbd_tm_predictor_16x16_sse2, + &vp9_highbd_tm_predictor_16x16_c, 16, + 12), + make_tuple(&vp9_highbd_tm_predictor_32x32_sse2, + &vp9_highbd_tm_predictor_32x32_c, 32, + 12), + make_tuple(&vp9_highbd_dc_predictor_4x4_sse, + &vp9_highbd_dc_predictor_4x4_c, 4, 12), + make_tuple(&vp9_highbd_dc_predictor_8x8_sse2, + &vp9_highbd_dc_predictor_8x8_c, 8, 12), + make_tuple(&vp9_highbd_dc_predictor_16x16_sse2, + &vp9_highbd_dc_predictor_16x16_c, 16, + 12), + make_tuple(&vp9_highbd_v_predictor_4x4_sse, + &vp9_highbd_v_predictor_4x4_c, 4, 12), + make_tuple(&vp9_highbd_v_predictor_8x8_sse2, + &vp9_highbd_v_predictor_8x8_c, 8, 12), + make_tuple(&vp9_highbd_v_predictor_16x16_sse2, + &vp9_highbd_v_predictor_16x16_c, 16, + 12), + make_tuple(&vp9_highbd_v_predictor_32x32_sse2, + &vp9_highbd_v_predictor_32x32_c, 32, + 12), + make_tuple(&vp9_highbd_tm_predictor_4x4_sse, + &vp9_highbd_tm_predictor_4x4_c, 4, 12), + make_tuple(&vp9_highbd_tm_predictor_8x8_sse2, + &vp9_highbd_tm_predictor_8x8_c, 8, 12))); #else INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, VP9IntraPredTest, ::testing::Values( - make_tuple(&vp9_high_dc_predictor_4x4_sse, - &vp9_high_dc_predictor_4x4_c, 4, 12), - make_tuple(&vp9_high_dc_predictor_8x8_sse2, - &vp9_high_dc_predictor_8x8_c, 8, 12), - make_tuple(&vp9_high_dc_predictor_16x16_sse2, - &vp9_high_dc_predictor_16x16_c, 16, 12), - make_tuple(&vp9_high_v_predictor_4x4_sse, - &vp9_high_v_predictor_4x4_c, 4, 12), - make_tuple(&vp9_high_v_predictor_8x8_sse2, - &vp9_high_v_predictor_8x8_c, 8, 12), - make_tuple(&vp9_high_v_predictor_16x16_sse2, - &vp9_high_v_predictor_16x16_c, 16, 12), - make_tuple(&vp9_high_v_predictor_32x32_sse2, - &vp9_high_v_predictor_32x32_c, 32, 12), - make_tuple(&vp9_high_tm_predictor_4x4_sse, - &vp9_high_tm_predictor_4x4_c, 4, 12), - make_tuple(&vp9_high_tm_predictor_8x8_sse2, - &vp9_high_tm_predictor_8x8_c, 8, 12))); + make_tuple(&vp9_highbd_dc_predictor_4x4_sse, + &vp9_highbd_dc_predictor_4x4_c, 4, 12), + make_tuple(&vp9_highbd_dc_predictor_8x8_sse2, + &vp9_highbd_dc_predictor_8x8_c, 8, 12), + make_tuple(&vp9_highbd_dc_predictor_16x16_sse2, + &vp9_highbd_dc_predictor_16x16_c, 16, + 12), + make_tuple(&vp9_highbd_v_predictor_4x4_sse, + &vp9_highbd_v_predictor_4x4_c, 4, 12), + make_tuple(&vp9_highbd_v_predictor_8x8_sse2, + &vp9_highbd_v_predictor_8x8_c, 8, 12), + make_tuple(&vp9_highbd_v_predictor_16x16_sse2, + &vp9_highbd_v_predictor_16x16_c, 16, 12), + make_tuple(&vp9_highbd_v_predictor_32x32_sse2, + &vp9_highbd_v_predictor_32x32_c, 32, 12), + make_tuple(&vp9_highbd_tm_predictor_4x4_sse, + &vp9_highbd_tm_predictor_4x4_c, 4, 12), + make_tuple(&vp9_highbd_tm_predictor_8x8_sse2, + &vp9_highbd_tm_predictor_8x8_c, 8, 12))); #endif #endif // CONFIG_VP9_HIGHBITDEPTH #endif // HAVE_SSE2 |