commit 47a72d49f84b3deb9771d98b75ceebd6647e3c4a
author Jingning Han <jingning@google.com> Wed Nov 18 13:16:31 2020 -0800
committer Jingning Han <jingning@google.com> Thu Nov 19 19:51:12 2020 +0000
tree 84ccf56454426c1e450f5c2bb79a45cc94d6618c
parent 065983b8ab2176fe7e9a8caf74d7664c5f8d4fd7

Conduct lst/bwd compound mode search first

Reorder the mode search sequence to conduct the lst/bwd pair
compound mode search first.

STATS_CHANGED

Change-Id: I72b131f02e7dce98ddb359ead57eff68bb72f5bd

av1/encoder/enc_enums.h

diff --git a/av1/encoder/enc_enums.h b/av1/encoder/enc_enums.h
index 0799032..319e5d0 100644
--- a/av1/encoder/enc_enums.h
+++ b/av1/encoder/enc_enums.h
@@ -68,6 +68,14 @@
   THR_COMP_NEAREST_NEARESTLG,
   THR_COMP_NEAREST_NEARESTBA,
 
+  THR_COMP_NEAR_NEARLB,
+  THR_COMP_NEW_NEWLB,
+  THR_COMP_NEW_NEARESTLB,
+  THR_COMP_NEAREST_NEWLB,
+  THR_COMP_NEW_NEARLB,
+  THR_COMP_NEAR_NEWLB,
+  THR_COMP_GLOBAL_GLOBALLB,
+
   THR_COMP_NEAR_NEARLA,
   THR_COMP_NEW_NEWLA,
   THR_COMP_NEW_NEARESTLA,
@@ -100,14 +108,6 @@
   THR_COMP_NEAR_NEWGA,
   THR_COMP_GLOBAL_GLOBALGA,
 
-  THR_COMP_NEAR_NEARLB,
-  THR_COMP_NEW_NEWLB,
-  THR_COMP_NEW_NEARESTLB,
-  THR_COMP_NEAREST_NEWLB,
-  THR_COMP_NEW_NEARLB,
-  THR_COMP_NEAR_NEWLB,
-  THR_COMP_GLOBAL_GLOBALLB,
-
   THR_COMP_NEAR_NEARL2B,
   THR_COMP_NEW_NEWL2B,
   THR_COMP_NEW_NEARESTL2B,

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 622793f..28df2f2 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -154,6 +154,14 @@
   THR_COMP_NEAREST_NEARESTLG,
   THR_COMP_NEAREST_NEARESTBA,
 
+  THR_COMP_NEAR_NEARLB,
+  THR_COMP_NEW_NEWLB,
+  THR_COMP_NEW_NEARESTLB,
+  THR_COMP_NEAREST_NEWLB,
+  THR_COMP_NEW_NEARLB,
+  THR_COMP_NEAR_NEWLB,
+  THR_COMP_GLOBAL_GLOBALLB,
+
   THR_COMP_NEAR_NEARLA,
   THR_COMP_NEW_NEWLA,
   THR_COMP_NEW_NEARESTLA,
@@ -186,14 +194,6 @@
   THR_COMP_NEAR_NEWGA,
   THR_COMP_GLOBAL_GLOBALGA,
 
-  THR_COMP_NEAR_NEARLB,
-  THR_COMP_NEW_NEWLB,
-  THR_COMP_NEW_NEARESTLB,
-  THR_COMP_NEAREST_NEWLB,
-  THR_COMP_NEW_NEARLB,
-  THR_COMP_NEAR_NEWLB,
-  THR_COMP_GLOBAL_GLOBALLB,
-
   THR_COMP_NEAR_NEARL2B,
   THR_COMP_NEW_NEWL2B,
   THR_COMP_NEW_NEARESTL2B,

av1/encoder/rdopt_utils.h

diff --git a/av1/encoder/rdopt_utils.h b/av1/encoder/rdopt_utils.h
index 695aa48..4063889 100644
--- a/av1/encoder/rdopt_utils.h
+++ b/av1/encoder/rdopt_utils.h
@@ -86,6 +86,14 @@
   { NEAREST_NEARESTMV, { LAST_FRAME, GOLDEN_FRAME } },
   { NEAREST_NEARESTMV, { BWDREF_FRAME, ALTREF_FRAME } },
 
+  { NEAR_NEARMV, { LAST_FRAME, BWDREF_FRAME } },
+  { NEW_NEWMV, { LAST_FRAME, BWDREF_FRAME } },
+  { NEW_NEARESTMV, { LAST_FRAME, BWDREF_FRAME } },
+  { NEAREST_NEWMV, { LAST_FRAME, BWDREF_FRAME } },
+  { NEW_NEARMV, { LAST_FRAME, BWDREF_FRAME } },
+  { NEAR_NEWMV, { LAST_FRAME, BWDREF_FRAME } },
+  { GLOBAL_GLOBALMV, { LAST_FRAME, BWDREF_FRAME } },
+
   { NEAR_NEARMV, { LAST_FRAME, ALTREF_FRAME } },
   { NEW_NEWMV, { LAST_FRAME, ALTREF_FRAME } },
   { NEW_NEARESTMV, { LAST_FRAME, ALTREF_FRAME } },
@@ -118,14 +126,6 @@
   { NEAR_NEWMV, { GOLDEN_FRAME, ALTREF_FRAME } },
   { GLOBAL_GLOBALMV, { GOLDEN_FRAME, ALTREF_FRAME } },
 
-  { NEAR_NEARMV, { LAST_FRAME, BWDREF_FRAME } },
-  { NEW_NEWMV, { LAST_FRAME, BWDREF_FRAME } },
-  { NEW_NEARESTMV, { LAST_FRAME, BWDREF_FRAME } },
-  { NEAREST_NEWMV, { LAST_FRAME, BWDREF_FRAME } },
-  { NEW_NEARMV, { LAST_FRAME, BWDREF_FRAME } },
-  { NEAR_NEWMV, { LAST_FRAME, BWDREF_FRAME } },
-  { GLOBAL_GLOBALMV, { LAST_FRAME, BWDREF_FRAME } },
-
   { NEAR_NEARMV, { LAST2_FRAME, BWDREF_FRAME } },
   { NEW_NEWMV, { LAST2_FRAME, BWDREF_FRAME } },
   { NEW_NEARESTMV, { LAST2_FRAME, BWDREF_FRAME } },