Simplify the intra prediction code

Change-Id: Iffb34846d890091a5e659c3087414317c30e1415

av1/common/reconinter.c

@@ -1916,9 +1916,9 @@ void av1_build_intra_predictors_for_interintra(const AV1_COMMON *cm,
   PREDICTION_MODE mode =
       interintra_to_intra_mode[xd->mi[0]->mbmi.interintra_mode];
 
-  av1_predict_intra_block(cm, xd, pd->width, pd->height, plane_bsize, mode,
-                          ctx->plane[plane], ctx->stride[plane], dst,
-                          dst_stride, 0, 0, plane);
+  av1_predict_intra_block(
+      cm, xd, pd->width, pd->height, get_max_rect_tx_size(plane_bsize, 0), mode,
+      ctx->plane[plane], ctx->stride[plane], dst, dst_stride, 0, 0, plane);
 }
 
 void av1_combine_interintra(MACROBLOCKD *xd, BLOCK_SIZE bsize, int plane,

av1/common/reconintra.h

@@ -25,7 +25,7 @@ void av1_predict_intra_block_facade(const AV1_COMMON *cm, MACROBLOCKD *xd,
                                     int plane, int blk_col, int blk_row,
                                     TX_SIZE tx_size);
 void av1_predict_intra_block(const AV1_COMMON *cm, const MACROBLOCKD *xd,
-                             int bw, int bh, BLOCK_SIZE bsize,
+                             int bw, int bh, TX_SIZE tx_size,
                              PREDICTION_MODE mode, const uint8_t *ref,
                              int ref_stride, uint8_t *dst, int dst_stride,
                              int aoff, int loff, int plane);

av1/encoder/mbgraph.c

@@ -148,10 +148,9 @@ static int find_best_16x16_intra(AV1_COMP *cpi, PREDICTION_MODE *pbest_mode) {
     unsigned int err;
 
     xd->mi[0]->mbmi.mode = mode;
-    av1_predict_intra_block(cm, xd, 16, 16, BLOCK_16X16, mode,
-                            x->plane[0].src.buf, x->plane[0].src.stride,
-                            xd->plane[0].dst.buf, xd->plane[0].dst.stride, 0, 0,
-                            0);
+    av1_predict_intra_block(cm, xd, 16, 16, TX_16X16, mode, x->plane[0].src.buf,
+                            x->plane[0].src.stride, xd->plane[0].dst.buf,
+                            xd->plane[0].dst.stride, 0, 0, 0);
     err = aom_sad16x16(x->plane[0].src.buf, x->plane[0].src.stride,
                        xd->plane[0].dst.buf, xd->plane[0].dst.stride);