commit 5e6bd0f038f96ee890c8f1fc897a7ab44426616f
author Yaowu Xu <yaowu@google.com> Fri Oct 04 09:46:40 2019 -0700
committer Yaowu Xu <yaowu@google.com> Sat Oct 05 18:11:59 2019 +0000
tree 3d91888e9a9674df1332d1e72f6d2aef95e779c0
parent fdd0ab4b3d2b80f3a88f309b444e9f7bf1698600

Minor code improvements

Change-Id: I9a27c00f2f03fb865fd2c6af2392eae44277268b

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 028a919..5019ca6 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -1021,10 +1021,7 @@
 
 static INLINE int is_motion_variation_allowed_compound(
     const MB_MODE_INFO *mbmi) {
-  if (!has_second_ref(mbmi))
-    return 1;
-  else
-    return 0;
+  return !has_second_ref(mbmi);
 }
 
 // input: log2 of length, 0(4), 1(8), ...

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 4018602..431d540 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -35,27 +35,11 @@
 #include "av1/encoder/rd.h"
 #include "av1/encoder/rdopt.h"
 
-// Check if one needs to use c version subtraction.
-static int check_subtract_block_size(int w, int h) { return w < 4 || h < 4; }
-
 static void subtract_block(const MACROBLOCKD *xd, int rows, int cols,
                            int16_t *diff, ptrdiff_t diff_stride,
                            const uint8_t *src8, ptrdiff_t src_stride,
                            const uint8_t *pred8, ptrdiff_t pred_stride) {
-  if (check_subtract_block_size(rows, cols)) {
-#if CONFIG_AV1_HIGHBITDEPTH
-    if (is_cur_buf_hbd(xd)) {
-      aom_highbd_subtract_block_c(rows, cols, diff, diff_stride, src8,
-                                  src_stride, pred8, pred_stride, xd->bd);
-      return;
-    }
-#endif
-    (void)xd;
-    aom_subtract_block_c(rows, cols, diff, diff_stride, src8, src_stride, pred8,
-                         pred_stride);
-
-    return;
-  }
+  assert(rows >= 4 && cols >= 4);
 #if CONFIG_AV1_HIGHBITDEPTH
   if (is_cur_buf_hbd(xd)) {
     aom_highbd_subtract_block(rows, cols, diff, diff_stride, src8, src_stride,
@@ -63,6 +47,7 @@
     return;
   }
 #endif
+  (void)xd;
   aom_subtract_block(rows, cols, diff, diff_stride, src8, src_stride, pred8,
                      pred_stride);
 }