commit 8a3d80ebf4125951931debfb5040b4ef5e4f8370
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Tue Dec 05 10:04:03 2017 +0100
committer Urvang Joshi <urvang@google.com> Fri Dec 08 19:43:09 2017 +0000
tree 0ee9f3a6ecf3928eb44ebb8e777fdd5260426d21
parent 3f2b57d873d61c485e1bf201cc653f2bc36c8200

Avoid memset when possible

Also, reduce scope of one local.

Change-Id: I41cb53528d4b7bc88eb343d8c943ed241230af82

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index c6fac1b..4a7729b 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1850,10 +1850,9 @@
   const BLOCK_SIZE bsize = mbmi->sb_type;
   const int allow_hp = cm->allow_high_precision_mv;
   int_mv nearestmv[2], nearmv[2];
-  int_mv ref_mvs[MODE_CTX_REF_FRAMES][MAX_MV_REF_CANDIDATES];
+  int_mv ref_mvs[MODE_CTX_REF_FRAMES][MAX_MV_REF_CANDIDATES] = { { { 0 } } };
   int16_t inter_mode_ctx[MODE_CTX_REF_FRAMES];
   int16_t compound_inter_mode_ctx[MODE_CTX_REF_FRAMES];
-  int mode_ctx = 0;
   int pts[SAMPLES_ARRAY_SIZE], pts_inref[SAMPLES_ARRAY_SIZE];
 #if CONFIG_EXT_WARPED_MOTION
   int pts_mv[SAMPLES_ARRAY_SIZE], pts_wm[SAMPLES_ARRAY_SIZE];
@@ -1866,8 +1865,6 @@
   mbmi->palette_mode_info.palette_size[0] = 0;
   mbmi->palette_mode_info.palette_size[1] = 0;
 
-  memset(ref_mvs, 0, sizeof(ref_mvs));
-
   read_ref_frames(cm, xd, r, mbmi->segment_id, mbmi->ref_frame);
   const int is_compound = has_second_ref(mbmi);
 
@@ -1934,6 +1931,8 @@
     }
   }
 
+  int mode_ctx = 0;
+
   if (is_compound)
     mode_ctx = compound_inter_mode_ctx[mbmi->ref_frame[0]];
   else