shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Set max_intra_bsize to 32x32"

--- a/vp9/encoder/vp9_speed_features.c

+++ b/vp9/encoder/vp9_speed_features.c

@@ -110,16 +110,16 @@

   if (speed >= 3) {

     sf->tx_size_search_method = frame_is_intra_only(cm) ? USE_FULL_RD

                                                         : USE_LARGESTALL;

-    if (MIN(cm->width, cm->height) >= 720)

+    if (MIN(cm->width, cm->height) >= 720) {

       sf->disable_split_mask = DISABLE_ALL_SPLIT;

-    else

+    } else {

+      sf->max_intra_bsize = BLOCK_32X32;

       sf->disable_split_mask = DISABLE_ALL_INTER_SPLIT;

-

+    }

     sf->adaptive_pred_interp_filter = 0;

     sf->cb_partition_search = frame_is_boosted(cpi) ? 0 : 1;

     sf->cb_pred_filter_search = 1;

     sf->motion_field_mode_search = frame_is_boosted(cpi) ? 0 : 1;

-

     sf->lf_motion_threshold = LOW_MOTION_THRESHOLD;

     sf->last_partitioning_redo_frequency = 3;

     sf->recode_loop = ALLOW_RECODE_KFMAXBW;

@@ -181,6 +181,7 @@

       sf->disable_split_mask = DISABLE_COMPOUND_SPLIT;

     sf->use_rd_breakout = 1;

+

     sf->adaptive_motion_search = 1;

     sf->adaptive_pred_interp_filter = 1;

     sf->mv.auto_mv_step_size = 1;