commit aadb0b4b23b0aaa031c8aca15c9f86a42010acf6
author Hui Su <huisu@google.com> Fri Dec 06 15:56:47 2019 -0800
committer Hui Su <huisu@google.com> Sat Dec 07 16:52:59 2019 +0000
tree 152a42641427a4519cd42ee35b5029ce0b255f48
parent 9071bfeb20fc0c9c3d0b6870ed41d6a539e0a4eb

Consolidate get_scaled_plane_bsize()

get_scaled_plane_bsize() and get_plane_block_size() are essentially the
same and can thus be merged.

Change-Id: Ia4fb7c87b5df07de9b6b22cd6cc83fbf4967af50

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 44b9143..03d492e 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1392,7 +1392,7 @@
   assert(bsize < BLOCK_SIZES_ALL);
   const int ss_x = pd->subsampling_x;
   const int ss_y = pd->subsampling_y;
-  const BLOCK_SIZE plane_bsize = get_scaled_plane_bsize(bsize, ss_x, ss_y);
+  const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, ss_x, ss_y);
   assert(plane_bsize < BLOCK_SIZES_ALL);
   const TX_SIZE max_tx_size = get_vartx_max_txsize(xd, plane_bsize, plane);
   const int step =