Merge "vp9: Using source sad for speedup for dynamic resizing."

This commit is contained in:
Jerome Jiang
2017-03-15 00:03:52 +00:00
committed by Gerrit Code Review
2 changed files with 5 additions and 6 deletions

View File

@@ -3128,9 +3128,10 @@ static void encode_without_recode_loop(VP9_COMP *cpi, size_t *size,
#endif
}
if (cpi->use_svc &&
(cpi->svc.spatial_layer_id < cpi->svc.number_spatial_layers - 1 ||
cpi->svc.current_superframe < 1)) {
if ((cpi->use_svc &&
(cpi->svc.spatial_layer_id < cpi->svc.number_spatial_layers - 1 ||
cpi->svc.current_superframe < 1)) ||
cpi->resize_pending || cpi->resize_state || cpi->external_resize) {
compute_source_sad = 0;
if (cpi->content_state_sb != NULL)
memset(cpi->content_state_sb, 0, (cm->mi_stride >> 3) *

View File

@@ -509,9 +509,7 @@ static void set_rt_speed_feature_framesize_independent(
sf->mv.search_method = NSTEP;
sf->mv.fullpel_search_step_param = 6;
}
if (!cpi->resize_pending && !cpi->resize_state && !cpi->external_resize &&
cpi->oxcf.resize_mode == RESIZE_NONE)
sf->use_source_sad = 1;
if (!cpi->external_resize) sf->use_source_sad = 1;
if (sf->use_source_sad) {
// For SVC allocate for top layer.
if (cpi->content_state_sb == NULL &&