shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Refactor intra predictor block"

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

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

@@ -317,12 +317,3 @@

                              have_top, have_left,

                              have_right);

 }

-

-void vp9_intra4x4_predict(MACROBLOCKD *xd,

-                          int block_idx,

-                          BLOCK_SIZE_TYPE bsize,

-                          int mode,

-                          uint8_t *predictor, int pre_stride) {

-  vp9_predict_intra_block(xd, block_idx, b_width_log2(bsize), TX_4X4,

-                          mode, predictor, pre_stride);

-}

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

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

@@ -57,9 +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_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;

-

 if [ "$CONFIG_VP9_DECODER" = "yes" ]; then

 prototype void vp9_add_constant_residual_8x8 "const int16_t diff, uint8_t *dest, int stride"

 specialize vp9_add_constant_residual_8x8 sse2

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -685,8 +685,8 @@

         dst = raster_block_offset_uint8(xd, BLOCK_SIZE_SB8X8, 0, block,

                                         xd->plane[0].dst.buf,

                                         xd->plane[0].dst.stride);

-        vp9_intra4x4_predict(xd, block, BLOCK_SIZE_SB8X8, mode,

-                             dst, xd->plane[0].dst.stride);

+        vp9_predict_intra_block(xd, block, b_width_log2(BLOCK_SIZE_SB8X8),

+                                TX_4X4, mode, dst, xd->plane[0].dst.stride);

         vp9_subtract_block(4, 4, src_diff, 8,

                            src, src_stride,

                            dst, xd->plane[0].dst.stride);

@@ -745,8 +745,8 @@

                                       xd->plane[0].dst.buf,

                                       xd->plane[0].dst.stride);

-      vp9_intra4x4_predict(xd, block, BLOCK_SIZE_SB8X8, *best_mode,

-                           dst, xd->plane[0].dst.stride);

+      vp9_predict_intra_block(xd, block, b_width_log2(BLOCK_SIZE_SB8X8), TX_4X4,

+                              *best_mode, dst, xd->plane[0].dst.stride);

       // inverse transform

       if (best_tx_type != DCT_DCT)

         vp9_short_iht4x4_add(best_dqcoeff[idy * 2 + idx], dst,

-- 

⑨