commit f0a8cf417b1fea3834a1c560d4c897d60405efa7
author Yunqing Wang <yunqingwang@google.com> Fri Aug 14 14:50:33 2020 -0700
committer Urvang Joshi <urvang@google.com> Fri Oct 16 13:05:39 2020 -0700
tree 60e03e59c10dcabbca4da118e31f0546bdfa4ae5
parent badbe56ecb66eeed4c3227b3e5ec4b373b0cae56

Add tpl_bsize in TplParams

Added tpl_bsize_1d in TplParams and made tpl block size used in tpl
motion estimation configurable. Resolved places that used a hard-coded
16x16 tpl block size. This CL wouldn't cause any bitstream change.

Change-Id: I80521783c81820b4aaf72ce1c83356fc62546fe5
(cherry picked from commit b17bfa450e84ec1639cf50a1acffde0aa83354f6)

av1/encoder/encodeframe_utils.c

diff --git a/av1/encoder/encodeframe_utils.c b/av1/encoder/encodeframe_utils.c
index d4029e5..5c9ac9d 100644
--- a/av1/encoder/encodeframe_utils.c
+++ b/av1/encoder/encodeframe_utils.c
@@ -793,7 +793,7 @@
   // TPL store unit size is not the same as the motion estimation unit size.
   // Here always use motion estimation size to avoid getting repetitive inter/
   // intra cost.
-  const BLOCK_SIZE tpl_bsize = convert_length_to_bsize(MC_FLOW_BSIZE_1D);
+  const BLOCK_SIZE tpl_bsize = convert_length_to_bsize(tpl_data->tpl_bsize_1d);
   const int step = mi_size_wide[tpl_bsize];
   assert(mi_size_wide[tpl_bsize] == mi_size_high[tpl_bsize]);