summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_onyx_if.c
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2013-06-05 11:21:44 -0700
committerDeb Mukherjee <debargha@google.com>2013-06-05 11:24:01 -0700
commit30226a658f7e9c36aa8bb259af167b07ab4e2f25 (patch)
tree85c00521efa887d56083e1c3164b07bd870ad876 /vp9/encoder/vp9_onyx_if.c
parent83885235a7398045302a62f9afccd0c4b27324ab (diff)
downloadlibvpx-30226a658f7e9c36aa8bb259af167b07ab4e2f25.tar
libvpx-30226a658f7e9c36aa8bb259af167b07ab4e2f25.tar.gz
libvpx-30226a658f7e9c36aa8bb259af167b07ab4e2f25.tar.bz2
libvpx-30226a658f7e9c36aa8bb259af167b07ab4e2f25.zip
Cosmetic renaming VP9_MVREFS to VP9_INTER_MODES
NO bitstream change Change-Id: I79f6146dac5fdd157051b6f8dc611c0b7b5e5f7f
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
-rw-r--r--vp9/encoder/vp9_onyx_if.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 1932e2d57..f5e40ef7b 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -466,9 +466,9 @@ static void configure_static_seg_features(VP9_COMP *cpi) {
void vp9_update_mode_context_stats(VP9_COMP *cpi) {
VP9_COMMON *cm = &cpi->common;
int i, j;
- unsigned int (*inter_mode_counts)[VP9_MVREFS - 1][2] =
+ unsigned int (*inter_mode_counts)[VP9_INTER_MODES - 1][2] =
cm->fc.inter_mode_counts;
- int64_t (*mv_ref_stats)[VP9_MVREFS - 1][2] = cpi->mv_ref_stats;
+ int64_t (*mv_ref_stats)[VP9_INTER_MODES - 1][2] = cpi->mv_ref_stats;
FILE *f;
// Read the past stats counters
@@ -482,7 +482,7 @@ void vp9_update_mode_context_stats(VP9_COMP *cpi) {
// Add in the values for this frame
for (i = 0; i < INTER_MODE_CONTEXTS; i++) {
- for (j = 0; j < VP9_MVREFS - 1; j++) {
+ for (j = 0; j < VP9_INTER_MODES - 1; j++) {
mv_ref_stats[i][j][0] += (int64_t)inter_mode_counts[i][j][0];
mv_ref_stats[i][j][1] += (int64_t)inter_mode_counts[i][j][1];
}
@@ -499,13 +499,14 @@ void print_mode_context(VP9_COMP *cpi) {
int i, j;
fprintf(f, "#include \"vp9_entropy.h\"\n");
- fprintf(f,
- "const int inter_mode_probs[INTER_MODE_CONTEXTS][VP9_MVREFS - 1] =");
+ fprintf(
+ f,
+ "const int inter_mode_probs[INTER_MODE_CONTEXTS][VP9_INTER_MODES - 1] =");
fprintf(f, "{\n");
for (j = 0; j < INTER_MODE_CONTEXTS; j++) {
fprintf(f, " {/* %d */ ", j);
fprintf(f, " ");
- for (i = 0; i < VP9_MVREFS - 1; i++) {
+ for (i = 0; i < VP9_INTER_MODES - 1; i++) {
int this_prob;
int64_t count = cpi->mv_ref_stats[j][i][0] + cpi->mv_ref_stats[j][i][1];
if (count)