shithub: libvpx

--- 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"

--- 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" {

--- 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"

--- 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"

--- 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" {

--- 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"

--- 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

--- 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"

--- 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);

--- 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

--- 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 {

--- 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"

--- 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"

--- 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"

--- 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];

--- 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"

--- 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;

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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

--- 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"

--- 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"

--- 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];

--- 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"

--- 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"

--- 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"

--- 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"

--- 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] =

--- 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"

--- 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"

--- 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" {

--- 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"

--- 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

--- 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"

--- 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);

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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];

--- 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"

--- 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;

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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

--- 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

--- 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"

--- 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"

--- 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