From e8b7610e8f064b01caf1ac607db744b379692c3d Mon Sep 17 00:00:00 2001
From: Jingning Han <jingning@google.com>
Date: Mon, 10 Feb 2014 12:54:56 -0800
Subject: [PATCH] Use INTER_OFFSET in vp9_pick_inter_mode
Cosmetic change to use pre-defined macros.
Change-Id: I93e9fa90113d0242599048940b39694660385a6f
---
vp9/common/vp9_blockd.h | 1 -
vp9/encoder/vp9_pickmode.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index f10a3c8c7b..348aa640f0 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -89,7 +89,6 @@ static INLINE int is_inter_mode(MB_PREDICTION_MODE mode) {
#define INTER_OFFSET(mode) ((mode) - NEARESTMV)
-
/* For keyframes, intra block modes are predicted by the (already decoded)
modes for the Y blocks to the left and above us; for interframes, there
is a single probability table. */
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index 512b6bf18a..3b4a7f6e4b 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -199,7 +199,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
clamp_mv2(&frame_mv[NEARMV][ref_frame].as_mv, xd);
for (this_mode = NEARESTMV; this_mode <= NEWMV; ++this_mode) {
- int rate = cost[this_mode - NEARESTMV];
+ int rate = cost[INTER_OFFSET(this_mode)];
int64_t dist;
if (this_mode == NEWMV) {
--
GitLab