diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-10-17 18:00:56 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-10-17 18:00:56 -0700 |
| commit | 87d2b2549c6d8adfbcd29b05d086c41476c7a6d5 (patch) | |
| tree | 3c2b4c67f065009f6d94864586ff18b7a2f591f4 /vp8 | |
| parent | b276efd00270be1d1c49b8b03f4eaa319a02583a (diff) | |
| download | libvpx-87d2b2549c6d8adfbcd29b05d086c41476c7a6d5.tar libvpx-87d2b2549c6d8adfbcd29b05d086c41476c7a6d5.tar.gz libvpx-87d2b2549c6d8adfbcd29b05d086c41476c7a6d5.tar.bz2 libvpx-87d2b2549c6d8adfbcd29b05d086c41476c7a6d5.zip | |
Fix encode breakout skip handling.
Change-Id: Ib42a5dbded27abf2a01fd656a47a1e96b1fe2912
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/rdopt.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index e7b45bd43..63f6898f0 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -3956,22 +3956,22 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int disable_skip = 1; this_rd = RDCOST(x->rdmult, x->rddiv, rate2, distortion2); - - break; } } } } - vp8_build_1st_inter16x16_predictors_mbuv(&x->e_mbd, &xd->predictor[256], - &xd->predictor[320], 8); - if (is_comp_pred) - vp8_build_2nd_inter16x16_predictors_mbuv(&x->e_mbd, - &xd->predictor[256], + if (!x->skip) { + vp8_build_1st_inter16x16_predictors_mbuv(&x->e_mbd, &xd->predictor[256], &xd->predictor[320], 8); - inter_mode_cost(cpi, x, this_mode, &rate2, &distortion2, - &rate_y, &distortion, &rate_uv, &distortion_uv, - &skippable, txfm_cache); + if (is_comp_pred) + vp8_build_2nd_inter16x16_predictors_mbuv(&x->e_mbd, + &xd->predictor[256], + &xd->predictor[320], 8); + inter_mode_cost(cpi, x, this_mode, &rate2, &distortion2, + &rate_y, &distortion, &rate_uv, &distortion_uv, + &skippable, txfm_cache); + } if (is_comp_pred) mode_excluded = cpi->common.comp_pred_mode == SINGLE_PREDICTION_ONLY; else |