Include vpx_dsp_common.h when using VPXMIN/MAX

Change-Id: I2e387a06484a06301f3cd6600c4ba2f4335b61ee

diff --git a/vp10/common/blockd.h b/vp10/common/blockd.h
index 30bf1035265805b793321d921d2f92a23084542a..52c77cd4f8ceee24a04cd95521655498674b1a4b 100644 (file)
--- a/vp10/common/blockd.h
+++ b/vp10/common/blockd.h
@@ -14,6 +14,7 @@
 
 #include "./vpx_config.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"
 #include "vpx_scale/yv12config.h"
 

diff --git a/vp10/common/common_data.h b/vp10/common/common_data.h
index f2ce03996017adab27bab9a97e912ab6abbc25a2..37e5751f5553cce072e4047f655026ba0060e1a5 100644 (file)
--- a/vp10/common/common_data.h
+++ b/vp10/common/common_data.h
@@ -13,6 +13,7 @@
 
 #include "vp10/common/enums.h"
 #include "vpx/vpx_integer.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/common/loopfilter.c b/vp10/common/loopfilter.c
index f1083741c0a37c656ea03a67853e6439da1fee56..1b1f67dc335f08a16e8ff8b7e56d1ede3f55098e 100644 (file)
--- a/vp10/common/loopfilter.c
+++ b/vp10/common/loopfilter.c
@@ -13,6 +13,7 @@
 #include "vp10/common/loopfilter.h"
 #include "vp10/common/onyxc_int.h"
 #include "vp10/common/reconinter.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 

diff --git a/vp10/common/postproc.c b/vp10/common/postproc.c
index d273420aad8551548f1578c35031235539c1edce..a6ea9c0eff0bf148153157a65999381d0ba5ed82 100644 (file)
--- a/vp10/common/postproc.c
+++ b/vp10/common/postproc.c
@@ -16,6 +16,7 @@
 #include "./vpx_scale_rtcd.h"
 #include "./vp10_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/system_state.h"
 #include "vpx_scale/vpx_scale.h"

diff --git a/vp10/common/pred_common.h b/vp10/common/pred_common.h
index 22d2774b2f0942b574b967747f58adbbcb6f4ea7..1b55f538404143eff4244e90d2fe6f7a8b149603 100644 (file)
--- a/vp10/common/pred_common.h
+++ b/vp10/common/pred_common.h
@@ -13,6 +13,7 @@
 
 #include "vp10/common/blockd.h"
 #include "vp10/common/onyxc_int.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp10/common/thread_common.c b/vp10/common/thread_common.c
index e87caabd190c303c1ab6c35923c5d016e5d412cb..bbc6d115de290b55669f84a49e576dfba24c21ca 100644 (file)
--- a/vp10/common/thread_common.c
+++ b/vp10/common/thread_common.c
@@ -9,6 +9,7 @@
  */
 
 #include "./vpx_config.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp10/common/entropymode.h"
 #include "vp10/common/thread_common.h"

diff --git a/vp10/common/tile_common.c b/vp10/common/tile_common.c
index f830e60b55d18306514a0cdc417919ba3ab43c17..4d92b4c6bf3a8779e4b00eaa13922252ee83505a 100644 (file)
--- a/vp10/common/tile_common.c
+++ b/vp10/common/tile_common.c
@@ -9,8 +9,8 @@
  */
 
 #include "vp10/common/tile_common.h"
-
 #include "vp10/common/onyxc_int.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 #define MIN_TILE_WIDTH_B64 4
 #define MAX_TILE_WIDTH_B64 64

diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index b17fa1ed88105dd3e60ed57ec8a98d7733488dee..1efede2b9a977a8dd3f803d306a6b1bf0c6622ee 100644 (file)
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -17,6 +17,7 @@
 
 #include "vpx_dsp/bitreader_buffer.h"
 #include "vpx_dsp/bitreader.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/mem_ops.h"

diff --git a/vp10/decoder/decodemv.c b/vp10/decoder/decodemv.c
index cf331eefe31c325b87a2096acad6c054592a4ec8..681e02f39843b4220fcef520b868839378d7419c 100644 (file)
--- a/vp10/decoder/decodemv.c
+++ b/vp10/decoder/decodemv.c
@@ -22,6 +22,8 @@
 #include "vp10/decoder/decodemv.h"
 #include "vp10/decoder/decodeframe.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
