Merge "Add block size in pixels lookup table" into nextgenv2

av1/common/blockd.h

@@ -307,6 +307,8 @@ typedef struct macroblockd_plane {
   uint16_t n4_w, n4_h;
   // log2 of n4_w, n4_h
   uint8_t n4_wl, n4_hl;
+  // block size in pixels
+  uint8_t width, height;
 
 #if CONFIG_AOM_QM
   const qm_val_t *seg_iqmatrix[MAX_SEGMENTS][2][TX_SIZES];

av1/common/common_data.h

@@ -42,6 +42,12 @@ static const uint8_t mi_height_log2_lookup[BLOCK_SIZES] = {
 };
 
 // Width/height lookup tables in units of various block sizes
+static const uint8_t block_size_wide[BLOCK_SIZES] = {
+  4, 4, 8, 8, 8, 16, 16, 16, 32, 32, 32, 64, 64, IF_EXT_PARTITION(64, 128, 128)
+};
+static const uint8_t block_size_high[BLOCK_SIZES] = {
+  4, 8, 4, 8, 16, 8, 16, 32, 16, 32, 64, 32, 64, IF_EXT_PARTITION(128, 64, 128)
+};
 static const uint8_t num_4x4_blocks_wide_lookup[BLOCK_SIZES] = {
   1, 1, 2, 2, 2, 4, 4, 4, 8, 8, 8, 16, 16, IF_EXT_PARTITION(16, 32, 32)
 };

av1/common/onyxc_int.h

@@ -527,6 +527,10 @@ static INLINE void set_plane_n4(MACROBLOCKD *const xd, int bw, int bh, int bwl,
                                 int bhl) {
   int i;
   for (i = 0; i < MAX_MB_PLANE; i++) {
+    xd->plane[i].width =
+        block_size_wide[xd->mi[0]->mbmi.sb_type] >> xd->plane[i].subsampling_x;
+    xd->plane[i].height =
+        block_size_high[xd->mi[0]->mbmi.sb_type] >> xd->plane[i].subsampling_y;
     xd->plane[i].n4_w = (bw << 1) >> xd->plane[i].subsampling_x;
     xd->plane[i].n4_h = (bh << 1) >> xd->plane[i].subsampling_y;
     xd->plane[i].n4_wl = bwl - xd->plane[i].subsampling_x;