commit eb2fd5c58a73b473bcd7f9a7cbc7a48a4f8aa141
author Hui Su <huisu@google.com> Fri Dec 15 14:38:01 2017 -0800
committer Hui Su <huisu@google.com> Thu Dec 21 20:34:04 2017 +0000
tree b205f7b942c8e9eece3f5b99482c1e2f9d5b6a07
parent b4faea7324ec0f8f4a6d7afc986ad1120788729f

intrabc: enable 16x4 and 4x16 blocks

0.15% gain on the screen_content testset.

BUG=aomedia:998

Change-Id: Ia6484a90b92a00bb0073ecf988b5c164fe8ba84c

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index db7fd99..a2bd8bb 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1685,7 +1685,7 @@
                        !xd->lossless[mbmi->segment_id];
 
 #if CONFIG_INTRABC
-  if (av1_allow_intrabc(bsize, cm)) {
+  if (av1_allow_intrabc(cm)) {
     write_intrabc_info(cm, xd, mbmi_ext, enable_tx_size, w);
     if (is_intrabc_block(mbmi)) return;
   }

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index a00b4bd..9d46505 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4569,7 +4569,7 @@
 
   if (!dry_run) {
 #if CONFIG_INTRABC
-    if (av1_allow_intrabc(bsize, cm))
+    if (av1_allow_intrabc(cm))
       if (is_intrabc_block(mbmi)) td->intrabc_used_this_tile = 1;
 #endif  // CONFIG_INTRABC
     TX_SIZE tx_size =

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 5e93d53..ce408cb 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8668,7 +8668,7 @@
                                        RD_STATS *rd_cost, BLOCK_SIZE bsize,
                                        int64_t best_rd) {
   const AV1_COMMON *const cm = &cpi->common;
-  if (!av1_allow_intrabc(bsize, cm)) return INT64_MAX;
+  if (!av1_allow_intrabc(cm)) return INT64_MAX;
 
   MACROBLOCKD *const xd = &x->e_mbd;
   const TileInfo *tile = &xd->tile;