Merge "vp9: SVC: Enable simple_block_yrd for temporal layers."

This commit is contained in:
Marco Paniconi
2017-06-07 21:12:13 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 2 deletions

View File

@@ -670,7 +670,7 @@ 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) {
(bsize < BLOCK_32X32 || cpi->use_svc)) {
unsigned int var_y, sse_y;
(void)tx_size;
if (!rd_computed)

View File

@@ -550,8 +550,10 @@ 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) {
sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_EVENMORE;
sf->use_simple_block_yrd = 1;
}
if (!cpi->external_resize) sf->use_source_sad = 1;
if (sf->use_source_sad) {
if (cpi->content_state_sb_fd == NULL &&