commit 0c628e64d0b0e3ae03830395411dddee117f455a
author hui su <huisu@google.com> Wed Nov 30 15:20:48 2016 -0800
committer Hui Su <huisu@google.com> Thu Dec 01 17:44:14 2016 +0000
tree 4fb48602e3da831aba519082ace648dfd105cef8
parent e166e25fad84382866ba869be037c34c9d044aba

Make alt-intra work with ext-intra

Change-Id: I2a814ba878a57c6b73f8f9e29bea6c7edfe7c789

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 0f5db59..3f45757 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4079,11 +4079,11 @@
 
     mbmi->uv_mode = mode;
 #if CONFIG_EXT_INTRA
-    is_directional_mode = (mode != DC_PRED && mode != TM_PRED);
+    is_directional_mode = av1_is_directional_mode(mode, mbmi->sb_type);
     rate_overhead = cpi->intra_uv_mode_cost[mbmi->mode][mode] +
                     write_uniform_cost(2 * MAX_ANGLE_DELTAS + 1, 0);
     mbmi->angle_delta[1] = 0;
-    if (mbmi->sb_type >= BLOCK_8X8 && is_directional_mode) {
+    if (is_directional_mode) {
       if (!rd_pick_intra_angle_sbuv(
               cpi, x, &this_rate, &tokenonly_rd_stats.rate,
               &tokenonly_rd_stats.dist, &tokenonly_rd_stats.skip, bsize,
@@ -4099,7 +4099,7 @@
     }
     this_rate =
         tokenonly_rd_stats.rate + cpi->intra_uv_mode_cost[mbmi->mode][mode];
-    if (mbmi->sb_type >= BLOCK_8X8 && is_directional_mode)
+    if (is_directional_mode)
       this_rate += write_uniform_cost(2 * MAX_ANGLE_DELTAS + 1,
                                       MAX_ANGLE_DELTAS + mbmi->angle_delta[1]);
 #else