commit 69d2101147c23e7d7635e717dd7ede8383144cf6
author Jingning Han <jingning@google.com> Sun May 14 16:51:27 2017 -0700
committer Jingning Han <jingning@google.com> Wed May 17 17:20:30 2017 +0000
tree e0a68cb039179167fdc028b62cfc6d740287fb0c
parent 36bad477a58ca62b095061b0efb60aef7becaab7

Use single reference frame for 4x4 coding block in chroma-sub8x8

Change-Id: Ic04bd1ac62ea35082883d0560f91843040e35a64

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 38e65e4..ebf002b 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -10338,7 +10338,7 @@
       int_mv backup_ref_mv[2];
 
 #if !SUB8X8_COMP_REF
-      if (bsize < BLOCK_8X8 && mbmi->ref_frame[1] > INTRA_FRAME) continue;
+      if (bsize == BLOCK_4X4 && mbmi->ref_frame[1] > INTRA_FRAME) continue;
 #endif  // !SUB8X8_COMP_REF
 
       backup_ref_mv[0] = mbmi_ext->ref_mvs[ref_frame][0];
@@ -10683,7 +10683,7 @@
 #if SUB8X8_COMP_REF
       compmode_cost = av1_cost_bit(comp_mode_p, comp_pred);
 #else
-      if (mbmi->sb_type >= BLOCK_8X8)
+      if (mbmi->sb_type != BLOCK_4X4)
         compmode_cost = av1_cost_bit(comp_mode_p, comp_pred);
 #endif  // SUB8X8_COMP_REF