shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove unused vp9_build_intra_predictors_sb{y,uv}_s"

--- a/vp9/common/vp9_reconintra.c

+++ b/vp9/common/vp9_reconintra.c

@@ -295,35 +295,6 @@

   }

 }

-void vp9_build_intra_predictors_sby_s(MACROBLOCKD *xd,

-                                      BLOCK_SIZE_TYPE bsize) {

-  const struct macroblockd_plane* const pd = &xd->plane[0];

-  const int bw = plane_block_width(bsize, pd);

-  const int bh = plane_block_height(bsize, pd);

-  vp9_build_intra_predictors(pd->dst.buf, pd->dst.stride,

-                             pd->dst.buf, pd->dst.stride,

-                             xd->mode_info_context->mbmi.mode,

-                             bw, bh, xd->up_available, xd->left_available,

-                             0 /*xd->right_available*/);

-}

-

-void vp9_build_intra_predictors_sbuv_s(MACROBLOCKD *xd,

-                                       BLOCK_SIZE_TYPE bsize) {

-  const int bwl = b_width_log2(bsize), bw = 2 << bwl;

-  const int bhl = b_height_log2(bsize), bh = 2 << bhl;

-

-  vp9_build_intra_predictors(xd->plane[1].dst.buf, xd->plane[1].dst.stride,

-                             xd->plane[1].dst.buf, xd->plane[1].dst.stride,

-                             xd->mode_info_context->mbmi.uv_mode,

-                             bw, bh, xd->up_available,

-                             xd->left_available, 0 /*xd->right_available*/);

-  vp9_build_intra_predictors(xd->plane[2].dst.buf, xd->plane[1].dst.stride,

-                             xd->plane[2].dst.buf, xd->plane[1].dst.stride,

-                             xd->mode_info_context->mbmi.uv_mode,

-                             bw, bh, xd->up_available,

-                             xd->left_available, 0 /*xd->right_available*/);

-}

-

 void vp9_predict_intra_block(MACROBLOCKD *xd,

                             int block_idx,

                             int bwl_in,

--- a/vp9/common/vp9_rtcd_defs.sh

+++ b/vp9/common/vp9_rtcd_defs.sh

@@ -57,12 +57,6 @@

 prototype void vp9_build_intra_predictors "uint8_t *src, int src_stride, uint8_t *pred, int y_stride, int mode, int bw, int bh, int up_available, int left_available, int right_available"

 specialize void vp9_build_intra_predictors

-prototype void vp9_build_intra_predictors_sby_s "struct macroblockd *x, enum BLOCK_SIZE_TYPE bsize"

-specialize vp9_build_intra_predictors_sby_s

-

-prototype void vp9_build_intra_predictors_sbuv_s "struct macroblockd *x, enum BLOCK_SIZE_TYPE bsize"

-specialize vp9_build_intra_predictors_sbuv_s

-

 prototype void vp9_intra4x4_predict "struct macroblockd *xd, int block, enum BLOCK_SIZE_TYPE bsize, int b_mode, uint8_t *predictor, int pre_stride"

 specialize vp9_intra4x4_predict;