Rename onyxc_int.h to av1_common_int.h.
In libvpx/vp8/common/onyxc_int.h, the purpose of the header is to define
struct VP8Common. In libvpx/vp9/common/vp9_onyxc_int.h and
av1/common/onyxc_int.h, this header file does much more than define
struct VP9Common and struct AV1Common, but I think the file name
"av1_common_int.h" still makes sense. It can be interpreted as the
internal header that defines struct AV1Common or as the internal
header in the av1/common/ directory.
Change-Id: I2ddc703b609ab2534b9e8166ed2f6db2a78371a0
diff --git a/av1/encoder/cnn.c b/av1/encoder/cnn.c
index d4f2e7d..5d8a236 100644
--- a/av1/encoder/cnn.c
+++ b/av1/encoder/cnn.c
@@ -14,7 +14,7 @@
#include "aom_dsp/aom_dsp_common.h"
#include "av1/encoder/cnn.h"
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
#define CLAMPINDEX(a, hi) ((a) < 0 ? 0 : ((a) >= (hi) ? ((hi)-1) : (a)))
diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index f956a07..eecaabb 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -23,7 +23,7 @@
#include "aom_util/debug_util.h"
#endif // CONFIG_MISMATCH_DEBUG
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/reconinter.h"
#include "av1/encoder/encoder.h"
diff --git a/av1/encoder/encodemb.h b/av1/encoder/encodemb.h
index 462131e..02f9d35 100644
--- a/av1/encoder/encodemb.h
+++ b/av1/encoder/encodemb.h
@@ -14,7 +14,7 @@
#include "config/aom_config.h"
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/txb_common.h"
#include "av1/encoder/block.h"
#include "av1/encoder/tokenize.h"
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 14d768d..2a2b0a0 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -20,15 +20,16 @@
#include "aom/aomcx.h"
#include "av1/common/alloccommon.h"
-#include "av1/common/entropymode.h"
-#include "av1/common/thread_common.h"
-#include "av1/common/onyxc_int.h"
-#include "av1/common/resize.h"
-#include "av1/common/timing.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/blockd.h"
+#include "av1/common/entropymode.h"
#include "av1/common/enums.h"
+#include "av1/common/resize.h"
+#include "av1/common/thread_common.h"
+#include "av1/common/timing.h"
#include "av1/encoder/aq_cyclicrefresh.h"
#include "av1/encoder/av1_quantize.h"
+#include "av1/encoder/block.h"
#include "av1/encoder/context_tree.h"
#include "av1/encoder/encodemb.h"
#include "av1/encoder/firstpass.h"
@@ -40,7 +41,6 @@
#include "av1/encoder/speed_features.h"
#include "av1/encoder/svc_layercontext.h"
#include "av1/encoder/tokenize.h"
-#include "av1/encoder/block.h"
#if CONFIG_INTERNAL_STATS
#include "aom_dsp/ssim.h"
diff --git a/av1/encoder/encodetxb.h b/av1/encoder/encodetxb.h
index e8a932d..7122895 100644
--- a/av1/encoder/encodetxb.h
+++ b/av1/encoder/encodetxb.h
@@ -14,8 +14,8 @@
#include "config/aom_config.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/blockd.h"
-#include "av1/common/onyxc_int.h"
#include "av1/common/txb_common.h"
#include "av1/encoder/block.h"
#include "av1/encoder/encoder.h"
diff --git a/av1/encoder/firstpass.h b/av1/encoder/firstpass.h
index 8ca4031..b7f1fd0 100644
--- a/av1/encoder/firstpass.h
+++ b/av1/encoder/firstpass.h
@@ -12,8 +12,8 @@
#ifndef AOM_AV1_ENCODER_FIRSTPASS_H_
#define AOM_AV1_ENCODER_FIRSTPASS_H_
+#include "av1/common/av1_common_int.h"
#include "av1/common/enums.h"
-#include "av1/common/onyxc_int.h"
#include "av1/encoder/lookahead.h"
#include "av1/encoder/ratectrl.h"
diff --git a/av1/encoder/gop_structure.c b/av1/encoder/gop_structure.c
index b8ade1d..1ed71a0 100644
--- a/av1/encoder/gop_structure.c
+++ b/av1/encoder/gop_structure.c
@@ -19,7 +19,7 @@
#include "aom_ports/system_state.h"
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
#include "av1/encoder/encoder.h"
#include "av1/encoder/firstpass.h"
diff --git a/av1/encoder/gop_structure.h b/av1/encoder/gop_structure.h
index 5cfe30d..0c775c7 100644
--- a/av1/encoder/gop_structure.h
+++ b/av1/encoder/gop_structure.h
@@ -12,7 +12,7 @@
#ifndef AOM_AV1_ENCODER_GOP_STRUCTURE_H_
#define AOM_AV1_ENCODER_GOP_STRUCTURE_H_
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
#include "av1/encoder/ratectrl.h"
#ifdef __cplusplus
diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index 59552c8..5397a3b 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -20,9 +20,9 @@
#include "aom_mem/aom_mem.h"
#include "aom_ports/mem.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/common.h"
#include "av1/common/mvref_common.h"
-#include "av1/common/onyxc_int.h"
#include "av1/common/reconinter.h"
#include "av1/encoder/encoder.h"
diff --git a/av1/encoder/pass2_strategy.c b/av1/encoder/pass2_strategy.c
index fe12e1a..24e64bd 100644
--- a/av1/encoder/pass2_strategy.c
+++ b/av1/encoder/pass2_strategy.c
@@ -19,7 +19,7 @@
#include "aom_ports/system_state.h"
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
#include "av1/encoder/encoder.h"
#include "av1/encoder/firstpass.h"
diff --git a/av1/encoder/pickcdef.c b/av1/encoder/pickcdef.c
index e3279d5..2c2e2d3 100644
--- a/av1/encoder/pickcdef.c
+++ b/av1/encoder/pickcdef.c
@@ -16,8 +16,8 @@
#include "aom/aom_integer.h"
#include "aom_ports/system_state.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/cdef.h"
-#include "av1/common/onyxc_int.h"
#include "av1/common/reconinter.h"
#include "av1/encoder/encoder.h"
diff --git a/av1/encoder/picklpf.c b/av1/encoder/picklpf.c
index 49637f3..2b4addb 100644
--- a/av1/encoder/picklpf.c
+++ b/av1/encoder/picklpf.c
@@ -19,8 +19,8 @@
#include "aom_mem/aom_mem.h"
#include "aom_ports/mem.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/av1_loopfilter.h"
-#include "av1/common/onyxc_int.h"
#include "av1/common/quant_common.h"
#include "av1/encoder/av1_quantize.h"
diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index 5366422..8e0bb3f 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -23,7 +23,7 @@
#include "aom_mem/aom_mem.h"
#include "aom_ports/mem.h"
#include "aom_ports/system_state.h"
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/quant_common.h"
#include "av1/common/restoration.h"
diff --git a/av1/encoder/ratectrl.h b/av1/encoder/ratectrl.h
index f556c32..c463786 100644
--- a/av1/encoder/ratectrl.h
+++ b/av1/encoder/ratectrl.h
@@ -17,8 +17,8 @@
#include "aom_ports/mem.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/blockd.h"
-#include "av1/common/onyxc_int.h"
#ifdef __cplusplus
extern "C" {
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index a68cd84..116f56a 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -24,6 +24,7 @@
#include "aom_ports/mem.h"
#include "aom_ports/system_state.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/cfl.h"
#include "av1/common/common.h"
#include "av1/common/common_data.h"
@@ -32,7 +33,6 @@
#include "av1/common/idct.h"
#include "av1/common/mvref_common.h"
#include "av1/common/obmc.h"
-#include "av1/common/onyxc_int.h"
#include "av1/common/pred_common.h"
#include "av1/common/quant_common.h"
#include "av1/common/reconinter.h"
diff --git a/av1/encoder/reconinter_enc.c b/av1/encoder/reconinter_enc.c
index 393e7bf..b6fa647 100644
--- a/av1/encoder/reconinter_enc.c
+++ b/av1/encoder/reconinter_enc.c
@@ -20,12 +20,12 @@
#include "aom/aom_integer.h"
#include "aom_dsp/blend.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/blockd.h"
#include "av1/common/mvref_common.h"
+#include "av1/common/obmc.h"
#include "av1/common/reconinter.h"
#include "av1/common/reconintra.h"
-#include "av1/common/onyxc_int.h"
-#include "av1/common/obmc.h"
#include "av1/encoder/reconinter_enc.h"
static INLINE void build_inter_predictors(const AV1_COMMON *cm, MACROBLOCKD *xd,
diff --git a/av1/encoder/reconinter_enc.h b/av1/encoder/reconinter_enc.h
index 49bb893..89b22ca 100644
--- a/av1/encoder/reconinter_enc.h
+++ b/av1/encoder/reconinter_enc.h
@@ -13,12 +13,12 @@
#define AOM_AV1_ENCODER_RECONINTER_ENC_H_
#include "aom/aom_integer.h"
-#include "av1/common/filter.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/blockd.h"
-#include "av1/common/onyxc_int.h"
#include "av1/common/convolve.h"
-#include "av1/common/warped_motion.h"
+#include "av1/common/filter.h"
#include "av1/common/reconinter.h"
+#include "av1/common/warped_motion.h"
#ifdef __cplusplus
extern "C" {
diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index 1b8a901..b8d7814 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -15,23 +15,23 @@
#include "config/aom_config.h"
#include "av1/common/alloccommon.h"
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
+#include "av1/common/odintrin.h"
#include "av1/common/quant_common.h"
#include "av1/common/reconinter.h"
-#include "av1/common/odintrin.h"
#include "av1/encoder/av1_quantize.h"
+#include "av1/encoder/encoder.h"
#include "av1/encoder/extend.h"
#include "av1/encoder/firstpass.h"
#include "av1/encoder/mcomp.h"
-#include "av1/encoder/encoder.h"
#include "av1/encoder/ratectrl.h"
#include "av1/encoder/reconinter_enc.h"
#include "av1/encoder/segmentation.h"
#include "av1/encoder/temporal_filter.h"
#include "aom_dsp/aom_dsp_common.h"
#include "aom_mem/aom_mem.h"
-#include "aom_ports/mem.h"
#include "aom_ports/aom_timer.h"
+#include "aom_ports/mem.h"
#include "aom_ports/system_state.h"
#include "aom_scale/aom_scale.h"
diff --git a/av1/encoder/tpl_model.c b/av1/encoder/tpl_model.c
index f90fe27..15e80b7 100644
--- a/av1/encoder/tpl_model.c
+++ b/av1/encoder/tpl_model.c
@@ -19,9 +19,9 @@
#include "aom/aom_codec.h"
#include "aom_ports/system_state.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/enums.h"
#include "av1/common/idct.h"
-#include "av1/common/onyxc_int.h"
#include "av1/common/reconintra.h"
#include "av1/encoder/encoder.h"
diff --git a/av1/encoder/x86/encodetxb_avx2.c b/av1/encoder/x86/encodetxb_avx2.c
index 2621301..30a4129 100644
--- a/av1/encoder/x86/encodetxb_avx2.c
+++ b/av1/encoder/x86/encodetxb_avx2.c
@@ -16,7 +16,7 @@
#include "aom/aom_integer.h"
#include "aom_dsp/x86/mem_sse2.h"
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/txb_common.h"
#include "aom_dsp/x86/synonyms.h"
#include "aom_dsp/x86/synonyms_avx2.h"
diff --git a/av1/encoder/x86/encodetxb_sse2.c b/av1/encoder/x86/encodetxb_sse2.c
index dedb4d0..394befb 100644
--- a/av1/encoder/x86/encodetxb_sse2.c
+++ b/av1/encoder/x86/encodetxb_sse2.c
@@ -14,7 +14,7 @@
#include "aom/aom_integer.h"
#include "aom_dsp/x86/mem_sse2.h"
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/txb_common.h"
static INLINE void load_levels_4x4x5_sse2(const uint8_t *const src,
diff --git a/av1/encoder/x86/encodetxb_sse4.c b/av1/encoder/x86/encodetxb_sse4.c
index 34c9e4f..aeb57f2 100644
--- a/av1/encoder/x86/encodetxb_sse4.c
+++ b/av1/encoder/x86/encodetxb_sse4.c
@@ -14,7 +14,7 @@
#include <smmintrin.h> /* SSE4.1 */
#include "aom/aom_integer.h"
-#include "av1/common/onyxc_int.h"
+#include "av1/common/av1_common_int.h"
#include "av1/common/txb_common.h"
#include "aom_dsp/x86/synonyms.h"
