generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

segmentation: Don't use uninitialized probability data.

Browse Source 
BUG=https://bugs.chromium.org/p/webm/issues/detail?id=1224

Change-Id: I17b76fcf0d8c191850350d5aa50dcc007b8b0cdc
This commit is contained in:
Alex Converse
2016-05-24 10:58:00 -07:00
parent e89ca180c2
commit 7a6cb59dbb
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/active_map_test.cc
View File

@@ -87,11 +87,26 @@ VP9_INSTANTIATE_TEST_CASE(ActiveMapTest,
::testing::Values(::libvpx_test::kRealTime), ::testing::Values(::libvpx_test::kRealTime),
::testing::Range(0, 9)); ::testing::Range(0, 9));
#if CONFIG_VP10 #if CONFIG_VP10
#if CONFIG_SUPERTX
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_CASE_P(
DISABLED_VP10, ActiveMapTest, DISABLED_VP10, ActiveMapTest,
::testing::Combine( ::testing::Combine(
::testing::Values(static_cast<const libvpx_test::CodecFactory *>( ::testing::Values(static_cast<const libvpx_test::CodecFactory *>(
&libvpx_test::kVP10)), &libvpx_test::kVP10)),
::testing::Values(::libvpx_test::kRealTime), ::testing::Range(0, 9))); ::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 #endif // CONFIG_VP10
} // namespace } // namespace

1
vp10/encoder/segmentation.c
View File

@@ -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 count0 = temporal_predictor_count[i][0];
const int count1 = temporal_predictor_count[i][1]; 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], vp10_prob_diff_update_savings_search(temporal_predictor_count[i],
segp->pred_probs[i], segp->pred_probs[i],
&t_nopred_prob[i], DIFF_UPDATE_PROB); &t_nopred_prob[i], DIFF_UPDATE_PROB);