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

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

Browse Source
This commit is contained in:
Alex Converse
2016-08-19 16:52:10 +00:00
committed by Gerrit Code Review
parent b360168783 fd96aec9c6
commit 32c92c97ea
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp10/decoder/decodeframe.c
View File

@@ -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]);

4
vp10/encoder/bitstream.c
View File

@@ -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++)