Remove vp9_recon_mb{,y}

Use the common sb functions instead.

Change-Id: I4fa0a8ee3c6ada56271dd09bf895b97642f55858

diff --git a/vp9/common/vp9_recon.c b/vp9/common/vp9_recon.c
index 3e8012aad55f5cd5520129d6e0605e23c2fdd56f..08cd5f8072ba1100f5075d152450c11920bc341c 100644 (file)
--- a/vp9/common/vp9_recon.c
+++ b/vp9/common/vp9_recon.c
@@ -93,30 +93,3 @@ void vp9_recon_sb_c(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize) {
   vp9_recon_sby(xd, bsize);
   vp9_recon_sbuv(xd, bsize);
 }
-
-void vp9_recon_mby_c(MACROBLOCKD *xd) {
-  int i;
-
-  for (i = 0; i < 16; i += 4) {
-    BLOCKD *b = &xd->block[i];
-
-    vp9_recon4b(*(b->base_dst) + b->dst, b->diff,
-                *(b->base_dst) + b->dst, b->dst_stride);
-  }
-}
-
-void vp9_recon_mb_c(MACROBLOCKD *xd) {
-  int i;
-
-  for (i = 0; i < 16; i += 4) {
-    BLOCKD *b = &xd->block[i];
-    vp9_recon4b(*(b->base_dst) + b->dst, b->diff,
-                *(b->base_dst) + b->dst, b->dst_stride);
-  }
-
-  for (i = 16; i < 24; i += 2) {
-    BLOCKD *b = &xd->block[i];
-    vp9_recon2b(*(b->base_dst) + b->dst, b->diff,
-                *(b->base_dst) + b->dst, b->dst_stride);
-  }
-}

diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh
index 51fcdd09b06fe496527a4fa084706791bd79e2b5..1f838a574dee2bfcd5768a0204ade58c817f9990 100644 (file)
--- a/vp9/common/vp9_rtcd_defs.sh
+++ b/vp9/common/vp9_rtcd_defs.sh
@@ -78,12 +78,6 @@ prototype void vp9_recon4b "uint8_t *pred_ptr, int16_t *diff_ptr, uint8_t *dst_p
 specialize vp9_recon4b
 # specialize vp9_recon4b sse2
 
-prototype void vp9_recon_mb "struct macroblockd *x"
-specialize vp9_recon_mb
-
-prototype void vp9_recon_mby "struct macroblockd *x"
-specialize vp9_recon_mby
-
 prototype void vp9_recon_sb "struct macroblockd *x, enum BLOCK_SIZE_TYPE bsize"
 specialize vp9_recon_sb
 

diff --git a/vp9/encoder/vp9_encodeintra.c b/vp9/encoder/vp9_encodeintra.c
index bccd22bf9b42a2cec4bc7d97df936f78021590fa..3c100f2d705a881a34d8affaa7e23f6ca2e17273 100644 (file)
--- a/vp9/encoder/vp9_encodeintra.c
+++ b/vp9/encoder/vp9_encodeintra.c
@@ -115,7 +115,7 @@ void vp9_encode_intra16x16mby(VP9_COMMON *const cm, MACROBLOCK *x) {
       break;
   }
 
-  vp9_recon_mby(xd);
+  vp9_recon_sby(xd, BLOCK_SIZE_MB16X16);
 }
 
 void vp9_encode_intra16x16mbuv(VP9_COMMON *const cm, MACROBLOCK *x) {

diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c
index a4478dd6df131b11b0fdc377593857a9264863f0..4d4b4249fcbadff53291442f9f21fec7019e4c09 100644 (file)
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -906,7 +906,7 @@ void vp9_encode_inter16x16(VP9_COMMON *const cm, MACROBLOCK *x,
   vp9_build_inter_predictors_mb(xd, mb_row, mb_col);
   subtract_mb(x);
   vp9_fidct_mb(cm, x);
-  vp9_recon_mb(xd);
+  vp9_recon_sb(xd, BLOCK_SIZE_MB16X16);
 }
 
 /* this function is used by first pass only */
@@ -923,5 +923,5 @@ void vp9_encode_inter16x16y(MACROBLOCK *x, int mb_row, int mb_col) {
   vp9_quantize_sby_4x4(x, BLOCK_SIZE_MB16X16);
   vp9_inverse_transform_sby_4x4(xd, BLOCK_SIZE_MB16X16);
 
-  vp9_recon_mby(xd);
+  vp9_recon_sby(xd, BLOCK_SIZE_MB16X16);
 }