diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2012-11-08 15:44:39 -0800 |
|---|---|---|
| committer | Jim Bankoski <jimbankoski@google.com> | 2012-11-08 15:44:39 -0800 |
| commit | c72be96b0a4b9ea6dfa03b259b88164a13993870 (patch) | |
| tree | c0e7026389355f0a5f78b15ddd1a223f3c42db76 /vp9/encoder/bitstream.c | |
| parent | 8959c8b11d11ad44c7bf0cc49e54974e161d374c (diff) | |
| download | libvpx-c72be96b0a4b9ea6dfa03b259b88164a13993870.tar libvpx-c72be96b0a4b9ea6dfa03b259b88164a13993870.tar.gz libvpx-c72be96b0a4b9ea6dfa03b259b88164a13993870.tar.bz2 libvpx-c72be96b0a4b9ea6dfa03b259b88164a13993870.zip | |
remove macros obfuscating mv costing
cleanup
Change-Id: I565eee40d900e0441ad211b65ac829fc5b93d94a
Diffstat (limited to 'vp9/encoder/bitstream.c')
| -rw-r--r-- | vp9/encoder/bitstream.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vp9/encoder/bitstream.c b/vp9/encoder/bitstream.c index b7bc99cb3..ffb23955b 100644 --- a/vp9/encoder/bitstream.c +++ b/vp9/encoder/bitstream.c @@ -690,10 +690,8 @@ static unsigned int pick_best_mv_ref(MACROBLOCK *x, int max_mv = MV_MAX; cost = vp9_cost_mv_ref_id(xd->mb_mv_ref_id_probs[ref_frame], 0) + - vp9_mv_bit_cost(&target_mv, - &mv_ref_list[0], - XMVCOST, 96, - xd->allow_high_precision_mv); + vp9_mv_bit_cost(&target_mv, &mv_ref_list[0], x->nmvjointcost, + x->mvcost, 96, xd->allow_high_precision_mv); // Use 4 for now : for (i = 1; i < MAX_MV_REFS; ++i ) { @@ -714,10 +712,8 @@ static unsigned int pick_best_mv_ref(MACROBLOCK *x, } cost2 = vp9_cost_mv_ref_id(xd->mb_mv_ref_id_probs[ref_frame], i) + - vp9_mv_bit_cost(&target_mv, - &mv_ref_list[i], - XMVCOST, 96, - xd->allow_high_precision_mv); + vp9_mv_bit_cost(&target_mv, &mv_ref_list[i], x->nmvjointcost, + x->mvcost, 96, xd->allow_high_precision_mv); if (cost2 < cost) { cost = cost2; |