Commit 32c92c97 authored by Alex Converse's avatar Alex Converse Committed by Gerrit Code Review

Merge "Don't send segment probability updates when the map isn't updated." into nextgenv2

parents b3601687 fd96aec9
......@@ -3463,7 +3463,7 @@ static int read_compressed_header(VP10Decoder *pbi, const uint8_t *data,
for (k = 0; k < SKIP_CONTEXTS; ++k)
vp10_diff_update_prob(&r, &fc->skip_probs[k]);
if (cm->seg.enabled) {
if (cm->seg.enabled && cm->seg.update_map) {
if (cm->seg.temporal_update) {
for (k = 0; k < PREDICTION_PROBS; k++)
vp10_diff_update_prob(&r, &cm->fc->seg.pred_probs[k]);
......
......@@ -2544,9 +2544,9 @@ static void encode_segmentation(VP10_COMMON *cm, MACROBLOCKD *xd,
static void update_seg_probs(VP10_COMP *cpi, vp10_writer *w) {
VP10_COMMON *cm = &cpi->common;
if (!cpi->common.seg.enabled) return;
if (!cm->seg.enabled || !cm->seg.update_map) return;
if (cpi->common.seg.temporal_update) {
if (cm->seg.temporal_update) {
int i;
for (i = 0; i < PREDICTION_PROBS; i++)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment