ref: 3602c4312d13138599d7b66be4f74922bf6f658e
parent: 56d0b36092631de85e3c376cd15360bf6a9a691b
parent: e8b7610e8f064b01caf1ac607db744b379692c3d
author: Jingning Han <[email protected]>
date: Wed Feb 12 05:26:06 EST 2014
Merge "Use INTER_OFFSET in vp9_pick_inter_mode"
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -89,7 +89,6 @@
#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. */
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -199,7 +199,7 @@
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) {