commit 36cb63f17702f449624cf6d80014f048d514a58c
author chiyotsai <chiyotsai@google.com> Fri Dec 21 11:59:31 2018 -0800
committer Chi Yo Tsai <chiyotsai@google.com> Sat Dec 22 19:14:27 2018 +0000
tree 899dcc55343f95e7a8fb695c99ecda4df42f065b
parent 20a747b9ce5ec99ad2f78dd206a3fc1b8abf6850

Enable ml_prune_rect_partition on speed 1

Renables ml_prune_rect_partition on speed 1.

Performance Evaluation:
AVG_PSNR: 0.022%
OVR_PSNR: 0.034%
TIME_RDX: 1.194%

Both AVG_PSNR and OVR_PSNR are calculated on midres over 60 frames.
Time reduction is averaged over 5 midres clips over 4 bitrates and 30
frames.

STATS_CHANGED

Change-Id: Iddc6c276d4c3bf0a146021b070eb403fd03b60f6

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index fa8b663..38da2a1 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4445,7 +4445,8 @@
   }
 
   if (cpi->sf.ml_prune_rect_partition && !frame_is_intra_only(cm) &&
-      (partition_horz_allowed || partition_vert_allowed)) {
+      (partition_horz_allowed || partition_vert_allowed) &&
+      !(prune_horz || prune_vert)) {
     av1_setup_src_planes(x, cpi->source, mi_row, mi_col, num_planes, bsize);
     ml_prune_rect_partition(cpi, x, bsize, best_rdc.rdcost, cur_none_rd,
                             split_rd, &prune_horz, &prune_vert);

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 2cf1696..67678f0 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -249,10 +249,7 @@
     sf->prune_single_motion_modes_by_simple_trans = 1;
 
     sf->full_pixel_motion_search_based_split = 1;
-    // TODO(chiyotsai@google.com): Try enabling both
-    // simple_motion_search_prune_rect and ml_prune_rect_partition.
     sf->simple_motion_search_prune_rect = 1;
-    sf->ml_prune_rect_partition = 0;
 
     sf->disable_wedge_search_var_thresh = 0;
     sf->disable_wedge_search_edge_thresh = 0;