diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2012-02-06 13:58:11 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-02-06 13:58:11 -0800 |
| commit | a040eb37e4cb924b1a00cdb493a709441885c344 (patch) | |
| tree | 19c4962830350e0ca1e0a2d7e3c15fab2985bbfa /vp8 | |
| parent | d8ebdcd89d5d19d283a73a2a81d3909b172e7e2d (diff) | |
| parent | fa1a9290e6e7cd0bf0afff5213e73fa5f662a9e2 (diff) | |
| download | libvpx-a040eb37e4cb924b1a00cdb493a709441885c344.tar libvpx-a040eb37e4cb924b1a00cdb493a709441885c344.tar.gz libvpx-a040eb37e4cb924b1a00cdb493a709441885c344.tar.bz2 libvpx-a040eb37e4cb924b1a00cdb493a709441885c344.zip | |
Merge "Allow to skip highest-resolution encoding in multi-resolution encoder"
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/pickinter.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 5e5e19fe3..0fc72d7eb 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -413,12 +413,11 @@ void get_lower_res_motion_info(VP8_COMP *cpi, MACROBLOCKD *xd, int *dissim, * such as 2, 4, 8. Will revisit it if needed. * Should also try using a look-up table to see if it helps * performance. */ - int round = cpi->oxcf.mr_down_sampling_factor.num/2; int parent_mb_row, parent_mb_col; - parent_mb_row = (mb_row*cpi->oxcf.mr_down_sampling_factor.den+round) + parent_mb_row = mb_row*cpi->oxcf.mr_down_sampling_factor.den /cpi->oxcf.mr_down_sampling_factor.num; - parent_mb_col = (mb_col*cpi->oxcf.mr_down_sampling_factor.den+round) + parent_mb_col = mb_col*cpi->oxcf.mr_down_sampling_factor.den /cpi->oxcf.mr_down_sampling_factor.num; parent_mb_index = parent_mb_row*cpi->mr_low_res_mb_cols + parent_mb_col; } |