diff options
| author | Jingning Han <jingning@google.com> | 2013-05-13 10:51:39 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-13 10:51:39 -0700 |
| commit | e996c9c5f10fbb2ad6605712d602ec77bcd81732 (patch) | |
| tree | 6b4214b7c236fc14ef9f3f071e68276bec2a629a /vp9/encoder | |
| parent | fc31ae479d46c34cd85e651d42291176f97692e0 (diff) | |
| parent | 4c2c350309d65b1e46454464c87040bc60a03b8b (diff) | |
| download | libvpx-e996c9c5f10fbb2ad6605712d602ec77bcd81732.tar libvpx-e996c9c5f10fbb2ad6605712d602ec77bcd81732.tar.gz libvpx-e996c9c5f10fbb2ad6605712d602ec77bcd81732.tar.bz2 libvpx-e996c9c5f10fbb2ad6605712d602ec77bcd81732.zip | |
Merge "Force bsize for UV in I4X4 and SPLITMV" into experimental
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index a6bf85c59..765a071f5 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2299,7 +2299,9 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, mode = xd->mode_info_context->mbmi.mode; txfm_size = xd->mode_info_context->mbmi.txfm_size; rd_pick_intra_sbuv_mode(cpi, x, &rate_uv, &rate_uv_tokenonly, - &dist_uv, &uv_skip, bsize); + &dist_uv, &uv_skip, + (bsize < BLOCK_SIZE_SB8X8) ? BLOCK_SIZE_SB8X8 : + bsize); if (bsize == BLOCK_SIZE_SB8X8) err4x4 = rd_pick_intra4x4mby_modes(cpi, x, &rate4x4_y, &rate4x4_y_tokenonly, @@ -2735,10 +2737,10 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, // If even the 'Y' rd value of split is higher than best so far // then dont bother looking at UV vp9_build_inter_predictors_sbuv(&x->e_mbd, mi_row, mi_col, - bsize); - vp9_subtract_sbuv(x, bsize); + BLOCK_SIZE_SB8X8); + vp9_subtract_sbuv(x, BLOCK_SIZE_SB8X8); super_block_uvrd_for_txfm(cm, x, &rate_uv, &distortion_uv, - &uv_skippable, bsize, TX_4X4); + &uv_skippable, BLOCK_SIZE_SB8X8, TX_4X4); rate2 += rate_uv; distortion2 += distortion_uv; skippable = skippable && uv_skippable; |