commit e646daa9456d60ad37f51aa9bc8cd3a95bb15196
author Zoe Liu <zoeliu@google.com> Tue Oct 17 15:28:46 2017 -0700
committer Zoe Liu <zoeliu@google.com> Wed Oct 18 01:08:19 2017 +0000
tree 6ce269cd78397fd3fc96f20764df1e58ab3f2af6
parent 1eed2df9e3f20c846a9d6d963bb5e9c8ae15ab18

Clean up the code for skip probs

Change-Id: Ia0fd1590d3a5aa1691e6ca0a7ab7ddaab3c7297b

av1/common/pred_common.h

diff --git a/av1/common/pred_common.h b/av1/common/pred_common.h
index 6e8ddd2..a944998 100644
--- a/av1/common/pred_common.h
+++ b/av1/common/pred_common.h
@@ -69,13 +69,6 @@
   return above_skip + left_skip;
 }
 
-#if !CONFIG_NEW_MULTISYMBOL
-static INLINE aom_prob av1_get_skip_prob(const AV1_COMMON *cm,
-                                         const MACROBLOCKD *xd) {
-  return cm->fc->skip_probs[av1_get_skip_context(xd)];
-}
-#endif  // !CONFIG_NEW_MULTISYMBOL
-
 #if CONFIG_DUAL_FILTER
 int av1_get_pred_context_switchable_interp(const MACROBLOCKD *xd, int dir);
 #else

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 303c03c..f21bf51 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -388,12 +388,12 @@
     return 1;
   } else {
     const int skip = mi->mbmi.skip;
+    const int ctx = av1_get_skip_context(xd);
 #if CONFIG_NEW_MULTISYMBOL
     FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
-    const int ctx = av1_get_skip_context(xd);
     aom_write_symbol(w, skip, ec_ctx->skip_cdfs[ctx], 2);
 #else
-    aom_write(w, skip, av1_get_skip_prob(cm, xd));
+    aom_write(w, skip, cm->fc->skip_probs[ctx]);
 #endif
     return skip;
   }