| @@ -536,13 +536,6 @@ static void set_rt_speed_feature_framesize_independent( · 535 unmodified lines |
| 536 | int i; | 536 | int i; |
| 537 | if (cpi->oxcf.rc_mode == VPX_VBR && cpi->oxcf.lag_in_frames > 0) | 537 | if (cpi->oxcf.rc_mode == VPX_VBR && cpi->oxcf.lag_in_frames > 0) |
| 538 | sf->use_altref_onepass = 1; | 538 | sf->use_altref_onepass = 1; |
| 539 | sf->last_partitioning_redo_frequency = 4; | | |
| 540 | sf->adaptive_rd_thresh = 5; | | |
| 541 | sf->use_fast_coef_costing = 0; | | |
| 542 | sf->auto_min_max_partition_size = STRICT_NEIGHBORING_MIN_MAX; | | |
| 543 | sf->adjust_partitioning_from_last_frame = | | |
| 544 | cm->last_frame_type != cm->frame_type || | | |
| 545 | (0 == (frames_since_key + 1) % sf->last_partitioning_redo_frequency); | | |
| 546 | sf->mv.subpel_force_stop = QUARTER_PEL; | 539 | sf->mv.subpel_force_stop = QUARTER_PEL; |
| 547 | for (i = 0; i < TX_SIZES; i++) { | 540 | for (i = 0; i < TX_SIZES; i++) { |
| 548 | sf->intra_y_mode_mask[i] = INTRA_DC_H_V; | 541 | sf->intra_y_mode_mask[i] = INTRA_DC_H_V; |
| @@ -551,13 +544,19 @@ static void set_rt_speed_feature_framesize_independent( · 2 unmodified lines |
| 551 | sf->intra_y_mode_mask[TX_32X32] = INTRA_DC; | 544 | sf->intra_y_mode_mask[TX_32X32] = INTRA_DC; |
| 552 | sf->frame_parameter_update = 0; | 545 | sf->frame_parameter_update = 0; |
| 553 | sf->mv.search_method = FAST_HEX; | 546 | sf->mv.search_method = FAST_HEX; |
| 554 | | 547 | sf->allow_skip_recode = 0; |
| 555 | sf->inter_mode_mask[BLOCK_32X32] = INTER_NEAREST_NEAR_NEW; | | |
| 556 | sf->inter_mode_mask[BLOCK_32X64] = INTER_NEAREST; | | |
| 557 | sf->inter_mode_mask[BLOCK_64X32] = INTER_NEAREST; | | |
| 558 | sf->inter_mode_mask[BLOCK_64X64] = INTER_NEAREST; | | |
| 559 | sf->max_intra_bsize = BLOCK_32X32; | 548 | sf->max_intra_bsize = BLOCK_32X32; |
| 560 | sf->allow_skip_recode = 1; | 549 | sf->use_fast_coef_costing = 0; |
| | 550 | sf->use_quant_fp = !is_keyframe; |
| | 551 | sf->inter_mode_mask[BLOCK_32X32] = INTER_NEAREST_NEW_ZERO; |
| | 552 | sf->inter_mode_mask[BLOCK_32X64] = INTER_NEAREST_NEW_ZERO; |
| | 553 | sf->inter_mode_mask[BLOCK_64X32] = INTER_NEAREST_NEW_ZERO; |
| | 554 | sf->inter_mode_mask[BLOCK_64X64] = INTER_NEAREST_NEW_ZERO; |
| | 555 | sf->adaptive_rd_thresh = 2; |
| | 556 | sf->use_fast_coef_updates = is_keyframe ? TWO_LOOP : ONE_LOOP_REDUCED; |
| | 557 | sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH; |
| | 558 | sf->tx_size_search_method = is_keyframe ? USE_LARGESTALL : USE_TX_8X8; |
| | 559 | sf->partition_search_type = VAR_BASED_PARTITION; |
| 561 | } | 560 | } |
| 562 | | 561 | |
| 563 | if (speed >= 5) { | 562 | if (speed >= 5) { |
| @@ -819,7 +818,7 @@ static void set_rt_speed_feature_framesize_independent( · 255 unmodified lines |
| 819 | } | 818 | } |
| 820 | // TODO(marpan): There is regression for aq-mode=3 speed <= 4, force it | 819 | // TODO(marpan): There is regression for aq-mode=3 speed <= 4, force it |
| 821 | // off for now. | 820 | // off for now. |
| 822 | if (speed <= 4 && cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) | 821 | if (speed <= 3 && cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ) |
| 823 | cpi->oxcf.aq_mode = 0; | 822 | cpi->oxcf.aq_mode = 0; |
| 824 | } | 823 | } |
| 825 | | 824 | |