From cf0cdfc55edbfc83368aa452b4f1e4b8dd1f226e Mon Sep 17 00:00:00 2001 From: Debargha Mukherjee Date: Fri, 24 Jun 2016 10:31:07 -0700 Subject: [PATCH] Turn on ActiveMapRefreshTest for Vp10 Also reduce number of frames coded for VP10. Change-Id: I7de908861620b6f4f08513516110fd584660d994 --- test/active_map_refresh_test.cc | 19 +++++++------------ vp10/encoder/speed_features.c | 3 --- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/test/active_map_refresh_test.cc b/test/active_map_refresh_test.cc index 9dd35b87f..aeff301cc 100644 --- a/test/active_map_refresh_test.cc +++ b/test/active_map_refresh_test.cc @@ -113,8 +113,13 @@ TEST_P(ActiveMapRefreshTest, Test) { cfg_.rc_end_usage = VPX_CBR; cfg_.kf_max_dist = 90000; - ::libvpx_test::Y4mVideoSource video("desktop_credits.y4m", 0, 30); - ::libvpx_test::Y4mVideoSource video_holder("desktop_credits.y4m", 0, 30); +#if CONFIG_VP10 + const int nframes = codec_ == &libvpx_test::kVP10 ? 10 : 30; +#else + const int nframes = 30; +#endif // CONFIG_VP10 + ::libvpx_test::Y4mVideoSource video("desktop_credits.y4m", 0, nframes); + ::libvpx_test::Y4mVideoSource video_holder("desktop_credits.y4m", 0, nframes); video_holder.Begin(); y4m_holder_ = &video_holder; @@ -125,18 +130,8 @@ VP9_INSTANTIATE_TEST_CASE(ActiveMapRefreshTest, ::testing::Values(::libvpx_test::kRealTime), ::testing::Range(5, 6)); #if CONFIG_VP10 -#if CONFIG_EXT_PARTITION -INSTANTIATE_TEST_CASE_P( - DISABLED_VP10, - ActiveMapRefreshTest, - ::testing::Combine( - ::testing::Values(static_cast( - &libvpx_test::kVP10)), - ::testing::Values(::libvpx_test::kRealTime), ::testing::Range(5, 6))); -#else VP10_INSTANTIATE_TEST_CASE(ActiveMapRefreshTest, ::testing::Values(::libvpx_test::kRealTime), ::testing::Range(5, 6)); -#endif // CONFIG_EXT_PARTITION #endif // CONFIG_VP10 } // namespace diff --git a/vp10/encoder/speed_features.c b/vp10/encoder/speed_features.c index 53b8bd7d1..bd0cb8189 100644 --- a/vp10/encoder/speed_features.c +++ b/vp10/encoder/speed_features.c @@ -132,9 +132,6 @@ static void set_good_speed_feature(VP10_COMP *cpi, VP10_COMMON *cm, sf->adaptive_rd_thresh = 1; - sf->tx_type_search.fast_intra_tx_type_search = 1; - sf->tx_type_search.fast_inter_tx_type_search = 1; - if (speed >= 1) { if ((cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION) || vp10_internal_image_edge(cpi)) { -- 2.49.0