shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "ML_VAR_PARTITION: enable at speed 5"

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

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

@@ -4539,7 +4539,7 @@

   vpx_clear_system_state();

   {

-    const float thresh = 0.0f;

+    const float thresh = cpi->oxcf.speed <= 5 ? 1.25f : 0.0f;

     float features[FEATURES] = { 0.0f };

     const int dc_q = vp9_dc_quant(cm->base_qindex, 0, cm->bit_depth);

     int feature_idx = 0;

@@ -4581,7 +4581,7 @@

     assert(feature_idx == FEATURES);

     nn_predict(features, nn_config, score);

     if (score[0] > thresh) return PARTITION_SPLIT;

-    if (score[0] < thresh) return PARTITION_NONE;

+    if (score[0] < -thresh) return PARTITION_NONE;

     return -1;

   }

 }

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

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

@@ -562,6 +562,16 @@

         (frames_since_key % (sf->last_partitioning_redo_frequency << 1) == 1);

     sf->max_delta_qindex = is_keyframe ? 20 : 15;

     sf->partition_search_type = REFERENCE_PARTITION;

+#if CONFIG_ML_VAR_PARTITION

+    if (!frame_is_intra_only(cm) && cm->width >= 360 && cm->height >= 360)

+      sf->partition_search_type = ML_BASED_PARTITION;

+    else

+      sf->partition_search_type = REFERENCE_PARTITION;

+#if CONFIG_VP9_HIGHBITDEPTH

+    if (cpi->Source->flags & YV12_FLAG_HIGHBITDEPTH)

+      sf->partition_search_type = REFERENCE_PARTITION;

+#endif  // CONFIG_VP9_HIGHBITDEPTH

+#endif  // CONFIG_ML_VAR_PARTITION

     if (cpi->oxcf.rc_mode == VPX_VBR && cpi->oxcf.lag_in_frames > 0 &&

         cpi->rc.is_src_frame_alt_ref) {

       sf->partition_search_type = VAR_BASED_PARTITION;

@@ -623,9 +633,7 @@

       sf->use_compound_nonrd_pickmode = 1;

     }

 #if CONFIG_ML_VAR_PARTITION

-    if (!frame_is_intra_only(cm) && cm->width >= 360 && cm->height >= 360)

-      sf->partition_search_type = ML_BASED_PARTITION;

-    else

+    if (frame_is_intra_only(cm) || cm->width < 360 || cm->height < 360)

       sf->partition_search_type = VAR_BASED_PARTITION;

 #if CONFIG_VP9_HIGHBITDEPTH

     if (cpi->Source->flags & YV12_FLAG_HIGHBITDEPTH)