Merge "segmentation: Don't use uninitialized probability data." into nextgenv2

test/active_map_test.cc

@@ -87,11 +87,26 @@ VP9_INSTANTIATE_TEST_CASE(ActiveMapTest,
                           ::testing::Values(::libvpx_test::kRealTime),
                           ::testing::Range(0, 9));
 #if CONFIG_VP10
+#if CONFIG_SUPERTX
 INSTANTIATE_TEST_CASE_P(
     DISABLED_VP10, ActiveMapTest,
     ::testing::Combine(
         ::testing::Values(static_cast<const libvpx_test::CodecFactory *>(
             &libvpx_test::kVP10)),
         ::testing::Values(::libvpx_test::kRealTime), ::testing::Range(0, 9)));
+#else
+VP10_INSTANTIATE_TEST_CASE(ActiveMapTest,
+                           ::testing::Values(::libvpx_test::kRealTime),
+                           ::testing::Range(0, 6));
+
+// The new variance based partitioning scheme is incompatible with
+// SEGMENT_LEVEL_SKIP.
+INSTANTIATE_TEST_CASE_P(
+    DISABLED_VP10, ActiveMapTest,
+    ::testing::Combine(
+        ::testing::Values(static_cast<const libvpx_test::CodecFactory *>(
+            &libvpx_test::kVP10)),
+        ::testing::Values(::libvpx_test::kRealTime), ::testing::Range(6, 9)));
+#endif  // CONFIG_SUPERTX
 #endif  // CONFIG_VP10
 }  // namespace

vp10/encoder/segmentation.c

@@ -358,6 +358,7 @@ void vp10_choose_segmap_coding_method(VP10_COMMON *cm, MACROBLOCKD *xd) {
       const int count0 = temporal_predictor_count[i][0];
       const int count1 = temporal_predictor_count[i][1];
 
+      t_nopred_prob[i] = get_binary_prob(count0, count1);
       vp10_prob_diff_update_savings_search(temporal_predictor_count[i],
                                            segp->pred_probs[i],
                                            &t_nopred_prob[i], DIFF_UPDATE_PROB);