summaryrefslogtreecommitdiff
path: root/vpx_ports
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2016-06-24 12:44:23 -0700
committerYaowu Xu <yaowu@google.com>2016-06-24 13:52:50 -0700
commit003a9d20add4f736ff16fa58e51b5ca1bbf50ce0 (patch)
tree784f64307f1b7d3abd70cc5266f0a6fd65975077 /vpx_ports
parent7ed1d54ab4b75037e90c46135cfe01b7dc47fa4d (diff)
downloadlibvpx-003a9d20add4f736ff16fa58e51b5ca1bbf50ce0.tar
libvpx-003a9d20add4f736ff16fa58e51b5ca1bbf50ce0.tar.gz
libvpx-003a9d20add4f736ff16fa58e51b5ca1bbf50ce0.tar.bz2
libvpx-003a9d20add4f736ff16fa58e51b5ca1bbf50ce0.zip
Port metric computation changes from nextgenv2
Change-Id: I4aceffcdf7af59ffeb51984f0345c3a4c7e76a9f
Diffstat (limited to 'vpx_ports')
-rw-r--r--vpx_ports/mem.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/vpx_ports/mem.h b/vpx_ports/mem.h
index 7502f9063..ae4aec808 100644
--- a/vpx_ports/mem.h
+++ b/vpx_ports/mem.h
@@ -45,9 +45,9 @@
#define ALIGN_POWER_OF_TWO(value, n) \
(((value) + ((1 << (n)) - 1)) & ~((1 << (n)) - 1))
+#define CONVERT_TO_SHORTPTR(x) ((uint16_t*)(((uintptr_t)(x)) << 1))
#if CONFIG_VP9_HIGHBITDEPTH
-#define CONVERT_TO_SHORTPTR(x) ((uint16_t*)(((uintptr_t)x) << 1))
-#define CONVERT_TO_BYTEPTR(x) ((uint8_t*)(((uintptr_t)x) >> 1))
+#define CONVERT_TO_BYTEPTR(x) ((uint8_t*)(((uintptr_t)(x)) >> 1))
#endif // CONFIG_VP9_HIGHBITDEPTH
#endif // VPX_PORTS_MEM_H_