diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-04-15 12:50:32 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-04-15 13:39:07 -0700 |
| commit | 33a8df085d141dea4361d1d2a678e8fb7d4cf16d (patch) | |
| tree | 69ef47b10f82b35d74babecf267c94c5a8ff0fac | |
| parent | aaf33d7df5a061c3175338895484c9b5d6e5f6b5 (diff) | |
| download | libvpx-33a8df085d141dea4361d1d2a678e8fb7d4cf16d.tar libvpx-33a8df085d141dea4361d1d2a678e8fb7d4cf16d.tar.gz libvpx-33a8df085d141dea4361d1d2a678e8fb7d4cf16d.tar.bz2 libvpx-33a8df085d141dea4361d1d2a678e8fb7d4cf16d.zip | |
Fix lingering x->skip settings if static_threshold is used.
Keyframes don't set this variable, so it would use the last set
values from inter frames.
Change-Id: Ie1ef45ece2c44b21b5d55f6cea9f7d6e7a445692
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 9d1cada00..8cf52f723 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -4169,6 +4169,7 @@ void vp9_rd_pick_intra_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, int64_t txfm_cache[NB_TXFM_MODES], err; int i; + ctx->skip = 0; xd->mode_info_context->mbmi.mode = DC_PRED; err = rd_pick_intra_sby_mode(cpi, x, &rate_y, &rate_y_tokenonly, &dist_y, &y_skip, bsize, txfm_cache); @@ -4218,6 +4219,7 @@ void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x, TX_SIZE txfm_size_16x16, txfm_size_8x8; int i; + x->mb_context[xd->sb_index][xd->mb_index].skip = 0; mbmi->ref_frame = INTRA_FRAME; mbmi->mode = DC_PRED; for (i = 0; i <= TX_8X8; i++) { |