shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Revert "vp9-rtc: Some speedups to speed 5 real-time mode""

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -5065,8 +5065,8 @@

   (void)*tp_orig;

-  // Avoid checking for rectangular partitions for speed >= 5.

-  if (cpi->oxcf.speed >= 5) do_rect = 0;

+  // Avoid checking for rectangular partitions for speed >= 6.

+  if (cpi->oxcf.speed >= 6) do_rect = 0;

   assert(num_8x8_blocks_wide_lookup[bsize] ==

          num_8x8_blocks_high_lookup[bsize]);

@@ -5324,11 +5324,6 @@

              subsize >= subsize_ref) {

     x->max_partition_size = BLOCK_32X32;

     x->min_partition_size = BLOCK_8X8;

-    if (subsize_ref == BLOCK_16X16 && !xd->mi[0]->segment_id &&

-        x->content_state_sb != kVeryHighSad &&

-        x->content_state_sb != kLowVarHighSumdiff &&

-        x->content_state_sb != kHighSadHighSumdiff)

-      x->min_partition_size = BLOCK_16X16;

     nonrd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col, bsize, rd_cost,

                          0, INT64_MAX, pc_tree);

   } else if (bsize == BLOCK_16X16 && partition != PARTITION_NONE) {

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

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

@@ -632,7 +632,6 @@

       sf->use_compound_nonrd_pickmode = 1;

     }

     if (cm->width * cm->height > 1280 * 720) sf->cb_pred_filter_search = 1;

-    if (!cpi->external_resize) sf->use_source_sad = 1;

   }

   if (speed >= 6) {

@@ -644,6 +643,8 @@

     sf->mv.search_method = NSTEP;

     sf->mv.reduce_first_step_size = 1;

     sf->skip_encode_sb = 0;

+

+    if (!cpi->external_resize) sf->use_source_sad = 1;

     if (sf->use_source_sad) {

       sf->adapt_partition_source_sad = 1;