Merge "Reduce max_partition_size for low resolutions at speed 5."

8e029fcf · Marco · Gerrit Code Review · 1395b56a · debe4e92 · 8e029fcf
Commit 8e029fcf authored Jun 22, 2015 by Marco Committed by Gerrit Code Review Jun 22, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

vp9/encoder/vp9_encodeframe.c vp9/encoder/vp9_encodeframe.c +5 -1

No files found.
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -3572,7 +3572,11 @@ static void encode_nonrd_sb_row(VP9_COMP *cpi,
        set_offsets(cpi, tile_info, x, mi_row, mi_col, BLOCK_64X64);
        if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled &&
            xd->mi[0]->mbmi.segment_id) {
-          x->max_partition_size = BLOCK_64X64;
+          // Use lower max_partition_size for low resoultions.
+          if (cm->width <= 352 && cm->height <= 288)
+            x->max_partition_size = BLOCK_32X32;
+          else
+            x->max_partition_size = BLOCK_64X64;
          x->min_partition_size = BLOCK_8X8;
          nonrd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col,
                               BLOCK_64X64, &dummy_rdc, 1,