commit ba67fe8513cb82d709a73f0ae38b7a4c8a4e8b1e
author Jingning Han <jingning@google.com> Tue Sep 29 10:10:12 2020 -0700
committer Jingning Han <jingning@google.com> Tue Sep 29 10:10:12 2020 -0700
tree 8d5dc83c3ba82011898affb6c848100f3a68651f
parent 15631ea6db1e802bdd6e778cf485ee551a773287

Fix GoldenFrameIntervalTest

Re-enable the related unit tests.

BUG=aomedia:2800

STATS_CHANGED

Change-Id: I7ac84e0c13c45816194352132413285926c413e3

av1/encoder/pass2_strategy.c

diff --git a/av1/encoder/pass2_strategy.c b/av1/encoder/pass2_strategy.c
index 0bca42a..23a562b 100644
--- a/av1/encoder/pass2_strategy.c
+++ b/av1/encoder/pass2_strategy.c
@@ -1391,7 +1391,7 @@
 
 static void correct_frames_to_key(AV1_COMP *cpi) {
   int lookahead_size =
-      (int)av1_lookahead_depth(cpi->lookahead, cpi->compressor_stage) + 1;
+      (int)av1_lookahead_depth(cpi->lookahead, cpi->compressor_stage);
   if (lookahead_size <
       av1_lookahead_pop_sz(cpi->lookahead, cpi->compressor_stage)) {
     assert(IMPLIES(cpi->frames_left > 0, lookahead_size == cpi->frames_left));

test/altref_test.cc

diff --git a/test/altref_test.cc b/test/altref_test.cc
index 67ab404..742358e 100644
--- a/test/altref_test.cc
+++ b/test/altref_test.cc
@@ -204,9 +204,7 @@
   aom_rc_mode rc_end_usage_;
 };
 
-// TODO(crbug.com/aomedia/2800): Re-enable or remove this test when the redesign
-// of the GOP structure and related rate control mechanism is complete.
-TEST_P(GoldenFrameIntervalTestLarge, DISABLED_GoldenFrameIntervalTest) {
+TEST_P(GoldenFrameIntervalTestLarge, GoldenFrameIntervalTest) {
   libaom_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288,
                                      cfg_.g_timebase.den, cfg_.g_timebase.num,
                                      0, limit_);