Merge "Turn on ActiveMapRefreshTest for Vp10" into nextgenv2

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<const libvpx_test::CodecFactory *>(
-            &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

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)) {