diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-05-30 20:58:13 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-30 20:58:13 -0700 |
| commit | 6ea6f4d2539d907003438f4f60fc6e5bafeefd1f (patch) | |
| tree | 92a30d899df214efa5a120a3a58e11b50df48a6d /vp9/common | |
| parent | 21595f8e38771c283fae6b39fe4a7be3d19d72f3 (diff) | |
| parent | 580d29bdbb97c2ba862cadd12a7af093ab87f806 (diff) | |
| download | libvpx-6ea6f4d2539d907003438f4f60fc6e5bafeefd1f.tar libvpx-6ea6f4d2539d907003438f4f60fc6e5bafeefd1f.tar.gz libvpx-6ea6f4d2539d907003438f4f60fc6e5bafeefd1f.tar.bz2 libvpx-6ea6f4d2539d907003438f4f60fc6e5bafeefd1f.zip | |
Merge "Remove one (unused) entry from mvref tables." into experimental
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_entropymode.c | 6 | ||||
| -rw-r--r-- | vp9/common/vp9_modecont.c | 16 | ||||
| -rw-r--r-- | vp9/common/vp9_modecont.h | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index ed763d10e..e12710913 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -178,7 +178,7 @@ void vp9_init_mode_contexts(VP9_COMMON *pc) { void vp9_accum_mv_refs(VP9_COMMON *pc, MB_PREDICTION_MODE m, const int context) { - unsigned int (*mv_ref_ct)[4][2] = pc->fc.mv_ref_ct; + unsigned int (*mv_ref_ct)[VP9_MVREFS - 1][2] = pc->fc.mv_ref_ct; if (m == ZEROMV) { ++mv_ref_ct[context][0][0]; @@ -201,8 +201,8 @@ void vp9_accum_mv_refs(VP9_COMMON *pc, #define MVREF_MAX_UPDATE_FACTOR 128 void vp9_adapt_mode_context(VP9_COMMON *pc) { int i, j; - unsigned int (*mv_ref_ct)[4][2] = pc->fc.mv_ref_ct; - int (*mode_context)[4] = pc->fc.vp9_mode_contexts; + unsigned int (*mv_ref_ct)[VP9_MVREFS - 1][2] = pc->fc.mv_ref_ct; + int (*mode_context)[VP9_MVREFS - 1] = pc->fc.vp9_mode_contexts; for (j = 0; j < INTER_MODE_CONTEXTS; j++) { for (i = 0; i < 4; i++) { diff --git a/vp9/common/vp9_modecont.c b/vp9/common/vp9_modecont.c index 86a8fb850..973bb068c 100644 --- a/vp9/common/vp9_modecont.c +++ b/vp9/common/vp9_modecont.c @@ -11,12 +11,12 @@ #include "vp9/common/vp9_entropy.h" -const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4] = { - {2, 173, 34, 229}, // 0 = both zero mv - {7, 145, 85, 225}, // 1 = one zero mv + one a predicted mv - {7, 166, 63, 231}, // 2 = two predicted mvs - {7, 94, 66, 219}, // 3 = one predicted/zero and one new mv - {8, 64, 46, 213}, // 4 = two new mvs - {17, 81, 31, 231}, // 5 = one intra neighbour + x - {25, 29, 30, 246}, // 6 = two intra neighbours +const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][VP9_MVREFS - 1] = { + {2, 173, 34}, // 0 = both zero mv + {7, 145, 85}, // 1 = one zero mv + one a predicted mv + {7, 166, 63}, // 2 = two predicted mvs + {7, 94, 66}, // 3 = one predicted/zero and one new mv + {8, 64, 46}, // 4 = two new mvs + {17, 81, 31}, // 5 = one intra neighbour + x + {25, 29, 30}, // 6 = two intra neighbours }; diff --git a/vp9/common/vp9_modecont.h b/vp9/common/vp9_modecont.h index 30deb72d3..a6c489325 100644 --- a/vp9/common/vp9_modecont.h +++ b/vp9/common/vp9_modecont.h @@ -13,6 +13,6 @@ #include "vp9/common/vp9_entropy.h" -extern const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][4]; +extern const int vp9_default_mode_contexts[INTER_MODE_CONTEXTS][VP9_MVREFS - 1]; #endif // VP9_COMMON_VP9_MODECONT_H_ diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 12bcabd6e..4bc296d0a 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -79,8 +79,8 @@ typedef struct frame_contexts { vp9_prob switchable_interp_prob[VP9_SWITCHABLE_FILTERS + 1] [VP9_SWITCHABLE_FILTERS - 1]; - int vp9_mode_contexts[INTER_MODE_CONTEXTS][4]; - unsigned int mv_ref_ct[INTER_MODE_CONTEXTS][4][2]; + int vp9_mode_contexts[INTER_MODE_CONTEXTS][VP9_MVREFS - 1]; + unsigned int mv_ref_ct[INTER_MODE_CONTEXTS][VP9_MVREFS - 1][2]; } FRAME_CONTEXT; typedef enum { |