ref: 2bf9ef4b94feb3d2c98d74e2e5012b20ae9daf18
parent: 62329176081ce718b73e838a13aa1a429a123323
parent: fe0c09c2aab48da32d2a1e78efad2f5310b1385f
author: Yaowu Xu <[email protected]>
date: Wed Feb 26 11:23:49 EST 2014
Merge "Reduce the frequency of partition size adjsutment"
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -852,6 +852,9 @@
sf->adaptive_rd_thresh = 5;
sf->auto_min_max_partition_size = frame_is_intra_only(cm) ?
RELAXED_NEIGHBORING_MIN_MAX : STRICT_NEIGHBORING_MIN_MAX;
+ sf->adjust_partitioning_from_last_frame =
+ cm->last_frame_type == KEY_FRAME || (0 ==
+ (cm->current_video_frame + 1) % sf->last_partitioning_redo_frequency);
sf->subpel_force_stop = 1;
for (i = 0; i < TX_SIZES; i++) {
sf->intra_y_mode_mask[i] = INTRA_DC_H_V;
@@ -859,7 +862,6 @@
}
sf->frame_parameter_update = 0;
sf->encode_breakout_thresh = 1000;
-
sf->search_method = FAST_HEX;
}
if (speed >= 6) {