shithub: libvpx

Download patch

ref: ab98103facdf6fb164e58575b5ee395f33e40082
parent: eb492100cd0af76afaf3efc627e49abcc35efa7e
parent: 22141d9d7999be8acef90e3aa3aef2db5efd8711
author: Jim Bankoski <jimbankoski@google.com>
date: Tue Sep 25 06:49:25 EDT 2012 

Merge "disable segmentation on enhancement layers"


--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3752,8 +3752,13 @@
     /* Setup background Q adjustment for error resilient mode.
      * For multi-layer encodes only enable this for the base layer.
      */
-    if (cpi->cyclic_refresh_mode_enabled && (cpi->current_layer==0))
+    if (cpi->cyclic_refresh_mode_enabled)
+    {
+      if (cpi->current_layer==0)
         cyclic_background_refresh(cpi, Q, 0);
+      else
+        disable_segmentation(cpi);
+    }
 
     vp8_compute_frame_size_bounds(cpi, &frame_under_shoot_limit, &frame_over_shoot_limit);
 
@@ -3908,8 +3913,13 @@
                * and background refresh.
                */
               Q = vp8_regulate_q(cpi, cpi->this_frame_target);
-              if (cpi->cyclic_refresh_mode_enabled && (cpi->current_layer==0))
-                cyclic_background_refresh(cpi, Q, 0);
+              if (cpi->cyclic_refresh_mode_enabled)
+              {
+                if (cpi->current_layer==0)
+                  cyclic_background_refresh(cpi, Q, 0);
+                else
+                  disable_segmentation(cpi);
+              }
               vp8_set_quantizer(cpi, Q);
             }