generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Use INTER_OFFSET in vp9_pick_inter_mode"

Browse Source
This commit is contained in:
Jingning Han 2014-02-12 10:26:06 -08:00 committed by Gerrit Code Review
commit 3602c4312d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vp9/common/vp9_blockd.h
View File

@ -89,7 +89,6 @@ static INLINE int is_inter_mode(MB_PREDICTION_MODE mode) {
#define INTER_OFFSET(mode) ((mode) - NEARESTMV) #define INTER_OFFSET(mode) ((mode) - NEARESTMV)
/* For keyframes, intra block modes are predicted by the (already decoded) /* 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 modes for the Y blocks to the left and above us; for interframes, there
is a single probability table. */ is a single probability table. */

2
vp9/encoder/vp9_pickmode.c
View File

@ -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); clamp_mv2(&frame_mv[NEARMV][ref_frame].as_mv, xd);
for (this_mode = NEARESTMV; this_mode <= NEWMV; ++this_mode) { 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; int64_t dist;
if (this_mode == NEWMV) { if (this_mode == NEWMV) {