shithub: libvpx

Info  •  Files  •  Log  •  Branches

Disable background update on non-base layer frames

Multi-threaded code was not updated to disable background
refresh for non base-layer frames at the time it was
disabled in the main C-code.

Change-Id: Id6cc376130b7def046942121cfd0526b4f0a71d4

--- a/vp8/encoder/encodeframe.c

+++ b/vp8/encoder/encodeframe.c

@@ -529,7 +529,8 @@

              * segmentation map

              */

             if ((cpi->current_layer == 0) &&

-                (cpi->cyclic_refresh_mode_enabled && xd->segmentation_enabled))

+                (cpi->cyclic_refresh_mode_enabled &&

+                 xd->segmentation_enabled))

             {

                 cpi->segmentation_map[map_index+mb_col] = xd->mode_info_context->mbmi.segment_id;

--- a/vp8/encoder/ethreading.c

+++ b/vp8/encoder/ethreading.c

@@ -214,7 +214,9 @@

                          * vp8cx_encode_inter_macroblock()) back into the

                          * global segmentation map

                          */

-                        if (cpi->cyclic_refresh_mode_enabled && xd->segmentation_enabled)

+                        if ((cpi->current_layer == 0) &&

+                            (cpi->cyclic_refresh_mode_enabled &&

+                             xd->segmentation_enabled))

                         {

                             const MB_MODE_INFO * mbmi = &xd->mode_info_context->mbmi;

                             cpi->segmentation_map[map_index + mb_col] = mbmi->segment_id;

-- 

⑨