Commit f407b304 authored by Marco Paniconi's avatar Marco Paniconi Committed by Gerrit Code Review
Browse files

Merge "vp9: Modify simple_block_yrd condition for SVC"

parents b85e391a aaa6cdcc
......@@ -676,7 +676,9 @@ static void block_yrd(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *this_rdc,
#endif
if (cpi->sf.use_simple_block_yrd && cpi->common.frame_type != KEY_FRAME &&
(bsize < BLOCK_32X32 || cpi->use_svc)) {
(bsize < BLOCK_32X32 ||
(cpi->use_svc &&
(bsize < BLOCK_32X32 || cpi->svc.temporal_layer_id > 0)))) {
unsigned int var_y, sse_y;
(void)tx_size;
if (!rd_computed)
......
......@@ -572,7 +572,7 @@ static void set_rt_speed_feature_framesize_independent(
sf->mv.search_method = NSTEP;
sf->mv.fullpel_search_step_param = 6;
}
if (cpi->svc.temporal_layer_id > 0) {
if (cpi->svc.temporal_layer_id > 0 || cpi->svc.spatial_layer_id > 1) {
sf->use_simple_block_yrd = 1;
if (cpi->svc.non_reference_frame)
sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_EVENMORE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment