Merge "Relocate memory operations for common code"

test/dct16x16_test.cc

@@ -22,6 +22,7 @@
 #include "vp9/common/vp9_entropy.h"
 #include "vpx/vpx_codec.h"
 #include "vpx/vpx_integer.h"
+#include "vpx_ports/mem.h"
 
 using libvpx_test::ACMRandom;
 

test/dct32x32_test.cc

@@ -23,6 +23,7 @@
 #include "vp9/common/vp9_entropy.h"
 #include "vpx/vpx_codec.h"
 #include "vpx/vpx_integer.h"
+#include "vpx_ports/mem.h"
 
 using libvpx_test::ACMRandom;
 

test/fdct4x4_test.cc

@@ -22,6 +22,7 @@
 #include "vp9/common/vp9_entropy.h"
 #include "vpx/vpx_codec.h"
 #include "vpx/vpx_integer.h"
+#include "vpx_ports/mem.h"
 
 using libvpx_test::ACMRandom;
 

test/fdct8x8_test.cc

@@ -22,6 +22,7 @@
 #include "vp9/common/vp9_entropy.h"
 #include "vpx/vpx_codec.h"
 #include "vpx/vpx_integer.h"
+#include "vpx_ports/mem.h"
 
 const int kNumCoeffs = 64;
 const double kPi = 3.141592653589793238462643383279502884;

test/sad_test.cc

@@ -16,22 +16,7 @@
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 #include "vpx_mem/vpx_mem.h"
-
-/* Needed for ROUND_POWER_OF_TWO and CONVERT_TO* macros, both of which should be
- * moved to a more generic location. Alternatively the *avg functions could be
- * restricted to VP9 builds, but it would be better to avoid that sort of
- * specificity.
- * TODO(johannkoenig): move these macros to a common location.
- */
-#if CONFIG_VP9_HIGHBITDEPTH
-#include "vp9/common/vp9_common.h"
-#endif  // CONFIG_VP9_HIGHBITDEPTH
-
-#ifndef ROUND_POWER_OF_TWO
-#define ROUND_POWER_OF_TWO(value, n) \
-     (((value) + (1 << ((n) - 1))) >> (n))
-#endif  // ROUND_POWER_OF_TWO
-
+#include "vpx_ports/mem.h"
 
 #include "test/acm_random.h"
 #include "test/clear_system_state.h"

test/variance_test.cc

@@ -20,6 +20,7 @@
 #include "vpx/vpx_codec.h"
 #include "vpx/vpx_integer.h"
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 #if CONFIG_VP8_ENCODER
 # include "./vp8_rtcd.h"
 # include "vp8/common/variance.h"

vp9/common/arm/neon/vp9_idct16x16_1_add_neon.c

@@ -9,6 +9,8 @@
  */
 
 #include <arm_neon.h>
