shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Set up the unit scaling factor for motion search"

--- a/vp9/encoder/vp9_block.h

+++ b/vp9/encoder/vp9_block.h

@@ -211,6 +211,8 @@

 #if CONFIG_ML_VAR_PARTITION

   DECLARE_ALIGNED(16, uint8_t, est_pred[64 * 64]);

 #endif  // CONFIG_ML_VAR_PARTITION

+

+  struct scale_factors *me_sf;

 };

 #ifdef __cplusplus

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -2449,6 +2449,17 @@

   vp9_loop_filter_init(cm);

+  // Set up the unit scaling factor used during motion search.

+#if CONFIG_VP9_HIGHBITDEPTH

+  vp9_setup_scale_factors_for_frame(&cpi->me_sf, cm->width, cm->height,

+                                    cm->width, cm->height,

+                                    cm->use_highbitdepth);

+#else

+  vp9_setup_scale_factors_for_frame(&cpi->me_sf, cm->width, cm->height,

+                                    cm->width, cm->height);

+#endif  // CONFIG_VP9_HIGHBITDEPTH

+  cpi->td.mb.me_sf = &cpi->me_sf;

+

   cm->error.setjmp = 0;

   return cpi;

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -604,6 +604,7 @@

   ActiveMap active_map;

   fractional_mv_step_fp *find_fractional_mv_step;

+  struct scale_factors me_sf;

   vp9_diamond_search_fn_t diamond_search_sad;

   vp9_variance_fn_ptr_t fn_ptr[BLOCK_SIZES];

   uint64_t time_receive_data;