commit f3bf8b17aeed3621a7ca661e482fcf600acd11eb
author Luc Trudeau <luc@trud.ca> Fri Dec 08 14:38:41 2017 -0500
committer Luc Trudeau <luc@trud.ca> Sat Dec 09 04:35:47 2017 +0000
tree 38ac1b75e16086e903c88db629dfbcd998805a3f
parent c7ec615eeed9da145a65bca252757f125a2be199

[WarpedMotion] Added Const Correctness

Change-Id: Idac0e6f4928e18c115c1055ca43f5b817ca51518

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 8ccce76..fe9dd7b 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -671,7 +671,7 @@
 // same with that in AV1_COMMON
 #endif
   struct aom_internal_error_info *error_info;
-  WarpedMotionParams *global_motion;
+  const WarpedMotionParams *global_motion;
   int prev_qindex;
   int delta_qindex;
   int current_qindex;

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index c955b37..20089b9 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -84,7 +84,7 @@
         int_mv this_refmv;
 #if CONFIG_EXT_WARPED_MOTION
         if (candidate->motion_mode == WARPED_CAUSAL && do_warping) {
-          WarpedMotionParams wm = candidate->wm_params[0];
+          const WarpedMotionParams wm = candidate->wm_params[0];
           const int bw = block_size_wide[bsize];
           const int bh = block_size_high[bsize];
           int global_offset_c = mi_col * MI_SIZE;

av1/common/reconinter.c

diff --git a/av1/common/reconinter.c b/av1/common/reconinter.c
index e87a7ec..1e3ccaa 100644
--- a/av1/common/reconinter.c
+++ b/av1/common/reconinter.c
@@ -981,7 +981,8 @@
 #endif  // CONFIG_INTRABC
   int is_global[2] = { 0, 0 };
   for (ref = 0; ref < 1 + is_compound; ++ref) {
-    WarpedMotionParams *const wm = &xd->global_motion[mi->mbmi.ref_frame[ref]];
+    const WarpedMotionParams *const wm =
+        &xd->global_motion[mi->mbmi.ref_frame[ref]];
     is_global[ref] = is_global_mv_block(mi, block, wm->wmtype);
   }
 
@@ -2172,7 +2173,8 @@
   const int is_scaled = av1_is_scaled(sf);
   ConvolveParams conv_params = get_conv_params(ref, 0, plane);
   WarpTypesAllowed warp_types;
-  WarpedMotionParams *const wm = &xd->global_motion[mi->mbmi.ref_frame[ref]];
+  const WarpedMotionParams *const wm =
+      &xd->global_motion[mi->mbmi.ref_frame[ref]];
   warp_types.global_warp_allowed = is_global_mv_block(mi, block, wm->wmtype);
   warp_types.local_warp_allowed = mi->mbmi.motion_mode == WARPED_CAUSAL;
 

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index dae2186..1cbb358 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -5826,7 +5826,7 @@
   const int p_row = ((mi_row * MI_SIZE) >> pd->subsampling_y) + 4 * ir;
   int is_global[2];
   for (ref = 0; ref < 2; ++ref) {
-    WarpedMotionParams *const wm =
+    const WarpedMotionParams *const wm =
         &xd->global_motion[xd->mi[0]->mbmi.ref_frame[ref]];
     is_global[ref] = is_global_mv_block(xd->mi[0], block, wm->wmtype);
   }
@@ -6521,7 +6521,7 @@
   const int ir = (block - ic) >> 1;
   const int p_col = ((mi_col * MI_SIZE) >> pd->subsampling_x) + 4 * ic;
   const int p_row = ((mi_row * MI_SIZE) >> pd->subsampling_y) + 4 * ir;
-  WarpedMotionParams *const wm = &xd->global_motion[other_ref];
+  const WarpedMotionParams *const wm = &xd->global_motion[other_ref];
   int is_global = is_global_mv_block(xd->mi[0], block, wm->wmtype);
 
   // This function should only ever be called for compound modes
@@ -7787,7 +7787,7 @@
           if (!is_comp_pred && have_newmv_in_inter_mode(this_mode)) {
             int tmp_rate_mv = 0;
             const int_mv mv0 = mbmi->mv[0];
-            WarpedMotionParams wm_params0 = mbmi->wm_params[0];
+            const WarpedMotionParams wm_params0 = mbmi->wm_params[0];
 #if CONFIG_EXT_WARPED_MOTION
             int num_proj_ref0 = mbmi->num_proj_ref[0];