diff options
| author | Tim Kopp <tkopp@google.com> | 2014-07-24 13:30:00 -0700 |
|---|---|---|
| committer | Tim Kopp <tkopp@google.com> | 2014-07-24 13:43:52 -0700 |
| commit | 9d337d34f2ebb08ff7fa237590005ff390805980 (patch) | |
| tree | 4dfcf588d5c47cf936f00fe208027bf1651311d0 /vp9/encoder/vp9_encoder.c | |
| parent | 0cf0b02c4c9dd7dc1338a7514a1e47588d74e704 (diff) | |
| download | libvpx-9d337d34f2ebb08ff7fa237590005ff390805980.tar libvpx-9d337d34f2ebb08ff7fa237590005ff390805980.tar.gz libvpx-9d337d34f2ebb08ff7fa237590005ff390805980.tar.bz2 libvpx-9d337d34f2ebb08ff7fa237590005ff390805980.zip | |
s/CONFIG_DENOISING/CONFIG_VP9_TEMPORAL_DENOISING
This should prevent confusion with the VP8 CONFIG_TEMPORAL_DENOISING and other
flags.
Change-Id: I1fe4e2977895b7966841d861ab74317ad875b6c8
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 14 |
1 files changed, 7 insertions, 7 deletions
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], |