diff options
| author | Jerome Jiang <jianj@google.com> | 2017-04-11 00:45:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-11 00:45:21 +0000 |
| commit | 2420f44342db48bb491a048f0cd14c818f7d5817 (patch) | |
| tree | b092b0820b1a27a73e1cb52920901fb9cbd86b71 /vp9 | |
| parent | 6557baf3363e967c05da910daf3ec41d22594e2d (diff) | |
| parent | f16f08e55bce50f3b5200ba9ced2d044b151f8af (diff) | |
| download | libvpx-2420f44342db48bb491a048f0cd14c818f7d5817.tar libvpx-2420f44342db48bb491a048f0cd14c818f7d5817.tar.gz libvpx-2420f44342db48bb491a048f0cd14c818f7d5817.tar.bz2 libvpx-2420f44342db48bb491a048f0cd14c818f7d5817.zip | |
Merge "vp9: speed >= 8: Adjust speed settings on ARM."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 244d477f8..481f5a0fd 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1142,7 +1142,7 @@ static int choose_partitioning(VP9_COMP *cpi, const TileInfo *const tile, mi->mv[0].as_int = 0; mi->interp_filter = BILINEAR; - if (cpi->oxcf.speed >= 8) + if (cpi->oxcf.speed >= 8 && !low_res) y_sad = cpi->fn_ptr[bsize].sdf( x->plane[0].src.buf, x->plane[0].src.stride, xd->plane[0].pre[0].buf, xd->plane[0].pre[0].stride); diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 2e0ca5b66..f74b6b0e9 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -555,7 +555,10 @@ static void set_rt_speed_feature_framesize_independent( } // Since the short_circuit_low_temp_var is used, reduce the // adaptive_rd_thresh level. - sf->adaptive_rd_thresh = 1; + if (cm->width > 320 && cm->height > 240) + sf->adaptive_rd_thresh = 1; + else + sf->adaptive_rd_thresh = 2; } sf->limit_newmv_early_exit = 0; if (cm->width > 320 && cm->height > 240) sf->use_simple_block_yrd = 1; |