shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Apply finer quantizer to partition search frames in non-RD flow"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -1377,6 +1377,7 @@

     for (block_col = 0; block_col < 8; ++block_col) {

       MODE_INFO *const prev_mi = prev_mi_8x8[block_row * mis + block_col];

       const BLOCK_SIZE sb_type = prev_mi ? prev_mi->mbmi.sb_type : 0;

+

       if (prev_mi) {

         const ptrdiff_t offset = prev_mi - cm->prev_mi;

         mi_8x8[block_row * mis + block_col] = cm->mi + offset;

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -2673,6 +2673,8 @@

   vp9_write_yuv_frame(cpi->Source);

 #endif

+  set_speed_features(cpi);

+

   // Decide q and q bounds.

   q = vp9_rc_pick_q_and_bounds(cpi, &bottom_index, &top_index);

@@ -2681,8 +2683,6 @@

     /* TODO: Decide this more intelligently */

     set_high_precision_mv(cpi, q < HIGH_PRECISION_MV_QTHRESH);

   }

-

-  set_speed_features(cpi);

   if (cpi->sf.recode_loop == DISALLOW_RECODE) {

     encode_without_recode_loop(cpi, size, dest, q);

--- a/vp9/encoder/vp9_ratectrl.c

+++ b/vp9/encoder/vp9_ratectrl.c

@@ -985,6 +985,9 @@

       q /= 3;

     if (q == 0)

       q++;

+    if (cpi->sf.partition_check == 1)

+      q -= 10;

+

     if (q < *bottom_index)

       *bottom_index = q;

     else if (q > *top_index)

-- 

⑨