Remove file base name collisions.
Change-Id: I1bf9002c159563d0e5238b26d1515ef305d416dc
diff --git a/av1/encoder/arm/neon/quantize_neon.c b/av1/encoder/arm/neon/quantize_neon.c
index 5650094..36e7d33 100644
--- a/av1/encoder/arm/neon/quantize_neon.c
+++ b/av1/encoder/arm/neon/quantize_neon.c
@@ -18,8 +18,8 @@
#include "av1/common/quant_common.h"
#include "av1/common/seg_common.h"
+#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/encoder.h"
-#include "av1/encoder/quantize.h"
#include "av1/encoder/rd.h"
void av1_quantize_fp_neon(const int16_t *coeff_ptr, intptr_t count,
diff --git a/av1/encoder/quantize.c b/av1/encoder/av1_quantize.c
similarity index 99%
rename from av1/encoder/quantize.c
rename to av1/encoder/av1_quantize.c
index 96644d3..185460b 100644
--- a/av1/encoder/quantize.c
+++ b/av1/encoder/av1_quantize.c
@@ -20,8 +20,8 @@
#include "av1/common/scan.h"
#include "av1/common/seg_common.h"
+#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/encoder.h"
-#include "av1/encoder/quantize.h"
#include "av1/encoder/rd.h"
#if CONFIG_NEW_QUANT
diff --git a/av1/encoder/quantize.h b/av1/encoder/av1_quantize.h
similarity index 100%
rename from av1/encoder/quantize.h
rename to av1/encoder/av1_quantize.h
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 0934ff9..8e39d57 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -23,9 +23,9 @@
#include "av1/common/reconintra.h"
#include "av1/common/scan.h"
+#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/encodemb.h"
#include "av1/encoder/hybrid_fwd_txfm.h"
-#include "av1/encoder/quantize.h"
#include "av1/encoder/rd.h"
#include "av1/encoder/tokenize.h"
diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index 63b8497..8968cfd 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -26,13 +26,13 @@
#include "aom_dsp/ans.h"
#include "aom_dsp/buf_ans.h"
#endif
+#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/context_tree.h"
#include "av1/encoder/encodemb.h"
#include "av1/encoder/firstpass.h"
#include "av1/encoder/lookahead.h"
#include "av1/encoder/mbgraph.h"
#include "av1/encoder/mcomp.h"
-#include "av1/encoder/quantize.h"
#include "av1/encoder/ratectrl.h"
#include "av1/encoder/rd.h"
#include "av1/encoder/speed_features.h"
diff --git a/av1/encoder/firstpass.c b/av1/encoder/firstpass.c
index 8b80797..683bde6 100644
--- a/av1/encoder/firstpass.c
+++ b/av1/encoder/firstpass.c
@@ -27,6 +27,7 @@
#include "av1/common/entropymv.h"
#include "av1/common/quant_common.h"
#include "av1/common/reconinter.h" // av1_setup_dst_planes()
+#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/aq_variance.h"
#include "av1/encoder/block.h"
#include "av1/encoder/encodeframe.h"
@@ -36,7 +37,6 @@
#include "av1/encoder/extend.h"
#include "av1/encoder/firstpass.h"
#include "av1/encoder/mcomp.h"
-#include "av1/encoder/quantize.h"
#include "av1/encoder/rd.h"
#define OUTPUT_FPF 0
diff --git a/av1/encoder/picklpf.c b/av1/encoder/picklpf.c
index 56ee074..199c20e 100644
--- a/av1/encoder/picklpf.c
+++ b/av1/encoder/picklpf.c
@@ -19,13 +19,13 @@
#include "aom_mem/aom_mem.h"
#include "aom_ports/mem.h"
-#include "av1/common/loopfilter.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"
#include "av1/encoder/encoder.h"
#include "av1/encoder/picklpf.h"
-#include "av1/encoder/quantize.h"
int av1_get_max_filter_level(const AV1_COMP *cpi) {
if (cpi->oxcf.pass == 2) {
diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index f04832c..ab24c90 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -25,10 +25,10 @@
#include "av1/common/quant_common.h"
#include "av1/common/restoration.h"
+#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/encoder.h"
#include "av1/encoder/picklpf.h"
#include "av1/encoder/pickrst.h"
-#include "av1/encoder/quantize.h"
typedef double (*search_restore_type)(const YV12_BUFFER_CONFIG *src,
AV1_COMP *cpi, int filter_level,
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 724912a..c4568a4 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -31,12 +31,12 @@
#include "av1/common/reconintra.h"
#include "av1/common/seg_common.h"
+#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/cost.h"
#include "av1/encoder/encodemb.h"
#include "av1/encoder/encodemv.h"
#include "av1/encoder/encoder.h"
#include "av1/encoder/mcomp.h"
-#include "av1/encoder/quantize.h"
#include "av1/encoder/ratectrl.h"
#include "av1/encoder/rd.h"
#include "av1/encoder/tokenize.h"
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index df26b60..e87e535 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -38,6 +38,7 @@
#endif // CONFIG_WARPED_MOTION
#include "av1/encoder/aq_variance.h"
+#include "av1/encoder/av1_quantize.h"
#include "av1/encoder/cost.h"
#include "av1/encoder/encodemb.h"
#include "av1/encoder/encodemv.h"
@@ -47,7 +48,6 @@
#if CONFIG_PALETTE
#include "av1/encoder/palette.h"
#endif // CONFIG_PALETTE
-#include "av1/encoder/quantize.h"
#include "av1/encoder/ratectrl.h"
#include "av1/encoder/rd.h"
#include "av1/encoder/rdopt.h"
diff --git a/av1/encoder/temporal_filter.c b/av1/encoder/temporal_filter.c
index 1e4c715..53bf22b 100644
--- a/av1/encoder/temporal_filter.c
+++ b/av1/encoder/temporal_filter.c
@@ -17,11 +17,11 @@
#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/extend.h"
#include "av1/encoder/firstpass.h"
#include "av1/encoder/mcomp.h"
#include "av1/encoder/encoder.h"
-#include "av1/encoder/quantize.h"
#include "av1/encoder/ratectrl.h"
#include "av1/encoder/segmentation.h"
#include "av1/encoder/temporal_filter.h"
diff --git a/av1/encoder/x86/quantize_sse2.c b/av1/encoder/x86/av1_quantize_sse2.c
similarity index 100%
rename from av1/encoder/x86/quantize_sse2.c
rename to av1/encoder/x86/av1_quantize_sse2.c
diff --git a/av1/encoder/x86/quantize_ssse3_x86_64.asm b/av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
similarity index 100%
rename from av1/encoder/x86/quantize_ssse3_x86_64.asm
rename to av1/encoder/x86/av1_quantize_ssse3_x86_64.asm
diff --git a/av1/encoder/x86/ssim_opt_x86_64.asm b/av1/encoder/x86/av1_ssim_opt_x86_64.asm
similarity index 100%
rename from av1/encoder/x86/ssim_opt_x86_64.asm
rename to av1/encoder/x86/av1_ssim_opt_x86_64.asm
