shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add no_skip_block4x4_search flag in SPLITMV mode"

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -592,6 +592,7 @@

     sf->iterative_sub_pixel = 1;

     sf->optimize_coefficients = 1;

     sf->use_fastquant_for_pick = 0;

+    sf->no_skip_block4x4_search = 1;

     sf->first_step = 0;

     sf->max_step_search_steps = MAX_MVSEARCH_STEPS;

@@ -794,6 +795,7 @@

             sf->first_step = 1;

             sf->max_step_search_steps = MAX_MVSEARCH_STEPS;

+            sf->no_skip_block4x4_search = 0;

         }

         if (Speed > 1)

--- a/vp8/encoder/onyx_int.h

+++ b/vp8/encoder/onyx_int.h

@@ -183,6 +183,7 @@

     int optimize_coefficients;

     int use_fastquant_for_pick;

+    int no_skip_block4x4_search;

 } SPEED_FEATURES;

--- a/vp8/encoder/rdopt.c

+++ b/vp8/encoder/rdopt.c

@@ -1375,7 +1375,8 @@

             }

             /* If 8x8 is better than 16x8/8x16, then do 4x4 search */

-            if (bsi.segment_num == BLOCK_8X8)  /* || (sv_segment_rd8x8-bsi.segment_rd) < sv_segment_rd8x8>>5) */

+            /* Not skip 4x4 if speed=0 (good quality) */

+            if (cpi->sf.no_skip_block4x4_search || bsi.segment_num == BLOCK_8X8)  /* || (sv_segment_rd8x8-bsi.segment_rd) < sv_segment_rd8x8>>5) */

             {

                 bsi.mvp = &bsi.sv_mvp[0];

                 vp8_rd_check_segment(cpi, x, &bsi, BLOCK_4X4);