Fix a bug in THR_MODES
In THR_MODES, LAST_SINGLE_REF_MODES should be 27 instead of 26.
Noticed that this happens since global mv mode order is different
from that of other mv modes. So, fix it by changing the mode order
for global mv to be consistent with others.
Ran a borg test at speed 1:
avg_psnr: ovr_psnr: ssim:
lowres: 0.043 0.046 0.027
midres: 0.044 0.043 0.069
STATS_CHANGED
Change-Id: I79b459b1240818ab7d208d3b395b3e70b4610afe
diff --git a/av1/encoder/enc_enums.h b/av1/encoder/enc_enums.h
index d5c9744..b24b9d9 100644
--- a/av1/encoder/enc_enums.h
+++ b/av1/encoder/enc_enums.h
@@ -48,8 +48,8 @@
THR_GLOBALL3,
THR_GLOBALB,
THR_GLOBALA2,
- THR_GLOBALG,
THR_GLOBALA,
+ THR_GLOBALG,
THR_COMP_NEAREST_NEARESTLA,
THR_COMP_NEAREST_NEARESTL2A,
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 1e6bfa2..0bff9f2 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -229,8 +229,8 @@
{ GLOBALMV, { LAST3_FRAME, NONE_FRAME } },
{ GLOBALMV, { BWDREF_FRAME, NONE_FRAME } },
{ GLOBALMV, { ALTREF2_FRAME, NONE_FRAME } },
- { GLOBALMV, { GOLDEN_FRAME, NONE_FRAME } },
{ GLOBALMV, { ALTREF_FRAME, NONE_FRAME } },
+ { GLOBALMV, { GOLDEN_FRAME, NONE_FRAME } },
// TODO(zoeliu): May need to reconsider the order on the modes to check
