From 03a9e5edb61c4ef55cfe1f1473d878a6182a3158 Mon Sep 17 00:00:00 2001 From: Marco Paniconi Date: Fri, 21 Mar 2014 14:31:53 -0700 Subject: [PATCH] Rename the aq_mode files. Change-Id: Id76a628495c822e23825b66a7589b4a3279680e2 --- vp9/encoder/{vp9_craq.c => vp9_aq_cyclicrefresh.c} | 2 +- vp9/encoder/{vp9_craq.h => vp9_aq_cyclicrefresh.h} | 6 +++--- vp9/encoder/{vp9_vaq.c => vp9_aq_variance.c} | 2 +- vp9/encoder/{vp9_vaq.h => vp9_aq_variance.h} | 6 +++--- vp9/encoder/vp9_encodeframe.c | 4 ++-- vp9/encoder/vp9_firstpass.c | 2 +- vp9/encoder/vp9_onyx_if.c | 4 ++-- vp9/encoder/vp9_onyx_int.h | 2 +- vp9/vp9cx.mk | 8 ++++---- 9 files changed, 18 insertions(+), 18 deletions(-) rename vp9/encoder/{vp9_craq.c => vp9_aq_cyclicrefresh.c} (99%) rename vp9/encoder/{vp9_craq.h => vp9_aq_cyclicrefresh.h} (93%) rename vp9/encoder/{vp9_vaq.c => vp9_aq_variance.c} (99%) rename vp9/encoder/{vp9_vaq.h => vp9_aq_variance.h} (86%) diff --git a/vp9/encoder/vp9_craq.c b/vp9/encoder/vp9_aq_cyclicrefresh.c similarity index 99% rename from vp9/encoder/vp9_craq.c rename to vp9/encoder/vp9_aq_cyclicrefresh.c index 40437c7..abf7703 100644 --- a/vp9/encoder/vp9_craq.c +++ b/vp9/encoder/vp9_aq_cyclicrefresh.c @@ -11,7 +11,7 @@ #include #include -#include "vp9/encoder/vp9_craq.h" +#include "vp9/encoder/vp9_aq_cyclicrefresh.h" #include "vp9/common/vp9_seg_common.h" diff --git a/vp9/encoder/vp9_craq.h b/vp9/encoder/vp9_aq_cyclicrefresh.h similarity index 93% rename from vp9/encoder/vp9_craq.h rename to vp9/encoder/vp9_aq_cyclicrefresh.h index fec7748..d64a6ca 100644 --- a/vp9/encoder/vp9_craq.h +++ b/vp9/encoder/vp9_aq_cyclicrefresh.h @@ -9,8 +9,8 @@ */ -#ifndef VP9_ENCODER_VP9_CRAQ_H_ -#define VP9_ENCODER_VP9_CRAQ_H_ +#ifndef VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_ +#define VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_ #include "vp9/common/vp9_blockd.h" @@ -64,4 +64,4 @@ void vp9_setup_cyclic_refresh_aq(struct VP9_COMP *const cpi); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_CRAQ_H_ +#endif // VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_ diff --git a/vp9/encoder/vp9_vaq.c b/vp9/encoder/vp9_aq_variance.c similarity index 99% rename from vp9/encoder/vp9_vaq.c rename to vp9/encoder/vp9_aq_variance.c index c71c171..c25eb95 100644 --- a/vp9/encoder/vp9_vaq.c +++ b/vp9/encoder/vp9_aq_variance.c @@ -10,7 +10,7 @@ #include -#include "vp9/encoder/vp9_vaq.h" +#include "vp9/encoder/vp9_aq_variance.h" #include "vp9/common/vp9_seg_common.h" diff --git a/vp9/encoder/vp9_vaq.h b/vp9/encoder/vp9_aq_variance.h similarity index 86% rename from vp9/encoder/vp9_vaq.h rename to vp9/encoder/vp9_aq_variance.h index c73114a..381fe50 100644 --- a/vp9/encoder/vp9_vaq.h +++ b/vp9/encoder/vp9_aq_variance.h @@ -9,8 +9,8 @@ */ -#ifndef VP9_ENCODER_VP9_VAQ_H_ -#define VP9_ENCODER_VP9_VAQ_H_ +#ifndef VP9_ENCODER_VP9_AQ_VARIANCE_H_ +#define VP9_ENCODER_VP9_AQ_VARIANCE_H_ #include "vp9/encoder/vp9_onyx_int.h" @@ -31,4 +31,4 @@ int vp9_block_energy(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_VAQ_H_ +#endif // VP9_ENCODER_VP9_AQ_VARIANCE_H_ diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index a0196e6..0a2db52 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -30,6 +30,8 @@ #include "vp9/common/vp9_systemdependent.h" #include "vp9/common/vp9_tile_common.h" +#include "vp9/encoder/vp9_aq_cyclicrefresh.h" +#include "vp9/encoder/vp9_aq_variance.h" #include "vp9/encoder/vp9_encodeframe.h" #include "vp9/encoder/vp9_encodemb.h" #include "vp9/encoder/vp9_encodemv.h" @@ -38,8 +40,6 @@ #include "vp9/encoder/vp9_rdopt.h" #include "vp9/encoder/vp9_segmentation.h" #include "vp9/encoder/vp9_tokenize.h" -#include "vp9/encoder/vp9_vaq.h" -#include "vp9/encoder/vp9_craq.h" #define GF_ZEROMV_ZBIN_BOOST 0 #define LF_ZEROMV_ZBIN_BOOST 0 diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index c4c219b..61ca996 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -23,6 +23,7 @@ #include "vp9/common/vp9_reconinter.h" // vp9_setup_dst_planes() #include "vp9/common/vp9_systemdependent.h" +#include "vp9/encoder/vp9_aq_variance.h" #include "vp9/encoder/vp9_block.h" #include "vp9/encoder/vp9_encodeframe.h" #include "vp9/encoder/vp9_encodemb.h" @@ -34,7 +35,6 @@ #include "vp9/encoder/vp9_quantize.h" #include "vp9/encoder/vp9_ratectrl.h" #include "vp9/encoder/vp9_rdopt.h" -#include "vp9/encoder/vp9_vaq.h" #include "vp9/encoder/vp9_variance.h" #define OUTPUT_FPF 0 diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 02ba216..823cea9 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -27,8 +27,9 @@ #include "vp9/common/vp9_systemdependent.h" #include "vp9/common/vp9_tile_common.h" +#include "vp9/encoder/vp9_aq_cyclicrefresh.h" +#include "vp9/encoder/vp9_aq_variance.h" #include "vp9/encoder/vp9_bitstream.h" -#include "vp9/encoder/vp9_craq.h" #include "vp9/encoder/vp9_encodeframe.h" #include "vp9/encoder/vp9_encodemv.h" #include "vp9/encoder/vp9_firstpass.h" @@ -39,7 +40,6 @@ #include "vp9/encoder/vp9_rdopt.h" #include "vp9/encoder/vp9_segmentation.h" #include "vp9/encoder/vp9_temporal_filter.h" -#include "vp9/encoder/vp9_vaq.h" #include "vp9/encoder/vp9_resize.h" #include "vp9/encoder/vp9_svc_layercontext.h" diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 2aa67ae..4989b31 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -23,7 +23,7 @@ #include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_onyxc_int.h" -#include "vp9/encoder/vp9_craq.h" +#include "vp9/encoder/vp9_aq_cyclicrefresh.h" #include "vp9/encoder/vp9_encodemb.h" #include "vp9/encoder/vp9_firstpass.h" #include "vp9/encoder/vp9_lookahead.h" diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index b14e7e5..a61f737 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -68,10 +68,10 @@ VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c VP9_CX_SRCS-yes += encoder/vp9_tokenize.c VP9_CX_SRCS-yes += encoder/vp9_treewriter.c VP9_CX_SRCS-yes += encoder/vp9_variance.c -VP9_CX_SRCS-yes += encoder/vp9_vaq.c -VP9_CX_SRCS-yes += encoder/vp9_vaq.h -VP9_CX_SRCS-yes += encoder/vp9_craq.c -VP9_CX_SRCS-yes += encoder/vp9_craq.h +VP9_CX_SRCS-yes += encoder/vp9_aq_variance.c +VP9_CX_SRCS-yes += encoder/vp9_aq_variance.h +VP9_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.c +VP9_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.h ifeq ($(CONFIG_VP9_POSTPROC),yes) VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.h VP9_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.c -- 2.7.4