Rename vp8 quantize.c

Move it to vp8_quantize.c and make sure to
use the full path for all vp8 includes of quantize.h

Change-Id: I284651ff681707385f4924ea7db1541905c1624a

diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c
index e2de5eecbc460cc941e2f6799f4d50314c06c9ce..938cc7ecb24edd2c641fe1bc3ca533a03b9a4aeb 100644 (file)
--- a/vp8/encoder/encodeintra.c
+++ b/vp8/encoder/encodeintra.c
@@ -12,7 +12,7 @@
 #include "vpx_config.h"
 #include "vp8_rtcd.h"
 #include "./vpx_dsp_rtcd.h"
-#include "quantize.h"
+#include "vp8/encoder/quantize.h"
 #include "vp8/common/reconintra4x4.h"
 #include "encodemb.h"
 #include "vp8/common/invtrans.h"

diff --git a/vp8/encoder/encodemb.c b/vp8/encoder/encodemb.c
index cf180c12d3fdb73811e1f46c84d52ce9b253f5d4..932a157adaf7428730dc494998450eaa9b6f6e5a 100644 (file)
--- a/vp8/encoder/encodemb.c
+++ b/vp8/encoder/encodemb.c
@@ -14,7 +14,7 @@
 #include "vp8_rtcd.h"
 #include "encodemb.h"
 #include "vp8/common/reconinter.h"
-#include "quantize.h"
+#include "vp8/encoder/quantize.h"
 #include "tokenize.h"
 #include "vp8/common/invtrans.h"
 #include "vpx_mem/vpx_mem.h"

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index d2fb05ab75b72093a285fcfad480f44f1d4425b4..5e05c8c67a1fcd215f1d9e676ae5ca05307974f1 100644 (file)
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -17,7 +17,7 @@
 #include "vp8/common/blockd.h"
 #include "onyx_int.h"
 #include "vp8/common/systemdependent.h"
-#include "quantize.h"
+#include "vp8/encoder/quantize.h"
 #include "vp8/common/alloccommon.h"
 #include "mcomp.h"
 #include "firstpass.h"

diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h
index 6fe8f235b879527cd96f0e2fd493364a7948aeee..8beba27fec6412870e649ea413f81d44c1d0f737 100644 (file)
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -20,7 +20,7 @@
 #include "vp8/common/onyxc_int.h"
 #include "vpx_dsp/variance.h"
 #include "encodemb.h"
-#include "quantize.h"
+#include "vp8/encoder/quantize.h"
 #include "vp8/common/entropy.h"
 #include "vp8/common/threading.h"
 #include "vpx_ports/mem.h"

diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c
index 875b37f68414e4df09ceecb5c4a0b736e203c88d..debd30413063d78add6c1e1b8f6807a9449780fa 100644 (file)
--- a/vp8/encoder/picklpf.c
+++ b/vp8/encoder/picklpf.c
@@ -13,7 +13,7 @@
 #include "./vpx_scale_rtcd.h"
 #include "vp8/common/onyxc_int.h"
 #include "onyx_int.h"
-#include "quantize.h"
+#include "vp8/encoder/quantize.h"
 #include "vpx_mem/vpx_mem.h"
 #include "vpx_scale/vpx_scale.h"
 #include "vp8/common/alloccommon.h"

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index edd6c58ec992d6d379e5ac7b4e5d9bd4abdfb1f3..fdff378bc29e2a7fdd1eaa45068194e33f884200 100644 (file)
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -28,7 +28,7 @@
 #include "vp8/common/findnearmv.h"
 #include "vp8/common/quant_common.h"
 #include "encodemb.h"
-#include "quantize.h"
+#include "vp8/encoder/quantize.h"
 #include "vpx_dsp/variance.h"
 #include "mcomp.h"
 #include "rdopt.h"

diff --git a/vp8/encoder/temporal_filter.c b/vp8/encoder/temporal_filter.c
index ba8b009771097206eef0f2d6475ab72c939eab78..85d26c20f46c87ce3c828fe8ea2a71a95e3c8422 100644 (file)
--- a/vp8/encoder/temporal_filter.c
+++ b/vp8/encoder/temporal_filter.c
@@ -12,7 +12,7 @@
 #include "vp8/common/onyxc_int.h"
 #include "onyx_int.h"
 #include "vp8/common/systemdependent.h"
-#include "quantize.h"
+#include "vp8/encoder/quantize.h"
 #include "vp8/common/alloccommon.h"
 #include "mcomp.h"
 #include "firstpass.h"

diff --git a/vp8/encoder/quantize.c b/vp8/encoder/vp8_quantize.c
similarity index 99%
rename from vp8/encoder/quantize.c
rename to vp8/encoder/vp8_quantize.c
index c5a7bc67039b78c6d11702914d21896f4da3723c..ee922c9d697794ccd4f64d7b6ef60846b68b8850 100644 (file)
--- a/vp8/encoder/quantize.c
+++ b/vp8/encoder/vp8_quantize.c
@@ -13,7 +13,7 @@
 #include "vpx_mem/vpx_mem.h"
 
 #include "onyx_int.h"
-#include "quantize.h"
+#include "vp8/encoder/quantize.h"
 #include "vp8/common/quant_common.h"
 
 void vp8_fast_quantize_b_c(BLOCK *b, BLOCKD *d)

diff --git a/vp8/encoder/x86/quantize_sse2.c b/vp8/encoder/x86/vp8_quantize_sse2.c
similarity index 100%
rename from vp8/encoder/x86/quantize_sse2.c
rename to vp8/encoder/x86/vp8_quantize_sse2.c

diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk
index ea7d472ae82805439907978affc718cc08d2c441..857a631bffab1f22049e451592d2193d076c4788 100644 (file)
--- a/vp8/vp8cx.mk
+++ b/vp8/vp8cx.mk
@@ -60,7 +60,7 @@ VP8_CX_SRCS-yes += encoder/modecosts.c
 VP8_CX_SRCS-yes += encoder/onyx_if.c
 VP8_CX_SRCS-yes += encoder/pickinter.c
 VP8_CX_SRCS-yes += encoder/picklpf.c
-VP8_CX_SRCS-yes += encoder/quantize.c
+VP8_CX_SRCS-yes += encoder/vp8_quantize.c
 VP8_CX_SRCS-yes += encoder/ratectrl.c
 VP8_CX_SRCS-yes += encoder/rdopt.c
 VP8_CX_SRCS-yes += encoder/segmentation.c
@@ -84,7 +84,7 @@ VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm
 VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp8_enc_stubs_mmx.c
 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.asm
 VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/fwalsh_sse2.asm
-VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c
+VP8_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp8_quantize_sse2.c
 VP8_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3.c
 VP8_CX_SRCS-$(HAVE_SSE4_1) += encoder/x86/quantize_sse4.c