diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-08-14 09:06:38 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-08-14 09:06:38 -0700 |
| commit | d4a47a6cc0d869bea3071c15bc61da6836026d0b (patch) | |
| tree | 871e288b50f90597144bb2c1351c2430c8ee0cb8 /vp9/encoder | |
| parent | 940db8fc4e3c9cca983acf2d7c920e8dbc34b267 (diff) | |
| parent | 741a23cd97f7f9c2f1f7ca7d80402fcdfd2c8914 (diff) | |
| download | libvpx-d4a47a6cc0d869bea3071c15bc61da6836026d0b.tar libvpx-d4a47a6cc0d869bea3071c15bc61da6836026d0b.tar.gz libvpx-d4a47a6cc0d869bea3071c15bc61da6836026d0b.tar.bz2 libvpx-d4a47a6cc0d869bea3071c15bc61da6836026d0b.zip | |
Merge "Replace current_video_frame with better alternatives"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index c6bc2c205..4e7b8e4a2 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -2480,7 +2480,7 @@ static void encode_rd_sb_row(VP9_COMP *cpi, const TileInfo *const tile, if (gf_grp->update_type[gf_grp->index - 1] == OVERLAY_UPDATE) last_was_mid_sequence_overlay = 1; } - if ((cm->current_video_frame + if ((cpi->rc.frames_since_key % sf->last_partitioning_redo_frequency) == 0 || last_was_mid_sequence_overlay || cm->prev_mi == 0 @@ -2583,7 +2583,7 @@ static MV_REFERENCE_FRAME get_frame_type(const VP9_COMP *cpi) { static TX_MODE select_tx_mode(const VP9_COMP *cpi) { if (cpi->mb.e_mbd.lossless) return ONLY_4X4; - if (cpi->common.current_video_frame == 0) + if (cpi->common.frame_type == KEY_FRAME) return TX_MODE_SELECT; if (cpi->sf.tx_size_search_method == USE_LARGESTALL) return ALLOW_32X32; |