summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2013-04-20 14:17:57 -0700
committerJohn Koleszar <jkoleszar@google.com>2013-04-22 12:05:24 -0700
commit01e41a531b1ccd18eff2c6c490bd9104936e94ff (patch)
tree3ad1a8940cce5c00404ad24a02866e4675ca6d9d
parentc2c15e8eb3e62d26a0f592d0d23313108ad161e9 (diff)
downloadlibvpx-01e41a531b1ccd18eff2c6c490bd9104936e94ff.tar
libvpx-01e41a531b1ccd18eff2c6c490bd9104936e94ff.tar.gz
libvpx-01e41a531b1ccd18eff2c6c490bd9104936e94ff.tar.bz2
libvpx-01e41a531b1ccd18eff2c6c490bd9104936e94ff.zip
Remove vp9_recon_intra_mbuv
Use common vp9_recon_sbuv instead. Change-Id: I146f79adfdfda2b52257a52fa783727f12afa246
-rw-r--r--vp9/common/vp9_reconintra.c9
-rw-r--r--vp9/common/vp9_reconintra.h2
-rw-r--r--vp9/encoder/vp9_encodeintra.c2
3 files changed, 1 insertions, 12 deletions
diff --git a/vp9/common/vp9_reconintra.c b/vp9/common/vp9_reconintra.c
index 1031be7ba..6caebd784 100644
--- a/vp9/common/vp9_reconintra.c
+++ b/vp9/common/vp9_reconintra.c
@@ -269,15 +269,6 @@ static void corner_predictor(uint8_t *ypred_ptr, int y_stride, int n,
}
}
-void vp9_recon_intra_mbuv(MACROBLOCKD *xd) {
- int i;
- 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);
- }
-}
-
static INLINE int log2_minus_1(int n) {
switch (n) {
case 4: return 1;
diff --git a/vp9/common/vp9_reconintra.h b/vp9/common/vp9_reconintra.h
index b97b6089d..1e0cfa42d 100644
--- a/vp9/common/vp9_reconintra.h
+++ b/vp9/common/vp9_reconintra.h
@@ -14,8 +14,6 @@
#include "vpx/vpx_integer.h"
#include "vp9/common/vp9_blockd.h"
-void vp9_recon_intra_mbuv(MACROBLOCKD *xd);
-
B_PREDICTION_MODE vp9_find_dominant_direction(uint8_t *ptr,
int stride, int n,
int tx, int ty);
diff --git a/vp9/encoder/vp9_encodeintra.c b/vp9/encoder/vp9_encodeintra.c
index 95befb72d..5c6559bdb 100644
--- a/vp9/encoder/vp9_encodeintra.c
+++ b/vp9/encoder/vp9_encodeintra.c
@@ -146,7 +146,7 @@ void vp9_encode_intra16x16mbuv(VP9_COMMON *const cm, MACROBLOCK *x) {
break;
}
- vp9_recon_intra_mbuv(xd);
+ vp9_recon_sbuv(xd, BLOCK_SIZE_MB16X16);
}
void vp9_encode_intra8x8(MACROBLOCK *x, int ib) {