From 1009f76566524e88a322a8373ccc848128f8c201 Mon Sep 17 00:00:00 2001 From: Johann Date: Mon, 3 Dec 2012 14:19:49 -0800 Subject: [PATCH] Use 'vpx_scale' consistently Change-Id: I178352813d2b8702d081caf405de9dbad9af2cc3 --- vp8/common/postproc.c | 2 +- vp8/decoder/decodframe.c | 2 +- vp8/decoder/onyxd_if.c | 2 +- vp8/encoder/firstpass.c | 2 +- vp8/encoder/onyx_if.c | 2 +- vp8/encoder/picklpf.c | 2 +- vp8/encoder/temporal_filter.c | 2 +- vp9/common/vp9_postproc.c | 2 +- vp9/decoder/vp9_decodframe.c | 2 +- vp9/decoder/vp9_onyxd_if.c | 2 +- vp9/encoder/vp9_firstpass.c | 2 +- vp9/encoder/vp9_onyx_if.c | 2 +- vp9/encoder/vp9_picklpf.c | 2 +- vp9/encoder/vp9_temporal_filter.c | 2 +- vpx_scale/generic/gen_scalers.c | 2 +- vpx_scale/generic/{vpxscale.c => vpx_scale.c} | 0 vpx_scale/generic/yv12extend.c | 2 +- vpx_scale/{vpxscale.h => vpx_scale.h} | 0 vpx_scale/vpx_scale.mk | 4 ++-- vpx_scale/win32/scaleopt.c | 2 +- 20 files changed, 19 insertions(+), 19 deletions(-) rename vpx_scale/generic/{vpxscale.c => vpx_scale.c} (100%) rename vpx_scale/{vpxscale.h => vpx_scale.h} (100%) diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c index c6442c9..fd313b6 100644 --- a/vp8/common/postproc.c +++ b/vp8/common/postproc.c @@ -15,7 +15,7 @@ #include "vpx_scale/yv12config.h" #include "postproc.h" #include "common.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "systemdependent.h" #include diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index a22f372..4632118 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -21,7 +21,7 @@ #include "vp8/common/alloccommon.h" #include "vp8/common/entropymode.h" #include "vp8/common/quant_common.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp8/common/setupintrarecon.h" #include "decodemv.h" diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index 459e34e..24fc878 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -26,7 +26,7 @@ #include "vp8/common/quant_common.h" #include "./vpx_scale_rtcd.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp8/common/systemdependent.h" #include "vpx_ports/vpx_timer.h" #include "detokenize.h" diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index e5306a4..370e822 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -21,7 +21,7 @@ #include "vp8/common/systemdependent.h" #include "mcomp.h" #include "firstpass.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "encodemb.h" #include "vp8/common/extend.h" #include "vpx_mem/vpx_mem.h" diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index e7d2270..575033c 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -20,7 +20,7 @@ #include "mcomp.h" #include "firstpass.h" #include "psnr.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp8/common/extend.h" #include "ratectrl.h" #include "vp8/common/quant_common.h" diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c index 8114ec3..841e1e4 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c @@ -14,7 +14,7 @@ #include "onyx_int.h" #include "quantize.h" #include "vpx_mem/vpx_mem.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp8/common/alloccommon.h" #include "vp8/common/loopfilter.h" #if ARCH_ARM diff --git a/vp8/encoder/temporal_filter.c b/vp8/encoder/temporal_filter.c index b83ae89..7e3af71 100644 --- a/vp8/encoder/temporal_filter.c +++ b/vp8/encoder/temporal_filter.c @@ -17,7 +17,7 @@ #include "mcomp.h" #include "firstpass.h" #include "psnr.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp8/common/extend.h" #include "ratectrl.h" #include "vp8/common/quant_common.h" diff --git a/vp9/common/vp9_postproc.c b/vp9/common/vp9_postproc.c index f00edf0..8206302 100644 --- a/vp9/common/vp9_postproc.c +++ b/vp9/common/vp9_postproc.c @@ -13,7 +13,7 @@ #include "vpx_scale/yv12config.h" #include "vp9/common/vp9_postproc.h" #include "vp9/common/vp9_textblit.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp9/common/vp9_systemdependent.h" #include "./vp9_rtcd.h" #include "./vpx_scale_rtcd.h" diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index f95a83a..76349ad 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -20,7 +20,7 @@ #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_quant_common.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp9/common/vp9_setupintrarecon.h" #include "vp9/decoder/vp9_decodemv.h" diff --git a/vp9/decoder/vp9_onyxd_if.c b/vp9/decoder/vp9_onyxd_if.c index bad43ca..9c0b581 100644 --- a/vp9/decoder/vp9_onyxd_if.c +++ b/vp9/decoder/vp9_onyxd_if.c @@ -23,7 +23,7 @@ #include #include "vp9/common/vp9_quant_common.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp9/common/vp9_systemdependent.h" #include "vpx_ports/vpx_timer.h" #include "vp9/decoder/vp9_decodframe.h" diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 71a8cef..e62eeed 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -17,7 +17,7 @@ #include "vp9/common/vp9_setupintrarecon.h" #include "vp9/encoder/vp9_mcomp.h" #include "vp9/encoder/vp9_firstpass.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp9/encoder/vp9_encodeframe.h" #include "vp9/encoder/vp9_encodemb.h" #include "vp9/common/vp9_extend.h" diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 448b56a..0fe7a14 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -18,7 +18,7 @@ #include "vp9/encoder/vp9_mcomp.h" #include "vp9/encoder/vp9_firstpass.h" #include "vp9/encoder/vp9_psnr.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp9/common/vp9_extend.h" #include "vp9/encoder/vp9_ratectrl.h" #include "vp9/common/vp9_quant_common.h" diff --git a/vp9/encoder/vp9_picklpf.c b/vp9/encoder/vp9_picklpf.c index 90ea6f1..865c45e 100644 --- a/vp9/encoder/vp9_picklpf.c +++ b/vp9/encoder/vp9_picklpf.c @@ -14,7 +14,7 @@ #include "vp9/encoder/vp9_picklpf.h" #include "vp9/encoder/vp9_quantize.h" #include "vpx_mem/vpx_mem.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_loopfilter.h" #include "./vpx_scale_rtcd.h" diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c index 3a68443..89d6b44 100644 --- a/vp9/encoder/vp9_temporal_filter.c +++ b/vp9/encoder/vp9_temporal_filter.c @@ -17,7 +17,7 @@ #include "vp9/encoder/vp9_mcomp.h" #include "vp9/encoder/vp9_firstpass.h" #include "vp9/encoder/vp9_psnr.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vp9/common/vp9_extend.h" #include "vp9/encoder/vp9_ratectrl.h" #include "vp9/common/vp9_quant_common.h" diff --git a/vpx_scale/generic/gen_scalers.c b/vpx_scale/generic/gen_scalers.c index febe97d..5f355c5 100644 --- a/vpx_scale/generic/gen_scalers.c +++ b/vpx_scale/generic/gen_scalers.c @@ -9,7 +9,7 @@ */ -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vpx_mem/vpx_mem.h" /**************************************************************************** * Imports diff --git a/vpx_scale/generic/vpxscale.c b/vpx_scale/generic/vpx_scale.c similarity index 100% rename from vpx_scale/generic/vpxscale.c rename to vpx_scale/generic/vpx_scale.c diff --git a/vpx_scale/generic/yv12extend.c b/vpx_scale/generic/yv12extend.c index 247078c..5a42735 100644 --- a/vpx_scale/generic/yv12extend.c +++ b/vpx_scale/generic/yv12extend.c @@ -11,7 +11,7 @@ #include "vpx_scale/yv12config.h" #include "vpx_mem/vpx_mem.h" -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" /**************************************************************************** * Exports diff --git a/vpx_scale/vpxscale.h b/vpx_scale/vpx_scale.h similarity index 100% rename from vpx_scale/vpxscale.h rename to vpx_scale/vpx_scale.h diff --git a/vpx_scale/vpx_scale.mk b/vpx_scale/vpx_scale.mk index 3d75932..11d3fd9 100644 --- a/vpx_scale/vpx_scale.mk +++ b/vpx_scale/vpx_scale.mk @@ -1,7 +1,7 @@ SCALE_SRCS-yes += vpx_scale.mk SCALE_SRCS-yes += yv12config.h -SCALE_SRCS-yes += vpxscale.h -SCALE_SRCS-yes += generic/vpxscale.c +SCALE_SRCS-yes += vpx_scale.h +SCALE_SRCS-yes += generic/vpx_scale.c SCALE_SRCS-yes += generic/yv12config.c SCALE_SRCS-yes += generic/yv12extend.c SCALE_SRCS-$(CONFIG_SPATIAL_RESAMPLING) += generic/gen_scalers.c diff --git a/vpx_scale/win32/scaleopt.c b/vpx_scale/win32/scaleopt.c index 54f9ac0..4336ece 100644 --- a/vpx_scale/win32/scaleopt.c +++ b/vpx_scale/win32/scaleopt.c @@ -23,7 +23,7 @@ ****************************************************************************/ __declspec(align(16)) const static unsigned short round_values[] = { 128, 128, 128, 128 }; -#include "vpx_scale/vpxscale.h" +#include "vpx_scale/vpx_scale.h" #include "vpx_mem/vpx_mem.h" __declspec(align(16)) const static unsigned short const54_2[] = { 0, 64, 128, 192 }; -- 2.7.4