From c5f11912ae328a912ef087fdcd074ff07e96d8f9 Mon Sep 17 00:00:00 2001 From: Johann Date: Mon, 31 Aug 2015 14:36:35 -0700 Subject: [PATCH] Include vpx_dsp_common.h when using VPXMIN/MAX Change-Id: I2e387a06484a06301f3cd6600c4ba2f4335b61ee --- vp10/common/blockd.h | 1 + vp10/common/common_data.h | 1 + vp10/common/loopfilter.c | 1 + vp10/common/postproc.c | 1 + vp10/common/pred_common.h | 1 + vp10/common/thread_common.c | 1 + vp10/common/tile_common.c | 2 +- vp10/decoder/decodeframe.c | 1 + vp10/decoder/decodemv.c | 2 ++ vp10/encoder/aq_complexity.c | 1 + vp10/encoder/aq_cyclicrefresh.c | 1 + vp10/encoder/bitstream.c | 1 + vp10/encoder/denoiser.c | 1 + vp10/encoder/encodeframe.c | 1 + vp10/encoder/encodemv.c | 2 ++ vp10/encoder/encoder.c | 1 + vp10/encoder/ethread.c | 1 + vp10/encoder/extend.c | 1 + vp10/encoder/firstpass.c | 1 + vp10/encoder/mbgraph.c | 1 + vp10/encoder/mcomp.c | 1 + vp10/encoder/picklpf.c | 1 + vp10/encoder/ratectrl.c | 1 + vp10/encoder/rd.c | 1 + vp10/encoder/rdopt.c | 1 + vp10/encoder/speed_features.c | 1 + vp10/encoder/temporal_filter.c | 1 + vp10/vp10_dx_iface.c | 1 + vp8/encoder/mcomp.c | 1 + vp8/encoder/mr_dissim.c | 1 + vp8/encoder/pickinter.c | 1 + vp8/vp8_dx_iface.c | 1 + vp9/common/vp9_blockd.h | 1 + vp9/common/vp9_common_data.c | 1 + vp9/common/vp9_loopfilter.c | 1 + vp9/common/vp9_postproc.c | 1 + vp9/common/vp9_pred_common.h | 1 + vp9/common/vp9_thread_common.c | 1 + vp9/common/vp9_tile_common.c | 2 +- vp9/decoder/vp9_decodeframe.c | 1 + vp9/decoder/vp9_decodemv.c | 2 ++ vp9/encoder/vp9_aq_complexity.c | 1 + vp9/encoder/vp9_aq_cyclicrefresh.c | 1 + vp9/encoder/vp9_bitstream.c | 1 + vp9/encoder/vp9_denoiser.c | 1 + vp9/encoder/vp9_encodeframe.c | 1 + vp9/encoder/vp9_encodemv.c | 2 ++ vp9/encoder/vp9_encoder.c | 1 + vp9/encoder/vp9_ethread.c | 1 + vp9/encoder/vp9_extend.c | 1 + vp9/encoder/vp9_firstpass.c | 1 + vp9/encoder/vp9_mbgraph.c | 1 + vp9/encoder/vp9_mcomp.c | 1 + vp9/encoder/vp9_pickmode.c | 1 + vp9/encoder/vp9_ratectrl.c | 1 + vp9/encoder/vp9_rd.c | 1 + vp9/encoder/vp9_rdopt.c | 1 + vp9/encoder/vp9_speed_features.c | 1 + vp9/encoder/vp9_svc_layercontext.c | 1 + vp9/encoder/vp9_temporal_filter.c | 1 + vpx_dsp/bitreader.c | 1 + vpx_dsp/vpx_dsp_common.h | 1 + 62 files changed, 66 insertions(+), 2 deletions(-) diff --git a/vp10/common/blockd.h b/vp10/common/blockd.h index 30bf103..52c77cd 100644 --- 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 f2ce039..37e5751 100644 --- 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 f108374..1b1f67d 100644 --- 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 d273420..a6ea9c0 100644 --- 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 22d2774..1b55f53 100644 --- 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 e87caab..bbc6d11 100644 --- 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 f830e60..4d92b4c 100644 --- 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 b17fa1e..1efede2 100644 --- 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 cf331ee..681e02f 100644 --- 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 7ba879d..0de044c 100644 --- 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 a45b230..660670c 100644 --- 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 cc62b6f..4ce3531 100644 --- 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 271113a..e5d8157 100644 --- a/vp10/encoder/denoiser.c +++ b/vp10/encoder/denoiser.c @@ -11,6 +11,7 @@ #include #include #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 3423c3a..e1df00d 100644 --- 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 ecd5a38..f1fe5a7 100644 --- 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 56ff0ac..1857a17 100644 --- 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 671020a..4f0e7cb 100644 --- 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 ffd992f..4c8ce3b 100644 --- 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 f61b5d5..63c42cd 100644 --- 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 02ba0e5..1ba6e10 100644 --- 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 1cfe471..d6ab00f 100644 --- 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 ff0f387..045e03d 100644 --- 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 702e323..d4c25c0 100644 --- a/vp10/encoder/ratectrl.c +++ b/vp10/encoder/ratectrl.c @@ -15,6 +15,7 @@ #include #include +#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 00e7a94..bc5e1ae 100644 --- 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 90a7aa3..24d359e 100644 --- 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 9d7ad80..156c4ea 100644 --- 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 8e221db..5278d3b 100644 --- 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 0ff64df..c6e1874 100644 --- 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 676dd54..768c764 100644 --- a/vp8/encoder/mcomp.c +++ b/vp8/encoder/mcomp.c @@ -20,6 +20,7 @@ #include #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 7d05d93..886cba2 100644 --- 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 c26d290..fef98f3 100644 --- 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 a73e83a..99e51c4 100644 --- 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 b757c01..c8ef367 100644 --- 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 ca7f4ad..a6dae6a 100644 --- 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 08d55c6..5e090f3 100644 --- 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 6c87cee..b685d81 100644 --- 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 d56eacf..6f7af4a 100644 --- 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 2e6285a..8324cea 100644 --- 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 f276412..9fcb97c 100644 --- 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 f9f991d..18b8c70 100644 --- 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 9db88a4..d3ca7b3 100644 --- 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 93ea270..30ec191 100644 --- a/vp9/encoder/vp9_aq_complexity.c +++ b/vp9/encoder/vp9_aq_complexity.c @@ -10,6 +10,7 @@ #include #include +#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 813c339..c3ac7f5 100644 --- a/vp9/encoder/vp9_aq_cyclicrefresh.c +++ b/vp9/encoder/vp9_aq_cyclicrefresh.c @@ -11,6 +11,7 @@ #include #include +#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 502fcd5..71715f0 100644 --- 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 bf6c533..39f210c 100644 --- a/vp9/encoder/vp9_denoiser.c +++ b/vp9/encoder/vp9_denoiser.c @@ -11,6 +11,7 @@ #include #include #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 d02d48c..4a4301e 100644 --- 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 a4dee73..e719663 100644 --- 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 02cafe5..fac7831 100644 --- 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 adb3fd8..69ed132 100644 --- 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 4a47f87..92585b8 100644 --- 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 e409a3a..51cc403 100644 --- 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 0ac1bc2..41b6d19 100644 --- 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 b8423aa..be8f57f 100644 --- 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 a065f59..1839bfe 100644 --- 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 fdc55f7..e742a9f 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -15,6 +15,7 @@ #include #include +#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 fdee153..b085c7a 100644 --- 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 038d1e1..009ef78 100644 --- 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 8530f98..86d5d85 100644 --- 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 b619840..a6c5373 100644 --- 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 3f2c8eb..6ef3b49 100644 --- 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 ba87022..6ad806a 100644 --- 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 a83339e..a9e180e 100644 --- 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 -- 2.7.4