ref: f7bcce91afb858084cb006a3660330af0ad71bb6
parent: 03177cb7fa17977f72b1334979f13e76979cf6c9
parent: 6d6ef8eb3c814687cd937eec66b4f8a659277ace
author: Alex Converse <[email protected]>
date: Mon Mar 23 06:04:38 EDT 2015
Merge "Don't apply active map on key frames."
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -126,6 +126,11 @@
assert(AM_SEGMENT_ID_ACTIVE == CR_SEGMENT_ID_BASE);
+ if (frame_is_intra_only(&cpi->common)) {
+ cpi->active_map.enabled = 0;
+ cpi->active_map.update = 1;
+ }
+
if (cpi->active_map.update) {
if (cpi->active_map.enabled) {
for (i = 0; i < cpi->common.mi_rows * cpi->common.mi_cols; ++i)