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

Cosmetic change mbmi->ref_frame to refs

Browse Source 
In handle_inter_mode, the reference frames are set in refs buffer.
One can use refs buffer directly to avoid redundant fetch.

Change-Id: I811d408cae52dcd5e053dd4bfe69550eb6a2ff56
This commit is contained in:
Jingning Han
2014-02-27 11:41:04 -08:00
parent 08053edb80
commit 2c6ddcc606
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vp9/encoder/vp9_rdopt.c
View File

@@ -2742,7 +2742,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
frame_mv[refs[0]].as_int == 0 && frame_mv[refs[0]].as_int == 0 &&
!vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP) && !vp9_segfeature_active(&cm->seg, mbmi->segment_id, SEG_LVL_SKIP) &&
(num_refs == 1 || frame_mv[refs[1]].as_int == 0)) { (num_refs == 1 || frame_mv[refs[1]].as_int == 0)) {
int rfc = mbmi->mode_context[mbmi->ref_frame[0]]; int rfc = mbmi->mode_context[refs[0]];
int c1 = cost_mv_ref(cpi, NEARMV, rfc); int c1 = cost_mv_ref(cpi, NEARMV, rfc);
int c2 = cost_mv_ref(cpi, NEARESTMV, rfc); int c2 = cost_mv_ref(cpi, NEARESTMV, rfc);
int c3 = cost_mv_ref(cpi, ZEROMV, rfc); int c3 = cost_mv_ref(cpi, ZEROMV, rfc);
@@ -2757,17 +2757,17 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
assert(this_mode == ZEROMV); assert(this_mode == ZEROMV);
if (num_refs == 1) { if (num_refs == 1) {
if ((c3 >= c2 && if ((c3 >= c2 &&
mode_mv[NEARESTMV][mbmi->ref_frame[0]].as_int == 0) || mode_mv[NEARESTMV][refs[0]].as_int == 0) ||
(c3 >= c1 && (c3 >= c1 &&
mode_mv[NEARMV][mbmi->ref_frame[0]].as_int == 0)) mode_mv[NEARMV][refs[0]].as_int == 0))
return INT64_MAX; return INT64_MAX;
} else { } else {
if ((c3 >= c2 && if ((c3 >= c2 &&
mode_mv[NEARESTMV][mbmi->ref_frame[0]].as_int == 0 && mode_mv[NEARESTMV][refs[0]].as_int == 0 &&
mode_mv[NEARESTMV][mbmi->ref_frame[1]].as_int == 0) || mode_mv[NEARESTMV][refs[1]].as_int == 0) ||
(c3 >= c1 && (c3 >= c1 &&
mode_mv[NEARMV][mbmi->ref_frame[0]].as_int == 0 && mode_mv[NEARMV][refs[0]].as_int == 0 &&
mode_mv[NEARMV][mbmi->ref_frame[1]].as_int == 0)) mode_mv[NEARMV][refs[1]].as_int == 0))
return INT64_MAX; return INT64_MAX;
} }
} }
@@ -2798,8 +2798,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
* are only three options: Last/Golden, ARF/Last or Golden/ARF, or in other * are only three options: Last/Golden, ARF/Last or Golden/ARF, or in other
* words if you present them in that order, the second one is always known * words if you present them in that order, the second one is always known
* if the first is known */ * if the first is known */
*rate2 += cost_mv_ref(cpi, this_mode, *rate2 += cost_mv_ref(cpi, this_mode, mbmi->mode_context[refs[0]]);
mbmi->mode_context[mbmi->ref_frame[0]]);
if (!(*mode_excluded)) if (!(*mode_excluded))
*mode_excluded = is_comp_pred ? cm->reference_mode == SINGLE_REFERENCE *mode_excluded = is_comp_pred ? cm->reference_mode == SINGLE_REFERENCE