Revert^2 "Re-enable MonochromeRealtimeTest" This reverts commit b5556134a5b78d467fe870133498cf9b1ac46abf. Reason for revert: Fix is added in patchset 2. Change-Id: Ib938fcb1bbc14bed2833e3ff40aeee6053cf8bf3
diff --git a/test/monochrome_test.cc b/test/monochrome_test.cc index cfc16d0..78afd4f 100644 --- a/test/monochrome_test.cc +++ b/test/monochrome_test.cc
@@ -55,6 +55,8 @@ encoder->Control(AOME_SET_CPUUSED, GET_PARAM(3)); if (mode_ == ::libaom_test::kAllIntra) { encoder->Control(AOME_SET_CQ_LEVEL, kCqLevel); + } else if (mode_ == ::libaom_test::kRealTime) { + encoder->Control(AOME_SET_MAX_INTRA_BITRATE_PCT, 10000); } if (lossless_) { encoder->Control(AV1E_SET_LOSSLESS, 1); @@ -181,14 +183,7 @@ class MonochromeRealtimeTest : public MonochromeTest {}; -#if CONFIG_REALTIME_ONLY -// TODO: https://crbug.com/aomedia/376504476 - Enable this test after large -// PSNR differences are resolved in this configuration. -#define MAYBE_TestMonochromeEncoding DISABLED_TestMonochromeEncoding -#else -#define MAYBE_TestMonochromeEncoding TestMonochromeEncoding -#endif -TEST_P(MonochromeRealtimeTest, MAYBE_TestMonochromeEncoding) { +TEST_P(MonochromeRealtimeTest, TestMonochromeEncoding) { ::libaom_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288, 30, 1, 0, 30); init_flags_ = AOM_CODEC_USE_PSNR; @@ -201,6 +196,7 @@ cfg_.rc_buf_optimal_sz = 5000; ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); +#if CONFIG_AV1_DECODER // Check that the chroma planes are equal across all frames std::vector<int>::const_iterator iter = chroma_value_list_.begin(); int initial_chroma_value = *iter; @@ -208,6 +204,7 @@ // Check that all decoded frames have the same constant chroma planes. EXPECT_EQ(*iter, initial_chroma_value); } +#endif } #if !CONFIG_REALTIME_ONLY