Update aom to slightly newer commit ID

1 files changed, 3 insertions, 14 deletions

diff --git a/third_party/aom/test/motion_vector_test.cc b/third_party/aom/test/motion_vector_test.cc
index 403a8f1a7..fa47494e8 100644
--- a/third_party/aom/test/motion_vector_test.cc
+++ b/third_party/aom/test/motion_vector_test.cc
@@ -17,12 +17,6 @@
 #include "test/yuv_video_source.h"
 
 namespace {
-#if defined(__has_feature)
-#if __has_feature(address_sanitizer)
-#define BUILDING_WITH_ASAN
-#endif
-#endif
-
 #define MAX_EXTREME_MV 1
 #define MIN_EXTREME_MV 2
 
@@ -32,7 +26,7 @@ const libaom_test::TestMode kEncodingModeVectors[] = {
 };
 
 // Encoding speeds
-const int kCpuUsedVectors[] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+const int kCpuUsedVectors[] = { 1, 5 };
 
 // MV test modes: 1 - always use maximum MV; 2 - always use minimum MV.
 const int kMVTestModes[] = { MAX_EXTREME_MV, MIN_EXTREME_MV };
@@ -85,16 +79,11 @@ TEST_P(MotionVectorTestLarge, OverallTest) {
   int width = 3840;
   int height = 2160;
 
-#ifdef BUILDING_WITH_ASAN
-  // On the 32-bit system, if using 4k test clip, an "out of memory" error
-  // occurs because of the AddressSanitizer instrumentation memory overhead.
-  // Here, reduce the test clip's resolution while testing on 32-bit system
-  // and AddressSanitizer is enabled.
+  // Reduce the test clip's resolution while testing on 32-bit system.
   if (sizeof(void *) == 4) {
     width = 2048;
     height = 1080;
   }
-#endif
 
   cfg_.rc_target_bitrate = 24000;
   cfg_.g_profile = 0;
@@ -102,7 +91,7 @@ TEST_P(MotionVectorTestLarge, OverallTest) {
 
   testing::internal::scoped_ptr<libaom_test::VideoSource> video;
   video.reset(new libaom_test::YUVVideoSource(
-      "niklas_640_480_30.yuv", AOM_IMG_FMT_I420, width, height, 30, 1, 0, 5));
+      "niklas_640_480_30.yuv", AOM_IMG_FMT_I420, width, height, 30, 1, 0, 3));
 
   ASSERT_TRUE(video.get() != NULL);
   ASSERT_NO_FATAL_FAILURE(RunLoop(video.get()));