From 79a00d71bd3619e9d51aeb4472856026b73c3d1b Mon Sep 17 00:00:00 2001 From: Johann Date: Tue, 18 Aug 2015 11:43:40 -0700 Subject: [PATCH] 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 --- vp8/encoder/encodeintra.c | 2 +- vp8/encoder/encodemb.c | 2 +- vp8/encoder/onyx_if.c | 2 +- vp8/encoder/onyx_int.h | 2 +- vp8/encoder/picklpf.c | 2 +- vp8/encoder/rdopt.c | 2 +- vp8/encoder/temporal_filter.c | 2 +- vp8/encoder/{quantize.c => vp8_quantize.c} | 2 +- vp8/encoder/x86/{quantize_sse2.c => vp8_quantize_sse2.c} | 0 vp8/vp8cx.mk | 4 ++-- 10 files changed, 10 insertions(+), 10 deletions(-) rename vp8/encoder/{quantize.c => vp8_quantize.c} (99%) rename vp8/encoder/x86/{quantize_sse2.c => vp8_quantize_sse2.c} (100%) diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c index e2de5ee..938cc7e 100644 --- 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 cf180c1..932a157 100644 --- 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 d2fb05a..5e05c8c 100644 --- 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 6fe8f23..8beba27 100644 --- 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 875b37f..debd304 100644 --- 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 edd6c58..fdff378 100644 --- 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 ba8b009..85d26c2 100644 --- 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 c5a7bc6..ee922c9 100644 --- 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 ea7d472..857a631 100644 --- 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 -- 2.7.4