This reverts commit 62af22b5e57ed1e382ef0994183824a03f698797. Reason for revert: causes crash in chromium test
Unified · Split
| @@ -5086,8 +5086,8 @@ static void nonrd_pick_partition(VP9_COMP *cpi, ThreadData *td, · 5085 unmodified lines | |||
| 5086 | 5086 | ||
| 5087 | (void)*tp_orig; | 5087 | (void)*tp_orig; |
| 5088 | 5088 | ||
| 5089 | // Avoid checking for rectangular partitions for speed >= 5. | 5089 | // Avoid checking for rectangular partitions for speed >= 6. |
| 5090 | if (cpi->oxcf.speed >= 5) do_rect = 0; | 5090 | if (cpi->oxcf.speed >= 6) do_rect = 0; |
| 5091 | 5091 | ||
| 5092 | assert(num_8x8_blocks_wide_lookup[bsize] == | 5092 | assert(num_8x8_blocks_wide_lookup[bsize] == |
| 5093 | num_8x8_blocks_high_lookup[bsize]); | 5093 | num_8x8_blocks_high_lookup[bsize]); |
| @@ -5345,11 +5345,6 @@ static void nonrd_select_partition(VP9_COMP *cpi, ThreadData *td, · 251 unmodified lines | |||
| 5345 | subsize >= subsize_ref) { | 5345 | subsize >= subsize_ref) { |
| 5346 | x->max_partition_size = BLOCK_32X32; | 5346 | x->max_partition_size = BLOCK_32X32; |
| 5347 | x->min_partition_size = BLOCK_8X8; | 5347 | x->min_partition_size = BLOCK_8X8; |
| 5348 | if (subsize_ref == BLOCK_16X16 && !xd->mi[0]->segment_id && | ||
| 5349 | x->content_state_sb != kVeryHighSad && | ||
| 5350 | x->content_state_sb != kLowVarHighSumdiff && | ||
| 5351 | x->content_state_sb != kHighSadHighSumdiff) | ||
| 5352 | x->min_partition_size = BLOCK_16X16; | ||
| 5353 | nonrd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col, bsize, rd_cost, | 5348 | nonrd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col, bsize, rd_cost, |
| 5354 | 0, INT64_MAX, pc_tree); | 5349 | 0, INT64_MAX, pc_tree); |
| 5355 | } else if (bsize == BLOCK_16X16 && partition != PARTITION_NONE) { | 5350 | } else if (bsize == BLOCK_16X16 && partition != PARTITION_NONE) { |
| @@ -634,7 +634,6 @@ static void set_rt_speed_feature_framesize_independent( · 633 unmodified lines | |||
| 634 | sf->use_compound_nonrd_pickmode = 1; | 634 | sf->use_compound_nonrd_pickmode = 1; |
| 635 | } | 635 | } |
| 636 | if (cm->width * cm->height > 1280 * 720) sf->cb_pred_filter_search = 1; | 636 | if (cm->width * cm->height > 1280 * 720) sf->cb_pred_filter_search = 1; |
| 637 | if (!cpi->external_resize) sf->use_source_sad = 1; | ||
| 638 | } | 637 | } |
| 639 | 638 | ||
| 640 | if (speed >= 6) { | 639 | if (speed >= 6) { |
| @@ -647,6 +646,8 @@ static void set_rt_speed_feature_framesize_independent( · 6 unmodified lines | |||
| 647 | sf->mv.reduce_first_step_size = 1; | 646 | sf->mv.reduce_first_step_size = 1; |
| 648 | sf->skip_encode_sb = 0; | 647 | sf->skip_encode_sb = 0; |
| 649 | 648 | ||
| 649 | if (!cpi->external_resize) sf->use_source_sad = 1; | ||
| 650 | |||
| 650 | if (sf->use_source_sad) { | 651 | if (sf->use_source_sad) { |
| 651 | sf->adapt_partition_source_sad = 1; | 652 | sf->adapt_partition_source_sad = 1; |
| 652 | sf->adapt_partition_thresh = | 653 | sf->adapt_partition_thresh = |