Turns variance based partitioning on in Speed 7

Improves coding efficiency by about 1%, increases speed by
about 15-20% over exsiting speed 7.

Change-Id: Ibf5b9b5a5c8548e863ce19047c42b579aac21d19

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 7b15d0ab908ba9339840d6033a3c458cae4e613d..81a0e035c806557a7ca502f6d80be9bcfa7c9fb3 100644 (file)
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -141,14 +141,12 @@ static BLOCK_SIZE get_nonrd_var_based_fixed_partition(VP9_COMP *cpi,
   unsigned int var = get_sby_perpixel_diff_variance(cpi, &cpi->mb,
                                                     mi_row, mi_col,
                                                     BLOCK_64X64);
-  if (var < 8)
+  if (var < 4)
     return BLOCK_64X64;
-  else if (var < 64)
+  else if (var < 10)
     return BLOCK_32X32;
-  else if (var < 2048)
-    return BLOCK_16X16;
   else
-    return BLOCK_8X8;
+    return BLOCK_16X16;
 }
 
 // Original activity measure from Tim T's code.

diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 8f7a2bc930699079a255f11fe5cb962188e8b07e..95ebb0c6d2423a43c89439a375c1fe167e7eef10 100644 (file)
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -855,8 +855,7 @@ static void set_rt_speed_feature(VP9_COMMON *cm,
     sf->partition_search_type = VAR_BASED_FIXED_PARTITION;
   }
   if (speed >= 7) {
-    sf->partition_search_type = FIXED_PARTITION;
-    sf->always_this_block_size = BLOCK_16X16;
+    sf->partition_search_type = VAR_BASED_FIXED_PARTITION;
     sf->use_nonrd_pick_mode = 1;
   }
 }