Commit c5f11912 authored by Johann's avatar Johann

Include vpx_dsp_common.h when using VPXMIN/MAX

Change-Id: I2e387a06484a06301f3cd6600c4ba2f4335b61ee
parent 9a9b1cf7
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "vp10/common/enums.h" #include "vp10/common/enums.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vpx_dsp/vpx_dsp_common.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "vp10/common/loopfilter.h" #include "vp10/common/loopfilter.h"
#include "vp10/common/onyxc_int.h" #include "vp10/common/onyxc_int.h"
#include "vp10/common/reconinter.h" #include "vp10/common/reconinter.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "./vpx_scale_rtcd.h" #include "./vpx_scale_rtcd.h"
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
#include "vpx_scale/vpx_scale.h" #include "vpx_scale/vpx_scale.h"
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "vp10/common/blockd.h" #include "vp10/common/blockd.h"
#include "vp10/common/onyxc_int.h" #include "vp10/common/onyxc_int.h"
#include "vpx_dsp/vpx_dsp_common.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*/ */
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vp10/common/entropymode.h" #include "vp10/common/entropymode.h"
#include "vp10/common/thread_common.h" #include "vp10/common/thread_common.h"
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#include "vp10/common/tile_common.h" #include "vp10/common/tile_common.h"
#include "vp10/common/onyxc_int.h" #include "vp10/common/onyxc_int.h"
#include "vpx_dsp/vpx_dsp_common.h"
#define MIN_TILE_WIDTH_B64 4 #define MIN_TILE_WIDTH_B64 4
#define MAX_TILE_WIDTH_B64 64 #define MAX_TILE_WIDTH_B64 64
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "vpx_dsp/bitreader_buffer.h" #include "vpx_dsp/bitreader_buffer.h"
#include "vpx_dsp/bitreader.h" #include "vpx_dsp/bitreader.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/mem_ops.h" #include "vpx_ports/mem_ops.h"
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include "vp10/decoder/decodemv.h" #include "vp10/decoder/decodemv.h"
#include "vp10/decoder/decodeframe.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) { 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); return (PREDICTION_MODE)vpx_read_tree(r, vp10_intra_mode_tree, p);
} }
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "vp10/encoder/encodeframe.h" #include "vp10/encoder/encodeframe.h"
#include "vp10/common/seg_common.h" #include "vp10/common/seg_common.h"
#include "vp10/encoder/segmentation.h" #include "vp10/encoder/segmentation.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
#define AQ_C_SEGMENTS 5 #define AQ_C_SEGMENTS 5
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "vp10/encoder/aq_cyclicrefresh.h" #include "vp10/encoder/aq_cyclicrefresh.h"
#include "vp10/encoder/ratectrl.h" #include "vp10/encoder/ratectrl.h"
#include "vp10/encoder/segmentation.h" #include "vp10/encoder/segmentation.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
struct CYCLIC_REFRESH { struct CYCLIC_REFRESH {
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "vpx/vpx_encoder.h" #include "vpx/vpx_encoder.h"
#include "vpx_dsp/bitwriter_buffer.h" #include "vpx_dsp/bitwriter_buffer.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem_ops.h" #include "vpx_ports/mem_ops.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vp10/common/reconinter.h" #include "vp10/common/reconinter.h"
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#include "vp10/encoder/cost.h" #include "vp10/encoder/cost.h"
#include "vp10/encoder/encodemv.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_joint_encodings[MV_JOINTS];
static struct vp10_token mv_class_encodings[MV_CLASSES]; static struct vp10_token mv_class_encodings[MV_CLASSES];
static struct vp10_token mv_fp_encodings[MV_FP_SIZE]; static struct vp10_token mv_fp_encodings[MV_FP_SIZE];
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#if CONFIG_INTERNAL_STATS #if CONFIG_INTERNAL_STATS
#include "vpx_dsp/ssim.h" #include "vpx_dsp/ssim.h"
#endif #endif
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_dsp/vpx_filter.h" #include "vpx_dsp/vpx_filter.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "vp10/encoder/encodeframe.h" #include "vp10/encoder/encodeframe.h"
#include "vp10/encoder/encoder.h" #include "vp10/encoder/encoder.h"
#include "vp10/encoder/ethread.h" #include "vp10/encoder/ethread.h"
#include "vpx_dsp/vpx_dsp_common.h"
static void accumulate_rd_opt(ThreadData *td, ThreadData *td_t) { static void accumulate_rd_opt(ThreadData *td, ThreadData *td_t) {
int i, j, k, l, m, n; int i, j, k, l, m, n;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * 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_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "./vpx_scale_rtcd.h" #include "./vpx_scale_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
#include "vp10/encoder/segmentation.h" #include "vp10/encoder/segmentation.h"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "./vpx_scale_rtcd.h" #include "./vpx_scale_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/bitops.h" #include "vpx_ports/bitops.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "./vp10_rtcd.h" #include "./vp10_rtcd.h"
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "vp10/encoder/speed_features.h" #include "vp10/encoder/speed_features.h"
#include "vp10/encoder/rdopt.h" #include "vp10/encoder/rdopt.h"
#include "vpx_dsp/vpx_dsp_common.h"
// Intra only frames, golden frames (except alt ref overlays) and // Intra only frames, golden frames (except alt ref overlays) and
// alt ref frames tend to be coded at a higher than ambient quality // alt ref frames tend to be coded at a higher than ambient quality
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "vp10/encoder/ratectrl.h" #include "vp10/encoder/ratectrl.h"
#include "vp10/encoder/segmentation.h" #include "vp10/encoder/segmentation.h"
#include "vp10/encoder/temporal_filter.h" #include "vp10/encoder/temporal_filter.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "vpx/vp8dx.h" #include "vpx/vp8dx.h"
#include "vpx/vpx_decoder.h" #include "vpx/vpx_decoder.h"
#include "vpx_dsp/bitreader_buffer.h" #include "vpx_dsp/bitreader_buffer.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_util/vpx_thread.h" #include "vpx_util/vpx_thread.h"
#include "vp10/common/alloccommon.h" #include "vp10/common/alloccommon.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <math.h> #include <math.h>
#include "vp8/common/findnearmv.h" #include "vp8/common/findnearmv.h"
#include "vp8/common/common.h" #include "vp8/common/common.h"
#include "vpx_dsp/vpx_dsp_common.h"
#ifdef VP8_ENTROPY_STATS #ifdef VP8_ENTROPY_STATS
static int mv_ref_ct [31] [4] [2]; static int mv_ref_ct [31] [4] [2];
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "vpx_config.h" #include "vpx_config.h"
#include "onyx_int.h" #include "onyx_int.h"
#include "mr_dissim.h" #include "mr_dissim.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "rdopt.h" #include "rdopt.h"
#include "vp8/common/common.h" #include "vp8/common/common.h"
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "vpx_dsp/variance.h" #include "vpx_dsp/variance.h"
#include "mcomp.h" #include "mcomp.h"
#include "rdopt.h" #include "rdopt.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#if CONFIG_TEMPORAL_DENOISING #if CONFIG_TEMPORAL_DENOISING
#include "denoising.h" #include "denoising.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "common/common.h" #include "common/common.h"
#include "common/onyxd.h" #include "common/onyxd.h"
#include "decoder/onyxd_int.h" #include "decoder/onyxd_int.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#if CONFIG_ERROR_CONCEALMENT #if CONFIG_ERROR_CONCEALMENT
#include "decoder/error_concealment.h" #include "decoder/error_concealment.h"
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*/ */
#include "vp9/common/vp9_common_data.h" #include "vp9/common/vp9_common_data.h"
#include "vpx_dsp/vpx_dsp_common.h"
// Log 2 conversion lookup tables for block width and height // Log 2 conversion lookup tables for block width and height
const uint8_t b_width_log2_lookup[BLOCK_SIZES] = const uint8_t b_width_log2_lookup[BLOCK_SIZES] =
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "vp9/common/vp9_loopfilter.h" #include "vp9/common/vp9_loopfilter.h"
#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_reconinter.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "./vpx_scale_rtcd.h" #include "./vpx_scale_rtcd.h"
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
#include "vpx_scale/vpx_scale.h" #include "vpx_scale/vpx_scale.h"
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vpx_dsp/vpx_dsp_common.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*/ */
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_entropymode.h"
#include "vp9/common/vp9_thread_common.h" #include "vp9/common/vp9_thread_common.h"
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#include "vp9/common/vp9_tile_common.h" #include "vp9/common/vp9_tile_common.h"
#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vpx_dsp/vpx_dsp_common.h"
#define MIN_TILE_WIDTH_B64 4 #define MIN_TILE_WIDTH_B64 4
#define MAX_TILE_WIDTH_B64 64 #define MAX_TILE_WIDTH_B64 64
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "vpx_dsp/bitreader_buffer.h" #include "vpx_dsp/bitreader_buffer.h"
#include "vpx_dsp/bitreader.h" #include "vpx_dsp/bitreader.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/mem_ops.h" #include "vpx_ports/mem_ops.h"
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include "vp9/decoder/vp9_decodemv.h" #include "vp9/decoder/vp9_decodemv.h"
#include "vp9/decoder/vp9_decodeframe.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) { 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); return (PREDICTION_MODE)vpx_read_tree(r, vp9_intra_mode_tree, p);
} }
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
#include "vp9/encoder/vp9_aq_complexity.h" #include "vp9/encoder/vp9_aq_complexity.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
#include "vp9/encoder/vp9_aq_cyclicrefresh.h" #include "vp9/encoder/vp9_aq_cyclicrefresh.h"
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "vpx/vpx_encoder.h" #include "vpx/vpx_encoder.h"
#include "vpx_dsp/bitwriter_buffer.h" #include "vpx_dsp/bitwriter_buffer.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem_ops.h" #include "vpx_ports/mem_ops.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_reconinter.h"
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "vpx_ports/system_state.h" #include "vpx_ports/system_state.h"
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#include "vp9/encoder/vp9_cost.h" #include "vp9/encoder/vp9_cost.h"
#include "vp9/encoder/vp9_encodemv.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_joint_encodings[MV_JOINTS];
static struct vp9_token mv_class_encodings[MV_CLASSES]; static struct vp9_token mv_class_encodings[MV_CLASSES];
static struct vp9_token mv_fp_encodings[MV_FP_SIZE];