ref: 681d5e9024c7dab82706507037c01a067e0ea89d
parent: dfdfb2d0fff6c1d36f3b8ee6ea3d9c81d56185c2
parent: 53c3f2ca4dc764f417a928d230e9d1322833819a
author: Marco <marpan@google.com>
date: Mon Nov 24 02:46:36 EST 2014
Merge "Only allow for cyclic refresh (aq=3 mode) for base layer."
--- a/vp9/encoder/vp9_aq_cyclicrefresh.c
+++ b/vp9/encoder/vp9_aq_cyclicrefresh.c
@@ -184,7 +184,8 @@
// Don't apply refresh on key frame or enhancement layer frames.
if (!apply_cyclic_refresh ||
(cm->frame_type == KEY_FRAME) ||
- (cpi->svc.temporal_layer_id > 0)) {
+ (cpi->svc.temporal_layer_id > 0) ||
+ (cpi->svc.spatial_layer_id > 0)) {
// Set segmentation map to 0 and disable.
vpx_memset(seg_map, 0, cm->mi_rows * cm->mi_cols);
vp9_disable_segmentation(&cm->seg);
--
⑨