summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Grange <agrange@google.com>2015-03-24 14:28:15 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2015-03-25 15:37:03 -0700
commitad18b2b641fe74a3e4baec34918b943233fc6714 (patch)
treec0720024566dcb743c4d2aeae6a034e6ba524300
parent65df3d138a242e9d668da5d439bb842708ec9f2f (diff)
downloadlibvpx-ad18b2b641fe74a3e4baec34918b943233fc6714.tar
libvpx-ad18b2b641fe74a3e4baec34918b943233fc6714.tar.gz
libvpx-ad18b2b641fe74a3e4baec34918b943233fc6714.tar.bz2
libvpx-ad18b2b641fe74a3e4baec34918b943233fc6714.zip
Remove 8-bit array in HBD
Creating both 8- and 16-bit arrays and then only using one of them is wasteful. Change-Id: Ic5b397c283efaff7bcfff2d2413838ba3e065561
-rw-r--r--vp9/encoder/vp9_rdopt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 5fef9f89b..e8c3f767e 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2410,7 +2410,6 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
int_mv cur_mv[2];
#if CONFIG_VP9_HIGHBITDEPTH
DECLARE_ALIGNED_ARRAY(16, uint16_t, tmp_buf16, MAX_MB_PLANE * 64 * 64);
- DECLARE_ALIGNED_ARRAY(16, uint8_t, tmp_buf8, MAX_MB_PLANE * 64 * 64);
uint8_t *tmp_buf;
#else
DECLARE_ALIGNED_ARRAY(16, uint8_t, tmp_buf, MAX_MB_PLANE * 64 * 64);
@@ -2439,7 +2438,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
tmp_buf = CONVERT_TO_BYTEPTR(tmp_buf16);
} else {
- tmp_buf = tmp_buf8;
+ tmp_buf = (uint8_t *)tmp_buf16;
}
#endif // CONFIG_VP9_HIGHBITDEPTH