+
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_idct.h"
 
 void vp9_idct16x16_1_add_neon(

vp9/common/arm/neon/vp9_idct32x32_1_add_neon.c

@@ -9,10 +9,12 @@
  */
 
 #include <arm_neon.h>
-#include "vp9/common/vp9_idct.h"
 
 #include "./vpx_config.h"
 
+#include "vpx_ports/mem.h"
+#include "vp9/common/vp9_idct.h"
+
 static INLINE void LD_16x8(
         uint8_t *d,
         int d_stride,

vp9/common/arm/neon/vp9_idct4x4_1_add_neon.c

@@ -9,6 +9,8 @@
  */
 
 #include <arm_neon.h>
+
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_idct.h"
 
 void vp9_idct4x4_1_add_neon(

vp9/common/arm/neon/vp9_idct8x8_1_add_neon.c

@@ -9,6 +9,8 @@
  */
 
 #include <arm_neon.h>
+
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_idct.h"
 
 void vp9_idct8x8_1_add_neon(

vp9/common/mips/dspr2/vp9_itrans16_dspr2.c

@@ -13,6 +13,7 @@
 
 #include "./vpx_config.h"
 #include "./vp9_rtcd.h"
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_idct.h"

vp9/common/mips/dspr2/vp9_itrans32_cols_dspr2.c

@@ -12,6 +12,7 @@
 
 #include "./vpx_config.h"
 #include "./vp9_rtcd.h"
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_idct.h"

vp9/common/mips/dspr2/vp9_itrans4_dspr2.c

@@ -13,6 +13,7 @@
 
 #include "./vpx_config.h"
 #include "./vp9_rtcd.h"
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_idct.h"

vp9/common/mips/dspr2/vp9_itrans8_dspr2.c

@@ -13,6 +13,7 @@
 
 #include "./vpx_config.h"
 #include "./vp9_rtcd.h"
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_idct.h"

vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h

@@ -14,6 +14,7 @@
 #include <stdlib.h>
 
 #include "./vp9_rtcd.h"
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_onyxc_int.h"
 

vp9/common/vp9_common.h

@@ -27,12 +27,6 @@ extern "C" {
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
 
-#define ROUND_POWER_OF_TWO(value, n) \
-    (((value) + (1 << ((n) - 1))) >> (n))
-
-#define ALIGN_POWER_OF_TWO(value, n) \
-    (((value) + ((1 << (n)) - 1)) & ~((1 << (n)) - 1))
-
 // Only need this for fixed-size arrays, for structs just assign.
 #define vp9_copy(dest, src) {            \
     assert(sizeof(dest) == sizeof(src)); \
@@ -83,9 +77,6 @@ static INLINE uint16_t clip_pixel_highbd(int val, int bd) {
 typedef int64_t tran_high_t;
 typedef int32_t tran_low_t;
 
-#define CONVERT_TO_SHORTPTR(x) ((uint16_t*)(((uintptr_t)x) << 1))
-#define CONVERT_TO_BYTEPTR(x) ((uint8_t*)(((uintptr_t)x) >> 1 ))
-
 #else
 
 // Note:

vp9/common/vp9_idct.c

@@ -11,6 +11,7 @@
 #include <math.h>
 
 #include "./vp9_rtcd.h"
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_idct.h"
 #include "vp9/common/vp9_systemdependent.h"

vp9/common/vp9_idct.h

@@ -14,6 +14,7 @@
 #include <assert.h>
 
 #include "./vpx_config.h"
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_enums.h"
 

vp9/common/vp9_loopfilter.c

@@ -13,6 +13,7 @@
 #include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/vp9_reconinter.h"
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 
 #include "vp9/common/vp9_seg_common.h"
 

vp9/common/vp9_loopfilter_filters.c

@@ -9,6 +9,7 @@
  */
 
 #include "./vpx_config.h"
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/vp9_onyxc_int.h"

vp9/common/vp9_postproc.c

@@ -16,12 +16,10 @@
 #include "./vpx_scale_rtcd.h"
 #include "./vp9_rtcd.h"
 
+#include "vpx_ports/mem.h"
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_scale/yv12config.h"
 
-#if CONFIG_VP9_HIGHBITDEPTH
-#include "vp9/common/vp9_common.h"
-#endif
 #include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/vp9_postproc.h"
 #include "vp9/common/vp9_systemdependent.h"

vp9/common/vp9_reconintra.c

@@ -12,6 +12,7 @@
 #include "./vp9_rtcd.h"
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_once.h"
 
 #include "vp9/common/vp9_reconintra.h"

vp9/common/x86/vp9_high_loopfilter_intrin_sse2.c

@@ -11,6 +11,7 @@
 #include <emmintrin.h>  // SSE2
 
 #include "./vp9_rtcd.h"
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_loopfilter.h"
 #include "vpx_ports/emmintrin_compat.h"
 

vp9/common/x86/vp9_idct_intrin_sse2.c

@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "vpx_ports/mem.h"
 #include "vp9/common/x86/vp9_idct_intrin_sse2.h"
 #include "vp9/common/vp9_idct.h"
 

vp9/decoder/vp9_decodeframe.c

@@ -15,6 +15,7 @@
 #include "./vpx_scale_rtcd.h"
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 #include "vpx_ports/mem_ops.h"
 #include "vpx_scale/vpx_scale.h"
 

vp9/encoder/vp9_aq_variance.c

@@ -10,6 +10,8 @@
 
 #include <math.h>
 
+#include "vpx_ports/mem.h"
+
 #include "vp9/encoder/vp9_aq_variance.h"
 
 #include "vp9/common/vp9_seg_common.h"

vp9/encoder/vp9_dct.c

@@ -14,6 +14,7 @@
 #include "./vpx_config.h"
 #include "./vp9_rtcd.h"
 
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_idct.h"
 #include "vp9/common/vp9_systemdependent.h"

vp9/encoder/vp9_encodeframe.c

@@ -15,6 +15,7 @@
 #include "./vp9_rtcd.h"
 #include "./vpx_config.h"
 
+#include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.h"
 
 #include "vp9/common/vp9_common.h"

vp9/encoder/vp9_encodemb.c

@@ -13,6 +13,7 @@
 #include "./vpx_config.h"
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 
 #include "vp9/common/vp9_idct.h"
 #include "vp9/common/vp9_reconinter.h"

vp9/encoder/vp9_encoder.c

@@ -17,6 +17,7 @@
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_scale_rtcd.h"
 #include "vpx/internal/vpx_psnr.h"
+#include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.h"
 
 #include "vp9/common/vp9_alloccommon.h"

vp9/encoder/vp9_extend.c

@@ -9,6 +9,7 @@
  */
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 
 #include "vp9/common/vp9_common.h"
 #include "vp9/encoder/vp9_extend.h"

vp9/encoder/vp9_firstpass.c

@@ -15,6 +15,7 @@
 #include "./vpx_scale_rtcd.h"
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 #include "vpx_scale/vpx_scale.h"
 #include "vpx_scale/yv12config.h"
 

vp9/encoder/vp9_mcomp.c

@@ -15,6 +15,7 @@
 #include "./vpx_config.h"
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 
 #include "vp9/common/vp9_common.h"
 

vp9/encoder/vp9_picklpf.c

@@ -14,6 +14,7 @@
 #include "./vpx_scale_rtcd.h"
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 
 #include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/vp9_onyxc_int.h"

vp9/encoder/vp9_pickmode.c

@@ -16,6 +16,7 @@
 #include "./vp9_rtcd.h"
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_common.h"

vp9/encoder/vp9_quantize.c

@@ -11,6 +11,7 @@
 #include <math.h>
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 
 #include "vp9/common/vp9_quant_common.h"
 #include "vp9/common/vp9_seg_common.h"

vp9/encoder/vp9_ratectrl.c

@@ -16,6 +16,7 @@
 #include <string.h>
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 
 #include "vp9/common/vp9_alloccommon.h"
 #include "vp9/encoder/vp9_aq_cyclicrefresh.h"

vp9/encoder/vp9_rd.c

@@ -15,6 +15,7 @@
 #include "./vp9_rtcd.h"
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_entropy.h"

vp9/encoder/vp9_rdopt.c

@@ -14,6 +14,7 @@
 #include "./vp9_rtcd.h"
 
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 
 #include "vp9/common/vp9_common.h"
 #include "vp9/common/vp9_entropy.h"

vp9/encoder/vp9_resize.c

@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 #include "vp9/encoder/vp9_resize.h"
 

vp9/encoder/vp9_ssim.c

@@ -10,6 +10,7 @@
 
 #include <math.h>
 #include "./vp9_rtcd.h"
+#include "vpx_ports/mem.h"
 #include "vp9/encoder/vp9_ssim.h"
 
 void vp9_ssim_parms_16x16_c(uint8_t *s, int sp, uint8_t *r,

vp9/encoder/vp9_temporal_filter.c

@@ -24,6 +24,7 @@
 #include "vp9/encoder/vp9_ratectrl.h"
 #include "vp9/encoder/vp9_segmentation.h"
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.h"
 #include "vpx_scale/vpx_scale.h"
 

vp9/encoder/x86/vp9_highbd_quantize_intrin_sse2.c

@@ -10,6 +10,7 @@
 
 #include <emmintrin.h>
 
+#include "vpx_ports/mem.h"
 #include "vp9/common/vp9_common.h"
 
 #if CONFIG_VP9_HIGHBITDEPTH

vp9/vp9_iface_common.h

@@ -10,6 +10,8 @@
 #ifndef VP9_VP9_IFACE_COMMON_H_
 #define VP9_VP9_IFACE_COMMON_H_
 
+#include "vpx_ports/mem.h"
+
 static void yuvconfig2image(vpx_image_t *img, const YV12_BUFFER_CONFIG  *yv12,
                             void *user_priv) {
   /** vpx_img_wrap() doesn't allow specifying independent strides for

vpx_dsp/sad.c

@@ -14,13 +14,7 @@
 #include "./vpx_dsp_rtcd.h"
 
 #include "vpx/vpx_integer.h"
-
-#if CONFIG_VP9_HIGHBITDEPTH
-#include "vp9/common/vp9_common.h"
-#endif  // CONFIG_VP9_HIGHBITDEPTH
-// Temporary ...
-#define ROUND_POWER_OF_TWO(value, n) \
-     (((value) + (1 << ((n) - 1))) >> (n))
+#include "vpx_ports/mem.h"
 
 /* Sum the difference between every corresponding element of the buffers. */
 static INLINE unsigned int sad(const uint8_t *a, int a_stride,

vpx_ports/mem.h

@@ -38,4 +38,16 @@
 #define __builtin_prefetch(x)
 #endif
 
+/* Shift down with rounding */
+#define ROUND_POWER_OF_TWO(value, n) \
+    (((value) + (1 << ((n) - 1))) >> (n))
+
+#define ALIGN_POWER_OF_TWO(value, n) \
+    (((value) + ((1 << (n)) - 1)) & ~((1 << (n)) - 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))
+#endif  // CONFIG_VP9_HIGHBITDEPTH
+
 #endif  // VPX_PORTS_MEM_H_

vpx_scale/generic/yv12config.c

@@ -12,9 +12,7 @@
 
 #include "vpx_scale/yv12config.h"
 #include "vpx_mem/vpx_mem.h"
-#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
-#include "vp9/common/vp9_common.h"
-#endif
+#include "vpx_ports/mem.h"
 
 /****************************************************************************
 *  Exports

vpx_scale/generic/yv12extend.c

@@ -12,6 +12,7 @@
 #include "./vpx_config.h"
 #include "vpx/vpx_integer.h"
 #include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
 #include "vpx_scale/yv12config.h"
 #if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH
 #include "vp9/common/vp9_common.h"