commit efc55fd9a48361d71966274ac89cefb9aab4674f
author Cheng Chen <chengchen@google.com> Tue Oct 10 12:08:28 2017 -0700
committer Cheng Chen <chengchen@google.com> Wed Oct 25 22:38:33 2017 +0000
tree e2393300b2ecf138f8c0b278ccabdedcc086d22d
parent e5cfa6f7593659f89c62a0e55d7d91376eb37c79

JNT_COMP: 2. assign proper weigths in rdopt

Change-Id: I255be6e0193dd6b91424ce53ed41aeaaeb1c01a7

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index f861c31..6fb0312 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -349,7 +349,11 @@
         aom_comp_mask_pred(comp_pred, second_pred, w, h, y + offset, y_stride,
                            mask, mask_stride, invert_mask);
       else
+#if CONFIG_JNT_COMP
+        aom_comp_avg_pred_c(comp_pred, second_pred, w, h, y + offset, y_stride);
+#else
         aom_comp_avg_pred(comp_pred, second_pred, w, h, y + offset, y_stride);
+#endif  // CONFIG_JNT_COMP
       besterr = vfp->vf(comp_pred, w, src, src_stride, sse1);
     }
   } else {
@@ -365,7 +369,11 @@
       aom_comp_mask_pred(comp_pred, second_pred, w, h, y + offset, y_stride,
                          mask, mask_stride, invert_mask);
     else
+#if CONFIG_JNT_COMP
+      aom_comp_avg_pred_c(comp_pred, second_pred, w, h, y + offset, y_stride);
+#else
       aom_comp_avg_pred(comp_pred, second_pred, w, h, y + offset, y_stride);
+#endif  // CONFIG_JNT_COMP
     besterr = vfp->vf(comp_pred, w, src, src_stride, sse1);
   } else {
     besterr = vfp->vf(y + offset, y_stride, src, src_stride, sse1);
@@ -663,8 +671,13 @@
                                      subpel_y_q3, y, y_stride, mask,
                                      mask_stride, invert_mask);
       else
-        aom_comp_avg_upsampled_pred(pred, second_pred, w, h, subpel_x_q3,
-                                    subpel_y_q3, y, y_stride);
+#if CONFIG_JNT_COMP
+        aom_comp_avg_upsampled_pred_c(pred, second_pred, w, h, subpel_x_q3,
+                                      subpel_y_q3, y, y_stride);
+#else
+      aom_comp_avg_upsampled_pred(pred, second_pred, w, h, subpel_x_q3,
+                                  subpel_y_q3, y, y_stride);
+#endif  // CONFIG_JNT_COMP
     } else {
       aom_upsampled_pred(pred, w, h, subpel_x_q3, subpel_y_q3, y, y_stride);
     }