diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-18 16:09:28 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-18 16:09:28 -0700 |
| commit | 54f843c8915e65b2e9dea74188642d4c293362d1 (patch) | |
| tree | e211e5a091302db955faf86711326e8497d051a6 | |
| parent | b27edc67d2122bf4c0b56295bdedc18d634ecb68 (diff) | |
| parent | 3e01ca6a19589448b733faf1a9d092a82235f5f5 (diff) | |
| download | libvpx-54f843c8915e65b2e9dea74188642d4c293362d1.tar libvpx-54f843c8915e65b2e9dea74188642d4c293362d1.tar.gz libvpx-54f843c8915e65b2e9dea74188642d4c293362d1.tar.bz2 libvpx-54f843c8915e65b2e9dea74188642d4c293362d1.zip | |
Merge "Fixing rounding inside vp9_mv_bit_cost function." into experimental
| -rw-r--r-- | vp9/encoder/vp9_mcomp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index caba2ea85..17dafe6d7 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -56,9 +56,9 @@ int vp9_mv_bit_cost(int_mv *mv, int_mv *ref, int *mvjcost, int *mvcost[2], MV v; v.row = mv->as_mv.row - ref->as_mv.row; v.col = mv->as_mv.col - ref->as_mv.col; - return ((mvjcost[vp9_get_mv_joint(&v)] + - mvcost[0][v.row] + - mvcost[1][v.col]) * weight) >> 7; + return ROUND_POWER_OF_TWO((mvjcost[vp9_get_mv_joint(&v)] + + mvcost[0][v.row] + + mvcost[1][v.col]) * weight, 7); } static int mv_err_cost(int_mv *mv, int_mv *ref, int *mvjcost, int *mvcost[2], |