diff options
| author | Alex Converse <aconverse@google.com> | 2015-03-23 10:04:29 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-03-23 10:04:29 -0700 |
| commit | 03177cb7fa17977f72b1334979f13e76979cf6c9 (patch) | |
| tree | 8b1250c59b7b7541e0f39cca63785a38b9e71a24 /vp9 | |
| parent | fef91c9040452133e10438661920bc1dbfb1f2b0 (diff) | |
| parent | e032fc7b9ed95e87d54021ffc9a1b0f6ebda1541 (diff) | |
| download | libvpx-03177cb7fa17977f72b1334979f13e76979cf6c9.tar libvpx-03177cb7fa17977f72b1334979f13e76979cf6c9.tar.gz libvpx-03177cb7fa17977f72b1334979f13e76979cf6c9.tar.bz2 libvpx-03177cb7fa17977f72b1334979f13e76979cf6c9.zip | |
Merge "Set loop filter level to zero on inactive segment."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 43d403469..b8859a02e 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -132,8 +132,14 @@ void vp9_apply_active_map(VP9_COMP *cpi) { if (seg_map[i] == AM_SEGMENT_ID_ACTIVE) seg_map[i] = active_map[i]; vp9_enable_segmentation(seg); vp9_enable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_SKIP); + vp9_enable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF); + // Setting the data to -MAX_LOOP_FILTER will result in the computed loop + // filter level being zero regardless of the value of seg->abs_delta. + vp9_set_segdata(seg, AM_SEGMENT_ID_INACTIVE, + SEG_LVL_ALT_LF, -MAX_LOOP_FILTER); } else { vp9_disable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_SKIP); + vp9_disable_segfeature(seg, AM_SEGMENT_ID_INACTIVE, SEG_LVL_ALT_LF); if (seg->enabled) { seg->update_data = 1; seg->update_map = 1; |