diff options
| author | Jingning Han <jingning@google.com> | 2018-10-25 00:01:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-25 00:01:52 +0000 |
| commit | d7e64ac74953ad7321666607b566ee18930c067b (patch) | |
| tree | 72f47bd6453c31b7bd74af584191ca988eea608d /vp9/encoder | |
| parent | 248f816a34e42759251a4f047ae20f7322ba9c2a (diff) | |
| parent | 47922cc140b6293194f4b26a5aa25d31f03bc1a0 (diff) | |
| download | libvpx-d7e64ac74953ad7321666607b566ee18930c067b.tar libvpx-d7e64ac74953ad7321666607b566ee18930c067b.tar.gz libvpx-d7e64ac74953ad7321666607b566ee18930c067b.tar.bz2 libvpx-d7e64ac74953ad7321666607b566ee18930c067b.zip | |
Merge "Enable tpl model to support multi-layer ARF"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 6f312f08c..fb25fbc5c 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3561,7 +3561,8 @@ static void ml_predict_var_rd_paritioning(VP9_COMP *cpi, MACROBLOCK *x, int get_rdmult_delta(VP9_COMP *cpi, BLOCK_SIZE bsize, int mi_row, int mi_col, int orig_rdmult) { - TplDepFrame *tpl_frame = &cpi->tpl_stats[cpi->twopass.gf_group.index]; + const int gf_group_index = cpi->twopass.gf_group.index; + TplDepFrame *tpl_frame = &cpi->tpl_stats[gf_group_index]; TplDepStats *tpl_stats = tpl_frame->tpl_stats_ptr; int tpl_stride = tpl_frame->stride; int64_t intra_cost = 0; @@ -3576,9 +3577,9 @@ int get_rdmult_delta(VP9_COMP *cpi, BLOCK_SIZE bsize, int mi_row, int mi_col, if (tpl_frame->is_valid == 0) return orig_rdmult; - if (cpi->common.show_frame) return orig_rdmult; + if (cpi->twopass.gf_group.layer_depth[gf_group_index] > 1) return orig_rdmult; - if (cpi->twopass.gf_group.index >= MAX_ARF_GOP_SIZE) return orig_rdmult; + if (gf_group_index >= MAX_ARF_GOP_SIZE) return orig_rdmult; for (row = mi_row; row < mi_row + mi_high; ++row) { for (col = mi_col; col < mi_col + mi_wide; ++col) { |