commit c95e364bdb74559b4476b5c3272178a893c5abd7
author chiyotsai <chiyotsai@google.com> Fri Apr 10 13:17:06 2020 -0700
committer Chi Yo Tsai <chiyotsai@google.com> Mon Apr 20 18:00:40 2020 +0000
tree e417e6212fd95602a91fa1dfbe443b4073553601
parent 70964106a8f782fb5871336922a8829ceb961470

Pack MVCost variables in MACROBLOCK to its own struct

BUG=aomedia:2618

Change-Id: I3d0e401d9ba504ab83f897fdb3b7ccac4cc839c0

av1/encoder/rd.h

diff --git a/av1/encoder/rd.h b/av1/encoder/rd.h
index 1addbae..d56813e 100644
--- a/av1/encoder/rd.h
+++ b/av1/encoder/rd.h
@@ -231,8 +231,9 @@
 
 void av1_initialize_rd_consts(struct AV1_COMP *cpi);
 
-void av1_initialize_me_consts(const struct AV1_COMP *cpi, MACROBLOCK *x,
-                              int qindex);
+// Sets the multiplier to convert mv cost to l1 error during motion search.
+void av1_set_sad_per_bit(const struct AV1_COMP *cpi, MvCostInfo *mv_cost_info,
+                         int qindex);
 
 void av1_model_rd_from_var_lapndz(int64_t var, unsigned int n,
                                   unsigned int qstep, int *rate, int64_t *dist);
@@ -280,9 +281,9 @@
                  uint8_t *ref_y_buffer, int ref_y_stride, int ref_frame,
                  BLOCK_SIZE block_size);
 
-static INLINE void set_error_per_bit(MACROBLOCK *x, int rdmult) {
-  x->errorperbit = rdmult >> RD_EPB_SHIFT;
-  x->errorperbit += (x->errorperbit == 0);
+// Sets the multiplier to convert mv cost to l2 error during motion search.
+static INLINE void av1_set_error_per_bit(MvCostInfo *mv_cost_info, int rdmult) {
+  mv_cost_info->errorperbit = AOMMAX(rdmult >> RD_EPB_SHIFT, 1);
 }
 
 // Get the threshold for R-D optimization of coefficients depending upon mode
@@ -357,7 +358,7 @@
                           const int num_planes);
 
 void av1_fill_mv_costs(const FRAME_CONTEXT *fc, int integer_mv, int usehp,
-                       MACROBLOCK *x);
+                       MvCostInfo *mv_cost_info);
 
 int av1_get_adaptive_rdmult(const struct AV1_COMP *cpi, double beta);