shithub: libvpx

Download patch

ref: 9ec0f658a15ebfa1509fb60c90a0d19f81eb8df5
parent: d747986d29f2d2e0f2d6bd73a14da6054466a098
author: John Koleszar <jkoleszar@google.com>
date: Fri Apr 19 08:12:00 EDT 2013 

Remove vp9_recon_mb{,y}

Use the common sb functions instead.

Change-Id: I4fa0a8ee3c6ada56271dd09bf895b97642f55858


--- a/vp9/common/vp9_recon.c
+++ b/vp9/common/vp9_recon.c
@@ -93,30 +93,3 @@
   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);
-  }
-}
--- a/vp9/common/vp9_rtcd_defs.sh
+++ b/vp9/common/vp9_rtcd_defs.sh
@@ -78,12 +78,6 @@
 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
 
--- a/vp9/encoder/vp9_encodeintra.c
+++ b/vp9/encoder/vp9_encodeintra.c
@@ -115,7 +115,7 @@
       break;
   }
 
-  vp9_recon_mby(xd);
+  vp9_recon_sby(xd, BLOCK_SIZE_MB16X16);
 }
 
 void vp9_encode_intra16x16mbuv(VP9_COMMON *const cm, MACROBLOCK *x) {
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -906,7 +906,7 @@
   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 @@
   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);
 }