summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdrian Grange <agrange@google.com>2014-05-02 08:13:06 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-05-02 08:13:06 -0700
commit8b2b7370b54c601c1b443f6398f6c6565efe34b7 (patch)
tree46753441da6b90f84e7e9760c0bfa19f187ec182 /test
parenta481fcc3e032ff68061c8feeee332f6574e75a19 (diff)
parent0a386b923427d3ee1d8b964118c04d40145f2e54 (diff)
downloadlibvpx-8b2b7370b54c601c1b443f6398f6c6565efe34b7.tar
libvpx-8b2b7370b54c601c1b443f6398f6c6565efe34b7.tar.gz
libvpx-8b2b7370b54c601c1b443f6398f6c6565efe34b7.tar.bz2
libvpx-8b2b7370b54c601c1b443f6398f6c6565efe34b7.zip
Merge "Revert "Force ARNR filtering to be centered on the ARF frame""
Diffstat (limited to 'test')
-rw-r--r--test/borders_test.cc1
-rw-r--r--test/cpu_speed_test.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/test/borders_test.cc b/test/borders_test.cc
index a2f5a1bdd..b30be4580 100644
--- a/test/borders_test.cc
+++ b/test/borders_test.cc
@@ -35,6 +35,7 @@ class BordersTest : public ::libvpx_test::EncoderTest,
encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1);
encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7);
encoder->Control(VP8E_SET_ARNR_STRENGTH, 5);
+ encoder->Control(VP8E_SET_ARNR_TYPE, 3);
}
}
diff --git a/test/cpu_speed_test.cc b/test/cpu_speed_test.cc
index ca201bbc7..be651b4fe 100644
--- a/test/cpu_speed_test.cc
+++ b/test/cpu_speed_test.cc
@@ -37,6 +37,7 @@ class CpuSpeedTest : public ::libvpx_test::EncoderTest,
encoder->Control(VP8E_SET_ENABLEAUTOALTREF, 1);
encoder->Control(VP8E_SET_ARNR_MAXFRAMES, 7);
encoder->Control(VP8E_SET_ARNR_STRENGTH, 5);
+ encoder->Control(VP8E_SET_ARNR_TYPE, 3);
}
}