diff options
author | Yaowu Xu <yaowu@google.com> | 2015-02-03 15:13:52 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-02-03 15:13:52 -0800 |
commit | cb411108a3830fb02c8f8a988b7f3b0e66d076c9 (patch) | |
tree | d4a3cccc9608c17604d7421eabddb5dba17ccf5a /vp9 | |
parent | a367c9766d9c459670fc7cabefc5d03946b55953 (diff) | |
parent | 65a1a3e85de1789dfc5566af524d4f8728d943fd (diff) | |
download | libvpx-cb411108a3830fb02c8f8a988b7f3b0e66d076c9.tar libvpx-cb411108a3830fb02c8f8a988b7f3b0e66d076c9.tar.gz libvpx-cb411108a3830fb02c8f8a988b7f3b0e66d076c9.tar.bz2 libvpx-cb411108a3830fb02c8f8a988b7f3b0e66d076c9.zip |
Merge "adjust rtc setting and threshold"
Diffstat (limited to 'vp9')
-rw-r--r-- | vp9/encoder/vp9_bitstream.c | 2 | ||||
-rw-r--r-- | vp9/encoder/vp9_speed_features.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index c7d489db6..3a70364ae 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -674,7 +674,7 @@ static void update_coef_probs(VP9_COMP *cpi, vp9_writer* w) { for (tx_size = TX_4X4; tx_size <= max_tx_size; ++tx_size) { vp9_coeff_stats frame_branch_ct[PLANE_TYPES]; vp9_coeff_probs_model frame_coef_probs[PLANE_TYPES]; - if (cpi->td.counts->tx.tx_totals[tx_size] == 0 || + if (cpi->td.counts->tx.tx_totals[tx_size] <= 20 || (tx_size >= TX_16X16 && cpi->sf.tx_size_search_method == USE_TX_8X8)) { vp9_write_bit(w, 0); } else { diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 23eabf0d3..8ba9adf68 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -341,6 +341,7 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf, if (speed >= 8) { sf->adaptive_rd_thresh = 4; sf->mv.subpel_force_stop = 2; + sf->lpf_pick = LPF_PICK_MINIMAL_LPF; } } |