+
 static PREDICTION_MODE read_intra_mode(vpx_reader *r, const vpx_prob *p) {
   return (PREDICTION_MODE)vpx_read_tree(r, vp10_intra_mode_tree, p);
 }

diff --git a/vp10/encoder/aq_complexity.c b/vp10/encoder/aq_complexity.c
index 7ba879df580b001806abce05c8de9b17b6a88be1..0de044cf9789573167a7f69547c0a8b9301138b1 100644 (file)
--- a/vp10/encoder/aq_complexity.c
+++ b/vp10/encoder/aq_complexity.c
@@ -16,6 +16,7 @@
 #include "vp10/encoder/encodeframe.h"
 #include "vp10/common/seg_common.h"
 #include "vp10/encoder/segmentation.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/system_state.h"
 
 #define AQ_C_SEGMENTS  5

diff --git a/vp10/encoder/aq_cyclicrefresh.c b/vp10/encoder/aq_cyclicrefresh.c
index a45b230d889cb43c24aecef1a17bf3c4b19da723..660670ccea69fc408193e61eea61b56984b72061 100644 (file)
--- a/vp10/encoder/aq_cyclicrefresh.c
+++ b/vp10/encoder/aq_cyclicrefresh.c
@@ -15,6 +15,7 @@
 #include "vp10/encoder/aq_cyclicrefresh.h"
 #include "vp10/encoder/ratectrl.h"
 #include "vp10/encoder/segmentation.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/system_state.h"
 
 struct CYCLIC_REFRESH {

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index cc62b6fa9d31afefdede0ad38a47cc215a4f2a32..4ce353159b9fc166d4cd2ec143bc9d3dc2777ddf 100644 (file)
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -14,6 +14,7 @@
 
 #include "vpx/vpx_encoder.h"
 #include "vpx_dsp/bitwriter_buffer.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem_ops.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp10/encoder/denoiser.c b/vp10/encoder/denoiser.c
index 271113a510ec435a68416ae5b62b9a3f8cad8a9f..e5d8157a4afc16ab29b616f87fb69fefaf463171 100644 (file)
--- a/vp10/encoder/denoiser.c
+++ b/vp10/encoder/denoiser.c
@@ -11,6 +11,7 @@
 #include <assert.h>
 #include <limits.h>
 #include "./vpx_dsp_rtcd.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_scale/yv12config.h"
 #include "vpx/vpx_integer.h"
 #include "vp10/common/reconinter.h"

diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c
index 3423c3a188c4ec6811443149df95847db244b24d..e1df00d928a00431ccc697d2fd4c8a77290eabff 100644 (file)
--- a/vp10/encoder/encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@ -16,6 +16,7 @@
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_config.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp10/encoder/encodemv.c b/vp10/encoder/encodemv.c
index ecd5a383598e6524088ebe4f30a7383300eaf468..f1fe5a78f83cd32c2058fe2bc68fda8418f71c4f 100644 (file)
--- a/vp10/encoder/encodemv.c
+++ b/vp10/encoder/encodemv.c
@@ -16,6 +16,8 @@
 #include "vp10/encoder/cost.h"
 #include "vp10/encoder/encodemv.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
+
 static struct vp10_token mv_joint_encodings[MV_JOINTS];
 static struct vp10_token mv_class_encodings[MV_CLASSES];
 static struct vp10_token mv_fp_encodings[MV_FP_SIZE];

diff --git a/vp10/encoder/encoder.c b/vp10/encoder/encoder.c
index 56ff0acdeae83c634b921bba600ec1600cc74f49..1857a17e0a8549d2df06886b9e03ee1eb8e86078 100644 (file)
--- a/vp10/encoder/encoder.c
+++ b/vp10/encoder/encoder.c
@@ -51,6 +51,7 @@
 #if CONFIG_INTERNAL_STATS
 #include "vpx_dsp/ssim.h"
 #endif
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_dsp/vpx_filter.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp10/encoder/ethread.c b/vp10/encoder/ethread.c
index 671020a7f398df55da156d9a883fc662608f6e63..4f0e7cbc82ce8b488ec03489069e2e084b660bbf 100644 (file)
--- a/vp10/encoder/ethread.c
+++ b/vp10/encoder/ethread.c
@@ -11,6 +11,7 @@
 #include "vp10/encoder/encodeframe.h"
 #include "vp10/encoder/encoder.h"
 #include "vp10/encoder/ethread.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 static void accumulate_rd_opt(ThreadData *td, ThreadData *td_t) {
   int i, j, k, l, m, n;

diff --git a/vp10/encoder/extend.c b/vp10/encoder/extend.c
index ffd992f256f2eb8980fabce802c9d135caecc1f1..4c8ce3b572bc8d78f0bbdfa05624d3a03a9c04e4 100644 (file)
--- a/vp10/encoder/extend.c
+++ b/vp10/encoder/extend.c
@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 

diff --git a/vp10/encoder/firstpass.c b/vp10/encoder/firstpass.c
index f61b5d5137ee3937df449336f4c6eca6d1b5d382..63c42cd0956bd48e172cc7d90fd0596e7a314c1d 100644 (file)
--- a/vp10/encoder/firstpass.c
+++ b/vp10/encoder/firstpass.c
@@ -15,6 +15,7 @@
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_scale_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp10/encoder/mbgraph.c b/vp10/encoder/mbgraph.c
index 02ba0e57ecff1f0862b88ca7655ff92e0efc1a8e..1ba6e10fdcbaf71071f86e75bbde26701560f0a5 100644 (file)
--- a/vp10/encoder/mbgraph.c
+++ b/vp10/encoder/mbgraph.c
@@ -13,6 +13,7 @@
 #include "./vp10_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/system_state.h"
 #include "vp10/encoder/segmentation.h"

diff --git a/vp10/encoder/mcomp.c b/vp10/encoder/mcomp.c
index 1cfe4712f3b17a7c032e12c5461112ed7a45e3ad..d6ab00fdccc67ed46a393f1393b3e7e94c64ba0e 100644 (file)
--- a/vp10/encoder/mcomp.c
+++ b/vp10/encoder/mcomp.c
@@ -15,6 +15,7 @@
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 

diff --git a/vp10/encoder/picklpf.c b/vp10/encoder/picklpf.c
index ff0f3878c93600bd5d357d81c33fb4a211f1461c..045e03d1d0d71ce62e57a1ce329c671eb95bee48 100644 (file)
--- a/vp10/encoder/picklpf.c
+++ b/vp10/encoder/picklpf.c
@@ -13,6 +13,7 @@
 
 #include "./vpx_scale_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 

diff --git a/vp10/encoder/ratectrl.c b/vp10/encoder/ratectrl.c
index 702e3238256d1a4bb6cd1bd08b91ab776f1ee7c9..d4c25c04832f1da33e133950e23caecb0ad16474 100644 (file)
--- a/vp10/encoder/ratectrl.c
+++ b/vp10/encoder/ratectrl.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp10/encoder/rd.c b/vp10/encoder/rd.c
index 00e7a949340689279e87759171c1b8607f5d2029..bc5e1ae4fa2211d5723cbeba4aa2cf9254c82736 100644 (file)
--- a/vp10/encoder/rd.c
+++ b/vp10/encoder/rd.c
@@ -14,6 +14,7 @@
 
 #include "./vp10_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/bitops.h"
 #include "vpx_ports/mem.h"

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 90a7aa3f5030278d0aa292fd997da4e80c0dffe6..24d359ec4a65cb787ce73efca0beb02365f32cbf 100644 (file)
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -14,6 +14,7 @@
 #include "./vp10_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp10/encoder/speed_features.c b/vp10/encoder/speed_features.c
index 9d7ad80b2d838deaf1f125ece3da274b905f6b68..156c4eac244fb7a6f1654f7e80810992b8fa26fb 100644 (file)
--- a/vp10/encoder/speed_features.c
+++ b/vp10/encoder/speed_features.c
@@ -14,6 +14,7 @@
 #include "vp10/encoder/speed_features.h"
 #include "vp10/encoder/rdopt.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 
 // Intra only frames, golden frames (except alt ref overlays) and
 // alt ref frames tend to be coded at a higher than ambient quality

diff --git a/vp10/encoder/temporal_filter.c b/vp10/encoder/temporal_filter.c
index 8e221db65e5913dece86d38caff4e702229ec4aa..5278d3b7366b694f8cf0899038527ec365434ba5 100644 (file)
--- a/vp10/encoder/temporal_filter.c
+++ b/vp10/encoder/temporal_filter.c
@@ -23,6 +23,7 @@
 #include "vp10/encoder/ratectrl.h"
 #include "vp10/encoder/segmentation.h"
 #include "vp10/encoder/temporal_filter.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.h"

diff --git a/vp10/vp10_dx_iface.c b/vp10/vp10_dx_iface.c
index 0ff64dfbae4408935a4eace70120f8aff5d72f48..c6e18743e0b494445f29fe60e2275b5ec39875b8 100644 (file)
--- a/vp10/vp10_dx_iface.c
+++ b/vp10/vp10_dx_iface.c
@@ -18,6 +18,7 @@
 #include "vpx/vp8dx.h"
 #include "vpx/vpx_decoder.h"
 #include "vpx_dsp/bitreader_buffer.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_util/vpx_thread.h"
 
 #include "vp10/common/alloccommon.h"

diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c
index 676dd544d5efa61ae26fbd144da36479c20eb47a..768c764ceb3d51051f4f68cb88dff7c27ad57233 100644 (file)
--- a/vp8/encoder/mcomp.c
+++ b/vp8/encoder/mcomp.c
@@ -20,6 +20,7 @@
 #include <math.h>
 #include "vp8/common/findnearmv.h"
 #include "vp8/common/common.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 #ifdef VP8_ENTROPY_STATS
 static int mv_ref_ct [31] [4] [2];

diff --git a/vp8/encoder/mr_dissim.c b/vp8/encoder/mr_dissim.c
index 7d05d932436d92a4b73eab6b8189553133b78c6b..886cba2fd5c723d252e8ea18d48d8ddd30eb2eb5 100644 (file)
--- a/vp8/encoder/mr_dissim.c
+++ b/vp8/encoder/mr_dissim.c
@@ -13,6 +13,7 @@
 #include "vpx_config.h"
 #include "onyx_int.h"
 #include "mr_dissim.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "rdopt.h"
 #include "vp8/common/common.h"

diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index c26d29000204a8af26ff29993ba1951eb37dd38a..fef98f3c39dc99212c3ef72cb459f4ae349c48a3 100644 (file)
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -25,6 +25,7 @@
 #include "vpx_dsp/variance.h"
 #include "mcomp.h"
 #include "rdopt.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #if CONFIG_TEMPORAL_DENOISING
 #include "denoising.h"

diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c
index a73e83a1eba0900e72f99ce4196e4c43c5695032..99e51c43d236e3f38c94245d2dfa2b85df625f89 100644 (file)
--- a/vp8/vp8_dx_iface.c
+++ b/vp8/vp8_dx_iface.c
@@ -22,6 +22,7 @@
 #include "common/common.h"
 #include "common/onyxd.h"
 #include "decoder/onyxd_int.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #if CONFIG_ERROR_CONCEALMENT
 #include "decoder/error_concealment.h"

diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index b757c01c6305636a2f82e46b12442d860529a0c8..c8ef3674a2840f0359de985dae9f7e9b8e562772 100644 (file)
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -14,6 +14,7 @@
 
 #include "./vpx_config.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"
 #include "vpx_scale/yv12config.h"
 

diff --git a/vp9/common/vp9_common_data.c b/vp9/common/vp9_common_data.c
index ca7f4ad41d0f377534af96f0dc3796641994ba03..a6dae6a1c876eb504fa80589ba503bdfedc6341d 100644 (file)
--- a/vp9/common/vp9_common_data.c
+++ b/vp9/common/vp9_common_data.c
@@ -9,6 +9,7 @@
  */
 
 #include "vp9/common/vp9_common_data.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 // Log 2 conversion lookup tables for block width and height
 const uint8_t b_width_log2_lookup[BLOCK_SIZES] =

diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c
index 08d55c63394a62c3651ff4f1de731d33424f8320..5e090f31530c217968f7c4ec41f996e7f3587aeb 100644 (file)
--- a/vp9/common/vp9_loopfilter.c
+++ b/vp9/common/vp9_loopfilter.c
@@ -13,6 +13,7 @@
 #include "vp9/common/vp9_loopfilter.h"
 #include "vp9/common/vp9_onyxc_int.h"
 #include "vp9/common/vp9_reconinter.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 

diff --git a/vp9/common/vp9_postproc.c b/vp9/common/vp9_postproc.c
index 6c87ceefd0f81ae399b91634f1e8e3154356724c..b685d813b7d3211437c3bec943a182267ef016e1 100644 (file)
--- a/vp9/common/vp9_postproc.c
+++ b/vp9/common/vp9_postproc.c
@@ -16,6 +16,7 @@
 #include "./vpx_scale_rtcd.h"
 #include "./vp9_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/system_state.h"
 #include "vpx_scale/vpx_scale.h"

diff --git a/vp9/common/vp9_pred_common.h b/vp9/common/vp9_pred_common.h
index d56eacfe7f42379ca68fc9b834bda852c99e43ee..6f7af4a50f94161692cf2590951718d5093f691f 100644 (file)
--- a/vp9/common/vp9_pred_common.h
+++ b/vp9/common/vp9_pred_common.h
@@ -13,6 +13,7 @@
 
 #include "vp9/common/vp9_blockd.h"
 #include "vp9/common/vp9_onyxc_int.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vp9/common/vp9_thread_common.c b/vp9/common/vp9_thread_common.c
index 2e6285a42fe4943c1932ebeb3c3eaa22f62d36d3..8324ceaf178989a74cfedf75b6c86b59a93acb6a 100644 (file)
--- a/vp9/common/vp9_thread_common.c
+++ b/vp9/common/vp9_thread_common.c
@@ -9,6 +9,7 @@
  */
 
 #include "./vpx_config.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vp9/common/vp9_entropymode.h"
 #include "vp9/common/vp9_thread_common.h"

diff --git a/vp9/common/vp9_tile_common.c b/vp9/common/vp9_tile_common.c
index f2764126d7cb1b252181b90053460280d485b9d8..9fcb97c85427018ffac36608c4c1fc637e797b4b 100644 (file)
--- a/vp9/common/vp9_tile_common.c
+++ b/vp9/common/vp9_tile_common.c
@@ -9,8 +9,8 @@
  */
 
 #include "vp9/common/vp9_tile_common.h"
-
 #include "vp9/common/vp9_onyxc_int.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 #define MIN_TILE_WIDTH_B64 4
 #define MAX_TILE_WIDTH_B64 64

diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c
index f9f991d772ec7fd1bb6c8ba09d0e289aa76132e1..18b8c7000f56407c05d980fc3df8eedf6e6679ed 100644 (file)
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -17,6 +17,7 @@
 
 #include "vpx_dsp/bitreader_buffer.h"
 #include "vpx_dsp/bitreader.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/mem_ops.h"

diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c
index 9db88a4edfe422496eca52cc0642bb5cfdfb87bf..d3ca7b3feae1a5efc26ec122639192028a3bce48 100644 (file)
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -22,6 +22,8 @@
 #include "vp9/decoder/vp9_decodemv.h"
 #include "vp9/decoder/vp9_decodeframe.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
+
 static PREDICTION_MODE read_intra_mode(vpx_reader *r, const vpx_prob *p) {
   return (PREDICTION_MODE)vpx_read_tree(r, vp9_intra_mode_tree, p);
 }

diff --git a/vp9/encoder/vp9_aq_complexity.c b/vp9/encoder/vp9_aq_complexity.c
index 93ea270df8a792c9e4bac1f4c2a8ea2b59fa4310..30ec19112e626544eac5d8e9b9932e89907fe6d4 100644 (file)
--- a/vp9/encoder/vp9_aq_complexity.c
+++ b/vp9/encoder/vp9_aq_complexity.c
@@ -10,6 +10,7 @@
 
 #include <limits.h>
 #include <math.h>
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/system_state.h"
 
 #include "vp9/encoder/vp9_aq_complexity.h"

diff --git a/vp9/encoder/vp9_aq_cyclicrefresh.c b/vp9/encoder/vp9_aq_cyclicrefresh.c
index 813c339823c3633faf8dd50c128e10568901e4aa..c3ac7f546bcfc09812d0485177280832b56a6fb4 100644 (file)
--- a/vp9/encoder/vp9_aq_cyclicrefresh.c
+++ b/vp9/encoder/vp9_aq_cyclicrefresh.c
@@ -11,6 +11,7 @@
 #include <limits.h>
 #include <math.h>
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/system_state.h"
 
 #include "vp9/encoder/vp9_aq_cyclicrefresh.h"

diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index 502fcd594d2d603abbd75dee91e7c09337590368..71715f0a0a8eb5d53c6646f132ee1cd15327b58f 100644 (file)
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -14,6 +14,7 @@
 
 #include "vpx/vpx_encoder.h"
 #include "vpx_dsp/bitwriter_buffer.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem_ops.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp9/encoder/vp9_denoiser.c b/vp9/encoder/vp9_denoiser.c
index bf6c533ce2d5fb88ddcb3db91578285ea2596444..39f210cf2b579cbfaf657380e49336eaa8c6c470 100644 (file)
--- a/vp9/encoder/vp9_denoiser.c
+++ b/vp9/encoder/vp9_denoiser.c
@@ -11,6 +11,7 @@
 #include <assert.h>
 #include <limits.h>
 #include "./vpx_dsp_rtcd.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_scale/yv12config.h"
 #include "vpx/vpx_integer.h"
 #include "vp9/common/vp9_reconinter.h"

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index d02d48c8eb4fac97bea69e49a50da10261d8c72c..4a4301e8549317e8633c4370c71d2dfdd8c3fd94 100644 (file)
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -16,6 +16,7 @@
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_config.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp9/encoder/vp9_encodemv.c b/vp9/encoder/vp9_encodemv.c
index a4dee7306e5f1aff6e85aaba28ba6d5ff7dfa76a..e719663436de41d9295cdf311c3f63a451f32e1d 100644 (file)
--- a/vp9/encoder/vp9_encodemv.c
+++ b/vp9/encoder/vp9_encodemv.c
@@ -16,6 +16,8 @@
 #include "vp9/encoder/vp9_cost.h"
 #include "vp9/encoder/vp9_encodemv.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
+
 static struct vp9_token mv_joint_encodings[MV_JOINTS];
 static struct vp9_token mv_class_encodings[MV_CLASSES];
 static struct vp9_token mv_fp_encodings[MV_FP_SIZE];

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 02cafe5cbd29958c263990757be701258f9251a6..fac78318447169fe6571706f50e1dc8ebb2c539c 100644 (file)
--- a/vp9/encoder/vp9_encoder.c
+++ b/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_dsp/vpx_dsp_common.h"
 #include "vpx_dsp/vpx_filter.h"
 #if CONFIG_INTERNAL_STATS
 #include "vpx_dsp/ssim.h"

diff --git a/vp9/encoder/vp9_ethread.c b/vp9/encoder/vp9_ethread.c
index adb3fd8e87a2f188a281d22ad43b290b30a33227..69ed1325cffbd36894e5105901a944acb4c8a638 100644 (file)
--- a/vp9/encoder/vp9_ethread.c
+++ b/vp9/encoder/vp9_ethread.c
@@ -11,6 +11,7 @@
 #include "vp9/encoder/vp9_encodeframe.h"
 #include "vp9/encoder/vp9_encoder.h"
 #include "vp9/encoder/vp9_ethread.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 static void accumulate_rd_opt(ThreadData *td, ThreadData *td_t) {
   int i, j, k, l, m, n;

diff --git a/vp9/encoder/vp9_extend.c b/vp9/encoder/vp9_extend.c
index 4a47f877483a0ab384a36f50705aaba93e3df337..92585b82a47b699f0b471ff36bb2b04fc4973c2f 100644 (file)
--- a/vp9/encoder/vp9_extend.c
+++ b/vp9/encoder/vp9_extend.c
@@ -8,6 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 

diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index e409a3ae4f77ae270a5ee0a068510b27f7ef7dd0..51cc40302839a43f063d8d5da23a756d1ba936b8 100644 (file)
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -15,6 +15,7 @@
 #include "./vpx_dsp_rtcd.h"
 #include "./vpx_scale_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp9/encoder/vp9_mbgraph.c b/vp9/encoder/vp9_mbgraph.c
index 0ac1bc2defa3b63afaac01e164dbfe785b70480a..41b6d19549763a239ebce0232fff4568b4734996 100644 (file)
--- a/vp9/encoder/vp9_mbgraph.c
+++ b/vp9/encoder/vp9_mbgraph.c
@@ -13,6 +13,7 @@
 #include "./vp9_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/system_state.h"
 #include "vp9/encoder/vp9_segmentation.h"

diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c
index b8423aa67f09905831e058ec1102178657a56a37..be8f57f7d925bf3325fdf2cddbe6d03cb3a32c5b 100644 (file)
--- a/vp9/encoder/vp9_mcomp.c
+++ b/vp9/encoder/vp9_mcomp.c
@@ -15,6 +15,7 @@
 #include "./vpx_config.h"
 #include "./vpx_dsp_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index a065f5944581d606d82aefedafec367dcaae64df..1839bfeb15323d36cfb6d06b8189374635b45033 100644 (file)
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -16,6 +16,7 @@
 #include "./vp9_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index fdc55f78b79b538a6945f3477ef71400b5f30ddc..e742a9feeaa594705f0d10d698f6d0efd19c3aad 100644 (file)
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp9/encoder/vp9_rd.c b/vp9/encoder/vp9_rd.c
index fdee1536fc7798ddceef265e731c9887fbd53005..b085c7a0cdd64a3adabfe8de516570f5bd0b388b 100644 (file)
--- a/vp9/encoder/vp9_rd.c
+++ b/vp9/encoder/vp9_rd.c
@@ -14,6 +14,7 @@
 
 #include "./vp9_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/bitops.h"
 #include "vpx_ports/mem.h"

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 038d1e11e301bc91a0e4f993b6c202ee73b4ff17..009ef78da3de3ec82ccbf88f3f65773762ab0cbb 100644 (file)
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -14,6 +14,7 @@
 #include "./vp9_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
 
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/system_state.h"

diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index 8530f9809a71544f9a5f89304d44633b5e9ee3ed..86d5d8591527a7c9bd07eef7f62ada8125fb178a 100644 (file)
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -13,6 +13,7 @@
 #include "vp9/encoder/vp9_encoder.h"
 #include "vp9/encoder/vp9_speed_features.h"
 #include "vp9/encoder/vp9_rdopt.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 
 // Intra only frames, golden frames (except alt ref overlays) and

diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c
index b619840b0fdb8f628ac2b289a4909fa7c58b7d28..a6c5373b3881ec06e6c899006ca9b050ba26418f 100644 (file)
--- a/vp9/encoder/vp9_svc_layercontext.c
+++ b/vp9/encoder/vp9_svc_layercontext.c
@@ -13,6 +13,7 @@
 #include "vp9/encoder/vp9_encoder.h"
 #include "vp9/encoder/vp9_svc_layercontext.h"
 #include "vp9/encoder/vp9_extend.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 
 #define SMALL_FRAME_FB_IDX 7
 #define SMALL_FRAME_WIDTH  32

diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c
index 3f2c8eba796e86103f529048584e3f7d9e315f38..6ef3b49d450f335e12592e010dd69adc00013c8c 100644 (file)
--- a/vp9/encoder/vp9_temporal_filter.c
+++ b/vp9/encoder/vp9_temporal_filter.c
@@ -23,6 +23,7 @@
 #include "vp9/encoder/vp9_ratectrl.h"
 #include "vp9/encoder/vp9_segmentation.h"
 #include "vp9/encoder/vp9_temporal_filter.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_ports/mem.h"
 #include "vpx_ports/vpx_timer.h"

diff --git a/vpx_dsp/bitreader.c b/vpx_dsp/bitreader.c
index ba87022c03ead19fc831e0766d531e1b09554ea3..6ad806ac3f5b1a7bd3481acc9dd4e1d6b59c7f53 100644 (file)
--- a/vpx_dsp/bitreader.c
+++ b/vpx_dsp/bitreader.c
@@ -13,6 +13,7 @@
 
 #include "vpx_dsp/bitreader.h"
 #include "vpx_dsp/prob.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_util/endian_inl.h"

diff --git a/vpx_dsp/vpx_dsp_common.h b/vpx_dsp/vpx_dsp_common.h
index a83339efe394b4ec4a3104cbd8824c0034d7df42..a9e180e7934038c20b576feb541e9b9f16d2a9b9 100644 (file)
--- a/vpx_dsp/vpx_dsp_common.h
+++ b/vpx_dsp/vpx_dsp_common.h
@@ -13,6 +13,7 @@
 
 #include "./vpx_config.h"
 #include "vpx/vpx_integer.h"
+#include "vpx_dsp/vpx_dsp_common.h"
 #include "vpx_ports/mem.h"
 
 #ifdef __cplusplus