commit 2d276b39e8d6176de5f2a1a8b68cdbb302db9a63
author Joe Young <joeyoung@google.com> Wed Feb 07 14:39:46 2018 -0800
committer Joe Young <joeyoung@google.com> Fri Feb 09 02:29:35 2018 +0000
tree ab2a5ace06de98e723e2dda2caecaf2bce4d4164
parent 4f91a13a44df8e0947a82b70e54813d5757b157c

[normative][intra-edge] get_filt_type luma/chroma mode

Use correct luma/chroma modes in get_filt_type()

BD-rate change (4 key frames):

           PSNR    SSIM
lowres:  -0.005  +0.022
midres:  -0.016  -0.021
hdres:   -0.008  -0.015

BUG=aomedia:1312

Change-Id: Ia9a22718d330fc4d3d932dbac0723c0522f0c4d1

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index aeabe72..5e1b5de 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -1392,17 +1392,24 @@
 #endif  // CONFIG_FILTER_INTRA
 
 #if CONFIG_INTRA_EDGE
-static int is_smooth(MB_MODE_INFO *mbmi) {
-  return (mbmi->mode == SMOOTH_PRED || mbmi->mode == SMOOTH_V_PRED ||
-          mbmi->mode == SMOOTH_H_PRED);
+static int is_smooth(const MB_MODE_INFO *mbmi, int plane) {
+  if (plane == 0) {
+    const PREDICTION_MODE mode = mbmi->mode;
+    return (mode == SMOOTH_PRED || mode == SMOOTH_V_PRED ||
+            mode == SMOOTH_H_PRED);
+  } else {
+    const UV_PREDICTION_MODE uv_mode = mbmi->uv_mode;
+    return (uv_mode == UV_SMOOTH_PRED || uv_mode == UV_SMOOTH_V_PRED ||
+            uv_mode == UV_SMOOTH_H_PRED);
+  }
 }
 
-static int get_filt_type(const MACROBLOCKD *xd) {
-  MB_MODE_INFO *ab = xd->up_available ? &xd->mi[-xd->mi_stride]->mbmi : 0;
-  MB_MODE_INFO *le = xd->left_available ? &xd->mi[-1]->mbmi : 0;
+static int get_filt_type(const MACROBLOCKD *xd, int plane) {
+  const MB_MODE_INFO *ab = xd->up_available ? &xd->mi[-xd->mi_stride]->mbmi : 0;
+  const MB_MODE_INFO *le = xd->left_available ? &xd->mi[-1]->mbmi : 0;
 
-  const int ab_sm = ab ? is_smooth(ab) : 0;
-  const int le_sm = le ? is_smooth(le) : 0;
+  const int ab_sm = ab ? is_smooth(ab, plane) : 0;
+  const int le_sm = le ? is_smooth(le, plane) : 0;
 
   return (ab_sm || le_sm) ? 1 : 0;
 }
@@ -1786,7 +1793,7 @@
 #if CONFIG_INTRA_EDGE
     const int need_right = p_angle < 90;
     const int need_bottom = p_angle > 180;
-    const int filt_type = get_filt_type(xd);
+    const int filt_type = get_filt_type(xd, plane);
     if (p_angle != 90 && p_angle != 180) {
       const int ab_le = need_above_left ? 1 : 0;
 #if CONFIG_EXT_INTRA_MOD
@@ -2003,7 +2010,7 @@
 #if CONFIG_INTRA_EDGE
     const int need_right = p_angle < 90;
     const int need_bottom = p_angle > 180;
-    const int filt_type = get_filt_type(xd);
+    const int filt_type = get_filt_type(xd, plane);
     if (p_angle != 90 && p_angle != 180) {
       const int ab_le = need_above_left ? 1 : 0;
 #if CONFIG_EXT_INTRA_MOD