Commit cbb7c657 authored by Sarah Parker's avatar Sarah Parker Committed by Gerrit Code Review
Browse files

Merge "Fix compiler warnings in vp10_convolve_optimz_test.cc" into nextgenv2

parents 0dc56b6a 95763749
...@@ -217,6 +217,8 @@ const BlockDimension kBlockDim[] = { ...@@ -217,6 +217,8 @@ const BlockDimension kBlockDim[] = {
make_tuple(128, 64), make_tuple(128, 64),
make_tuple(128, 128), make_tuple(128, 128),
}; };
#if HAVE_SSSE3 && CONFIG_EXT_INTERP
// 10/12-tap filters // 10/12-tap filters
const INTERP_FILTER kFilter[] = {6, 4, 2}; const INTERP_FILTER kFilter[] = {6, 4, 2};
...@@ -224,7 +226,6 @@ const int kSubpelQ4[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; ...@@ -224,7 +226,6 @@ const int kSubpelQ4[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
const int kAvg[] = {0, 1}; const int kAvg[] = {0, 1};
#if HAVE_SSSE3 && CONFIG_EXT_INTERP
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
SSSE3, VP10ConvolveOptimzTest, SSSE3, VP10ConvolveOptimzTest,
::testing::Combine( ::testing::Combine(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment