diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-31 15:52:35 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-31 15:52:35 -0800 |
commit | a8a2f22958a303e0876cffd2abe1527de41633c0 (patch) | |
tree | 853e119a4171625071d8e96e542806c50d7f73f3 /vp9/common/vp9_entropymode.c | |
parent | d009b06ebf748eb7a603e808994d619cbf9f1163 (diff) | |
parent | b107f2c4708c05f40c3a2709ad83984ede48e1db (diff) | |
download | libvpx-a8a2f22958a303e0876cffd2abe1527de41633c0.tar libvpx-a8a2f22958a303e0876cffd2abe1527de41633c0.tar.gz libvpx-a8a2f22958a303e0876cffd2abe1527de41633c0.tar.bz2 libvpx-a8a2f22958a303e0876cffd2abe1527de41633c0.zip |
Merge "Renaming "mbskip" to "skip"."
Diffstat (limited to 'vp9/common/vp9_entropymode.c')
-rw-r--r-- | vp9/common/vp9_entropymode.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 77b8de046..6def3c869 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -303,7 +303,7 @@ void tx_counts_to_branch_counts_8x8(const unsigned int *tx_count_8x8p, ct_8x8p[0][1] = tx_count_8x8p[TX_8X8]; } -static const vp9_prob default_mbskip_probs[MBSKIP_CONTEXTS] = { +static const vp9_prob default_skip_probs[SKIP_CONTEXTS] = { 192, 128, 64 }; @@ -325,7 +325,7 @@ void vp9_init_mbmode_probs(VP9_COMMON *cm) { vp9_copy(cm->fc.comp_ref_prob, default_comp_ref_p); vp9_copy(cm->fc.single_ref_prob, default_single_ref_p); cm->fc.tx_probs = default_tx_probs; - vp9_copy(cm->fc.mbskip_probs, default_mbskip_probs); + vp9_copy(cm->fc.skip_probs, default_skip_probs); vp9_copy(cm->fc.inter_mode_probs, default_inter_mode_probs); } @@ -415,9 +415,8 @@ void vp9_adapt_mode_probs(VP9_COMMON *cm) { } } - for (i = 0; i < MBSKIP_CONTEXTS; ++i) - fc->mbskip_probs[i] = adapt_prob(pre_fc->mbskip_probs[i], - counts->mbskip[i]); + for (i = 0; i < SKIP_CONTEXTS; ++i) + fc->skip_probs[i] = adapt_prob(pre_fc->skip_probs[i], counts->skip[i]); } static void set_default_lf_deltas(struct loopfilter *lf) { |