Commit b9a564a7 authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge
Browse files

Only send segment probabilities when updated.

Cherry-pick vp10 fd96aec9: Don't send segment probability updates when
 the map isn't updated.
This patch only effects --enable-misc-fixes.

Change-Id: Ia1acfc59e4f2e5383a26c786bdd90c02ac49df9f
parent 4790a69f
......@@ -1984,7 +1984,7 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
av1_diff_update_prob(&r, &fc->skip_probs[k]);
#if CONFIG_MISC_FIXES
if (cm->seg.enabled) {
if (cm->seg.enabled && cm->seg.update_map) {
if (cm->seg.temporal_update) {
for (k = 0; k < PREDICTION_PROBS; k++)
av1_diff_update_prob(&r, &cm->fc->seg.pred_probs[k]);
......
......@@ -1290,9 +1290,9 @@ static void encode_segmentation(AV1_COMMON *cm, MACROBLOCKD *xd,
static void update_seg_probs(AV1_COMP *cpi, aom_writer *w) {
AV1_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