commit 21dbca4beab787d127b301f4a2937db4c3821cb3
author sarahparker <sarahparker@google.com> Fri Mar 30 17:43:44 2018 -0700
committer Sarah Parker <sarahparker@google.com> Wed Apr 04 18:54:26 2018 +0000
tree cea0de95151001669aa270389b75cb77e588fcd3
parent 00f8a93301580e08e33256d22fee67fc3bf127f3

Add flag to turn off ref frame mvs

This is required to make the ParseAbilityTest work
for lag_in_frames > 0, since control settings are not
currently stored in the lookahead buffer.

Change-Id: I52e2d38151bde6b269c74e8365ba06c8c4bd4955

test/error_resilience_test.cc

diff --git a/test/error_resilience_test.cc b/test/error_resilience_test.cc
index 062c72b..693e017 100644
--- a/test/error_resilience_test.cc
+++ b/test/error_resilience_test.cc
@@ -74,9 +74,8 @@
   virtual void PreEncodeFrameHook(libaom_test::VideoSource *video,
                                   libaom_test::Encoder *encoder) {
     if (video->frame() == 0) encoder->Control(AOME_SET_CPUUSED, kCpuUsed);
-    frame_flags_ &=
-        ~(AOM_EFLAG_NO_UPD_LAST | AOM_EFLAG_NO_UPD_GF | AOM_EFLAG_NO_UPD_ARF);
-
+    frame_flags_ &= ~(AOM_EFLAG_NO_UPD_LAST | AOM_EFLAG_NO_UPD_GF |
+                      AOM_EFLAG_NO_UPD_ARF | AOM_EFLAG_NO_REF_FRAME_MVS);
     if (droppable_nframes_ > 0 &&
         (cfg_.g_pass == AOM_RC_LAST_PASS || cfg_.g_pass == AOM_RC_ONE_PASS)) {
       for (unsigned int i = 0; i < droppable_nframes_; ++i) {
@@ -103,14 +102,13 @@
       }
     }
 
-    encoder->Control(AV1E_SET_ALLOW_REF_FRAME_MVS, 1);
     if (nomfmv_nframes_ > 0 &&
         (cfg_.g_pass == AOM_RC_LAST_PASS || cfg_.g_pass == AOM_RC_ONE_PASS)) {
       for (unsigned int i = 0; i < nomfmv_nframes_; ++i) {
         if (nomfmv_frames_[i] == video->frame()) {
           std::cout << "             Encoding no mfmv frame: "
                     << nomfmv_frames_[i] << "\n";
-          encoder->Control(AV1E_SET_ALLOW_REF_FRAME_MVS, 0);
+          frame_flags_ |= AOM_EFLAG_NO_REF_FRAME_MVS;
           break;
         }
       }