commit ccfe6aab8c737caa9d8dcbce294c47762a220de5
author Satish Kumar Suman <satish.suman@ittiam.com> Thu Jan 16 12:18:08 2020 +0530
committer Yunqing Wang <yunqingwang@google.com> Thu Jan 16 17:27:27 2020 +0000
tree 7a9f81c16a87341feb25c0c16f76acbed481f485
parent da552c0ec138fc8d22f9e211c2cf295d540c1354

Change INLINE to AOM_INLINE in rdopt_utils.h

This patch moves utility function restore_dst_buf
from rdopt.c to rdopt_utils.h and modifies pre-processor
directives appropriately.

Change-Id: I6e7a9442bd60b35159aae2564452b30db430e557

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index e821a34..b3898e7 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -7209,14 +7209,6 @@
     x->pred_mv[ref] = x->best_mv.as_mv;
 }
 
-static INLINE void restore_dst_buf(MACROBLOCKD *xd, const BUFFER_SET dst,
-                                   const int num_planes) {
-  for (int i = 0; i < num_planes; i++) {
-    xd->plane[i].dst.buf = dst.plane[i];
-    xd->plane[i].dst.stride = dst.stride[i];
-  }
-}
-
 static AOM_INLINE void build_second_inter_pred(const AV1_COMP *cpi,
                                                MACROBLOCK *x, BLOCK_SIZE bsize,
                                                const MV *other_mv, int ref_idx,

av1/encoder/rdopt_utils.h

diff --git a/av1/encoder/rdopt_utils.h b/av1/encoder/rdopt_utils.h
index 33351ea..31330dc 100644
--- a/av1/encoder/rdopt_utils.h
+++ b/av1/encoder/rdopt_utils.h
@@ -20,11 +20,19 @@
 extern "C" {
 #endif
 
+static AOM_INLINE void restore_dst_buf(MACROBLOCKD *xd, const BUFFER_SET dst,
+                                       const int num_planes) {
+  for (int i = 0; i < num_planes; i++) {
+    xd->plane[i].dst.buf = dst.plane[i];
+    xd->plane[i].dst.stride = dst.stride[i];
+  }
+}
+
 /* clang-format on */
 // Calculate rd threshold based on ref best rd and relevant scaling factors
-static INLINE int64_t get_rd_thresh_from_best_rd(int64_t ref_best_rd,
-                                                 int mul_factor,
-                                                 int div_factor) {
+static AOM_INLINE int64_t get_rd_thresh_from_best_rd(int64_t ref_best_rd,
+                                                     int mul_factor,
+                                                     int div_factor) {
   int64_t rd_thresh = ref_best_rd;
   if (div_factor != 0) {
     rd_thresh = ref_best_rd < (div_factor * (INT64_MAX / mul_factor))
@@ -34,9 +42,9 @@
   return rd_thresh;
 }
 
-static THR_MODES get_prediction_mode_idx(PREDICTION_MODE this_mode,
-                                         MV_REFERENCE_FRAME ref_frame,
-                                         MV_REFERENCE_FRAME second_ref_frame) {
+static AOM_INLINE THR_MODES
+get_prediction_mode_idx(PREDICTION_MODE this_mode, MV_REFERENCE_FRAME ref_frame,
+                        MV_REFERENCE_FRAME second_ref_frame) {
   if (this_mode < INTRA_MODE_END) {
     assert(ref_frame == INTRA_FRAME);
     assert(second_ref_frame == NONE_FRAME);
@@ -59,7 +67,7 @@
   return THR_INVALID;
 }
 
-static int inter_mode_data_block_idx(BLOCK_SIZE bsize) {
+static AOM_INLINE int inter_mode_data_block_idx(BLOCK_SIZE bsize) {
   if (bsize == BLOCK_4X4 || bsize == BLOCK_4X8 || bsize == BLOCK_8X4 ||
       bsize == BLOCK_4X16 || bsize == BLOCK_16X4) {
     return -1;
@@ -104,7 +112,7 @@
   if (width) *width = txb_width;
 }
 
-static INLINE int bsize_to_num_blk(BLOCK_SIZE bsize) {
+static AOM_INLINE int bsize_to_num_blk(BLOCK_SIZE bsize) {
   int num_blk = 1 << (num_pels_log2_lookup[bsize] - 2 * MI_SIZE_LOG2);
   return num_blk;
 }