diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-17 16:50:52 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-07-17 16:50:52 -0700 |
| commit | f9f453ec8d59b69bc57763f3c4bf14527435297e (patch) | |
| tree | 61896c1477f9f129daa2766f818f88f01eb7d3f8 /vp9/common/vp9_entropymode.c | |
| parent | facecd80da372fa3364c51e9b34ff447ef1ae7b6 (diff) | |
| download | libvpx-f9f453ec8d59b69bc57763f3c4bf14527435297e.tar libvpx-f9f453ec8d59b69bc57763f3c4bf14527435297e.tar.gz libvpx-f9f453ec8d59b69bc57763f3c4bf14527435297e.tar.bz2 libvpx-f9f453ec8d59b69bc57763f3c4bf14527435297e.zip | |
Removing kf_{y, uv}_mode_prob arrays from VP9Common.
These arrays have constant values (no any updates). Removing two
corresponding memcpy calls. Making a little cleanup in vp9_entropymode.h
as well: removing redundant 'extern' keyword and moving all function
declarations at the end.
Change-Id: Ia16b38b46aec2e2500f5df29c40a297ae241dede
Diffstat (limited to 'vp9/common/vp9_entropymode.c')
| -rw-r--r-- | vp9/common/vp9_entropymode.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 80e4e49b4..a5f0a0127 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -14,8 +14,8 @@ #include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_seg_common.h" -static const vp9_prob default_kf_uv_probs[VP9_INTRA_MODES] - [VP9_INTRA_MODES - 1] = { +const vp9_prob vp9_kf_uv_mode_prob[VP9_INTRA_MODES] + [VP9_INTRA_MODES - 1] = { { 144, 11, 54, 157, 195, 130, 46, 58, 108 } /* y = dc */, { 118, 15, 123, 148, 131, 101, 44, 93, 131 } /* y = v */, { 113, 12, 23, 188, 226, 142, 26, 32, 125 } /* y = h */, @@ -98,9 +98,9 @@ static const vp9_prob default_partition_probs[NUM_FRAME_TYPES] } }; -static const vp9_prob default_kf_bmode_probs[VP9_INTRA_MODES] - [VP9_INTRA_MODES] - [VP9_INTRA_MODES - 1] = { +const vp9_prob vp9_kf_y_mode_prob[VP9_INTRA_MODES] + [VP9_INTRA_MODES] + [VP9_INTRA_MODES - 1] = { { /* above = dc */ { 137, 30, 42, 148, 151, 207, 70, 52, 91 } /* left = dc */, { 92, 45, 102, 136, 116, 180, 74, 90, 100 } /* left = v */, @@ -328,7 +328,6 @@ static const vp9_prob default_switchable_interp_prob[VP9_SWITCHABLE_FILTERS+1] void vp9_init_mbmode_probs(VP9_COMMON *cm) { vp9_copy(cm->fc.uv_mode_prob, default_if_uv_probs); - vp9_copy(cm->kf_uv_mode_prob, default_kf_uv_probs); vp9_copy(cm->fc.y_mode_prob, default_if_y_probs); vp9_copy(cm->fc.switchable_interp_prob, default_switchable_interp_prob); vp9_copy(cm->fc.partition_prob, default_partition_probs); @@ -583,8 +582,6 @@ void vp9_setup_past_independence(VP9_COMMON *cm, MACROBLOCKD *xd) { vp9_default_coef_probs(cm); vp9_init_mbmode_probs(cm); - vp9_copy(cm->kf_y_mode_prob, default_kf_bmode_probs); - vp9_init_mv_probs(cm); // To force update of the sharpness |