]> granicus.if.org Git - libvpx/commitdiff
added clamp of segment loop filter level
authorYaowu Xu <yaowu@google.com>
Sat, 22 Feb 2014 20:41:06 +0000 (12:41 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 24 Feb 2014 17:56:48 +0000 (09:56 -0800)
for ABSDATA mode, so segment loop filter level always fall in valid
range for both Absolute and delta modes.

Change-Id: If90df3411479533dbdab63f8ae088d2f5dd174a9

vp9/common/vp9_loopfilter.c

index fe2056d14e8c8f2ac7f6dafa986d87f7e26e0b53..868a66ae42115693513de1055076afb49b06733b 100644 (file)
@@ -262,9 +262,9 @@ void vp9_loop_filter_frame_init(VP9_COMMON *cm, int default_filt_lvl) {
     int lvl_seg = default_filt_lvl;
     if (vp9_segfeature_active(seg, seg_id, SEG_LVL_ALT_LF)) {
       const int data = vp9_get_segdata(seg, seg_id, SEG_LVL_ALT_LF);
-      lvl_seg = seg->abs_delta == SEGMENT_ABSDATA
-                  ? data
-                  : clamp(default_filt_lvl + data, 0, MAX_LOOP_FILTER);
+      lvl_seg = clamp(seg->abs_delta == SEGMENT_ABSDATA ?
+                      data : default_filt_lvl + data,
+                      0, MAX_LOOP_FILTER);
     }
 
     if (!lf->mode_ref_delta_enabled) {