diff options
author | Yaowu Xu <yaowu@google.com> | 2012-11-28 13:56:42 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-11-28 13:56:42 -0800 |
commit | b2f27d909a8ecd3cf4591e3f2642864fa00651da (patch) | |
tree | 056b9eb3c5deca8ec0bbb67e8b53ceed84c2bb22 /vp9/common | |
parent | c67873989f294b906ee07e4f0df35cd0f4ad20d7 (diff) | |
parent | 1cc573966932d4054c5ba9a7702a566632d844c3 (diff) | |
download | libvpx-b2f27d909a8ecd3cf4591e3f2642864fa00651da.tar libvpx-b2f27d909a8ecd3cf4591e3f2642864fa00651da.tar.gz libvpx-b2f27d909a8ecd3cf4591e3f2642864fa00651da.tar.bz2 libvpx-b2f27d909a8ecd3cf4591e3f2642864fa00651da.zip |
Merge "remove the vp9_default_mode_contexts_a" into experimental
Diffstat (limited to 'vp9/common')
-rw-r--r-- | vp9/common/vp9_entropymode.c | 3 | ||||
-rw-r--r-- | vp9/common/vp9_modecont.c | 9 | ||||
-rw-r--r-- | vp9/common/vp9_modecont.h | 1 |
3 files changed, 3 insertions, 10 deletions
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index 9b48dc97a..a33322c89 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -448,6 +448,9 @@ void vp9_entropy_mode_init() { void vp9_init_mode_contexts(VP9_COMMON *pc) { vpx_memset(pc->fc.mv_ref_ct, 0, sizeof(pc->fc.mv_ref_ct)); + vpx_memcpy(pc->fc.vp9_mode_contexts, + vp9_default_mode_contexts, + sizeof(vp9_default_mode_contexts)); } void vp9_accum_mv_refs(VP9_COMMON *pc, diff --git a/vp9/common/vp9_modecont.c b/vp9/common/vp9_modecont.c index 64ff377c3..f7f2b9013 100644 --- a/vp9/common/vp9_modecont.c +++ b/vp9/common/vp9_modecont.c @@ -20,12 +20,3 @@ const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4] = { {14, 122, 22, 164}, // strong nz candidate(s), split {16, 70, 9, 183}, // weak nz candidate(s), split }; -const int vp9_default_mode_contexts_a[INTER_MODE_CONTEXTS][4] = { - {204, 1, 1, 213}, // 0,0 best: Only candidate - {106, 139, 22, 203}, // 0,0 best: non zero candidates - {75, 52, 15, 118}, // 0,0 best: non zero candidates, split - {12, 148, 61, 211}, // strong nz candidate(s), no split - {18, 98, 17, 199}, // weak nz candidate(s), no split - {11, 91, 25, 148}, // strong nz candidate(s), split - {10, 53, 9, 145}, // weak nz candidate(s), split -}; diff --git a/vp9/common/vp9_modecont.h b/vp9/common/vp9_modecont.h index 1fa4558e1..b142bd0f3 100644 --- a/vp9/common/vp9_modecont.h +++ b/vp9/common/vp9_modecont.h @@ -13,5 +13,4 @@ #define __INC_MODECONT_H extern const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4]; -extern const int vp9_default_mode_contexts_a[INTER_MODE_CONTEXTS][4]; #endif |