From 9d337d34f2ebb08ff7fa237590005ff390805980 Mon Sep 17 00:00:00 2001 From: Tim Kopp Date: Thu, 24 Jul 2014 13:30:00 -0700 Subject: [PATCH] s/CONFIG_DENOISING/CONFIG_VP9_TEMPORAL_DENOISING This should prevent confusion with the VP8 CONFIG_TEMPORAL_DENOISING and other flags. Change-Id: I1fe4e2977895b7966841d861ab74317ad875b6c8 --- configure | 2 +- vp9/encoder/vp9_context_tree.h | 2 +- vp9/encoder/vp9_encodeframe.c | 2 +- vp9/encoder/vp9_encoder.c | 14 +++++++------- vp9/encoder/vp9_encoder.h | 4 ++-- vp9/encoder/vp9_pickmode.c | 2 +- vp9/vp9cx.mk | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 604ad73a7..5112d66cc 100755 --- a/configure +++ b/configure @@ -273,7 +273,7 @@ HAVE_LIST=" EXPERIMENT_LIST=" multiple_arf spatial_svc - denoising + vp9_temporal_denoising fp_mb_stats " CONFIG_LIST=" diff --git a/vp9/encoder/vp9_context_tree.h b/vp9/encoder/vp9_context_tree.h index 6d76914e9..b11a0ae3b 100644 --- a/vp9/encoder/vp9_context_tree.h +++ b/vp9/encoder/vp9_context_tree.h @@ -41,7 +41,7 @@ typedef struct { int64_t tx_rd_diff[TX_MODES]; int64_t best_filter_diff[SWITCHABLE_FILTER_CONTEXTS]; -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING unsigned int newmv_sse; unsigned int zeromv_sse; PREDICTION_MODE best_sse_inter_mode; diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index f80c0bc3e..f6c21510d 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1333,7 +1333,7 @@ static void encode_b_rt(VP9_COMP *cpi, const TileInfo *const tile, set_offsets(cpi, tile, mi_row, mi_col, bsize); update_state_rt(cpi, ctx, mi_row, mi_col, bsize); -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING if (cpi->oxcf.noise_sensitivity > 0 && output_enabled) { vp9_denoiser_denoise(&cpi->denoiser, &cpi->mb, mi_row, mi_col, MAX(BLOCK_8X8, bsize), ctx); diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index b1a5e0888..c440bbb99 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -671,7 +671,7 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { cpi->ext_refresh_frame_flags_pending = 0; cpi->ext_refresh_frame_context_pending = 0; -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING if (cpi->oxcf.noise_sensitivity > 0) { vp9_denoiser_alloc(&(cpi->denoiser), cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, @@ -865,7 +865,7 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) { cpi->mb.nmvsadcost_hp[1] = &cpi->mb.nmvsadcosts_hp[1][MV_MAX]; cal_nmvsadcosts_hp(cpi->mb.nmvsadcost_hp); -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING #ifdef OUTPUT_YUV_DENOISED yuv_denoised_file = fopen("denoised.yuv", "ab"); #endif @@ -1119,7 +1119,7 @@ void vp9_remove_compressor(VP9_COMP *cpi) { #endif } -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING if (cpi->oxcf.noise_sensitivity > 0) { vp9_denoiser_free(&(cpi->denoiser)); } @@ -1143,7 +1143,7 @@ void vp9_remove_compressor(VP9_COMP *cpi) { vp9_remove_common(&cpi->common); vpx_free(cpi); -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING #ifdef OUTPUT_YUV_DENOISED fclose(yuv_denoised_file); #endif @@ -1357,7 +1357,7 @@ void vp9_write_yuv_frame(YV12_BUFFER_CONFIG *s, FILE *f) { } #endif -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING #if defined(OUTPUT_YUV_DENOISED) // The denoiser buffer is allocated as a YUV 440 buffer. This function writes it // as YUV 420. We simply use the top-left pixels of the UV buffers, since we do @@ -1604,7 +1604,7 @@ void vp9_update_reference_frames(VP9_COMP *cpi) { ref_cnt_fb(cm->frame_bufs, &cm->ref_frame_map[cpi->lst_fb_idx], cm->new_fb_idx); } -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING if (cpi->oxcf.noise_sensitivity > 0) { vp9_denoiser_update_frame_info(&cpi->denoiser, *cpi->Source, @@ -2241,7 +2241,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, encode_with_recode_loop(cpi, size, dest, q, bottom_index, top_index); } -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING #ifdef OUTPUT_YUV_DENOISED if (cpi->oxcf.noise_sensitivity > 0) { vp9_write_yuv_frame_420(&cpi->denoiser.running_avg_y[INTRA_FRAME], diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 1419cf6f1..4b3f2ad56 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -37,7 +37,7 @@ #include "vp9/encoder/vp9_svc_layercontext.h" #include "vp9/encoder/vp9_tokenize.h" #include "vp9/encoder/vp9_variance.h" -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING #include "vp9/encoder/vp9_denoiser.h" #endif @@ -430,7 +430,7 @@ typedef struct VP9_COMP { int multi_arf_enabled; int multi_arf_last_grp_enabled; -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING VP9_DENOISER denoiser; #endif } VP9_COMP; diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 0140fb59e..30a0e9d0d 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -602,7 +602,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, } } -#if CONFIG_DENOISING +#if CONFIG_VP9_TEMPORAL_DENOISING if (cpi->oxcf.noise_sensitivity > 0) { vp9_denoiser_update_frame_stats(&cpi->denoiser, mbmi, sse_y, this_mode, ctx); diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index 3f2f5b9d9..3381cb95a 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -23,8 +23,8 @@ VP9_CX_SRCS-yes += encoder/vp9_context_tree.h VP9_CX_SRCS-yes += encoder/vp9_cost.h VP9_CX_SRCS-yes += encoder/vp9_cost.c VP9_CX_SRCS-yes += encoder/vp9_dct.c -VP9_CX_SRCS-$(CONFIG_DENOISING) += encoder/vp9_denoiser.c -VP9_CX_SRCS-$(CONFIG_DENOISING) += encoder/vp9_denoiser.h +VP9_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.c +VP9_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.h VP9_CX_SRCS-yes += encoder/vp9_encodeframe.c VP9_CX_SRCS-yes += encoder/vp9_encodeframe.h VP9_CX_SRCS-yes += encoder/vp9_encodemb.c