commit 50af7308e91f97ef74b3e0bba6e757c05142efc1
author Fyodor Kyslov <kyslov@google.com> Mon Apr 06 16:23:16 2020 -0700
committer Fyodor Kyslov <kyslov@google.com> Tue Apr 07 16:51:34 2020 +0000
tree 1c3286131cf86e5f695b70fa47e9b8d46a3b3dfd
parent 33930b8f39b638a56b51d51033a121aeb834359c

AV1 RT: restrict condition to check merge on speed 7

lowres speed 7 gives ~5% speed up with 0.36% BDRate degradation

Change-Id: Ic8b8d59c515af5b6a9a6c3500ded816f443adb0a

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index c909f1c..142959a 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -2326,7 +2326,7 @@
     case PARTITION_SPLIT:
       if (cpi->sf.rt_sf.nonrd_check_partition_merge_mode &&
           is_leaf_split_partition(cm, mi_row, mi_col, bsize) &&
-          !frame_is_intra_only(cm)) {
+          !frame_is_intra_only(cm) && bsize <= BLOCK_32X32) {
         RD_SEARCH_MACROBLOCK_CONTEXT x_ctx;
         RD_STATS split_rdc, none_rdc;
         av1_invalid_rd_stats(&split_rdc);

test/rt_end_to_end_test.cc

diff --git a/test/rt_end_to_end_test.cc b/test/rt_end_to_end_test.cc
index 5cd0382..f14d124 100644
--- a/test/rt_end_to_end_test.cc
+++ b/test/rt_end_to_end_test.cc
@@ -44,7 +44,7 @@
                        { "niklas_1280_720_30.y4m",
                          { { 5, { { 0, 34.6 }, { 3, 34.6 } } },
                            { 6, { { 0, 34.2 }, { 3, 34.2 } } },
-                           { 7, { { 0, 33.7 }, { 3, 33.7 } } },
+                           { 7, { { 0, 33.7 }, { 3, 33.6 } } },
                            { 8, { { 0, 33.6 }, { 3, 33.4 } } } } } };
 
 typedef struct {