From 890f7bedf3d7d4b417691d75a4f03c28eefaea92 Mon Sep 17 00:00:00 2001 From: James Zern Date: Tue, 9 Dec 2014 17:27:52 -0800 Subject: [PATCH] vp9_postproc: remove redundant CONFIG_* checks the entire module is wrapped in CONFIG_VP9_POSTPROC which is forcibly enabled with CONFIG_INTERNAL_STATS + a similar change in vp9_alloccommon.c Change-Id: I374993297a9fba5bef2f0b71f984eba42f0995a3 --- vp9/common/vp9_alloccommon.c | 2 +- vp9/common/vp9_postproc.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index cb299f9f7..3518d8375 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -126,7 +126,7 @@ int vp9_alloc_ref_frame_buffers(VP9_COMMON *cm, int width, int height) { init_frame_bufs(cm); -#if CONFIG_INTERNAL_STATS || CONFIG_VP9_POSTPROC +#if CONFIG_VP9_POSTPROC if (vp9_alloc_frame_buffer(&cm->post_proc_buffer, width, height, ss_x, ss_y, #if CONFIG_VP9_HIGHBITDEPTH cm->use_highbitdepth, diff --git a/vp9/common/vp9_postproc.c b/vp9/common/vp9_postproc.c index e1a389132..06cb65a98 100644 --- a/vp9/common/vp9_postproc.c +++ b/vp9/common/vp9_postproc.c @@ -683,7 +683,6 @@ int vp9_post_proc_frame(struct VP9Common *cm, } } -#if CONFIG_VP9_POSTPROC || CONFIG_INTERNAL_STATS if (vp9_realloc_frame_buffer(&cm->post_proc_buffer, cm->width, cm->height, cm->subsampling_x, cm->subsampling_y, #if CONFIG_VP9_HIGHBITDEPTH @@ -692,7 +691,6 @@ int vp9_post_proc_frame(struct VP9Common *cm, VP9_DEC_BORDER_IN_PIXELS, NULL, NULL, NULL) < 0) vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, "Failed to allocate post-processing buffer"); -#endif if ((flags & VP9D_MFQE) && cm->current_video_frame >= 2 && cm->postproc_state.last_frame_valid && @@ -749,4 +747,4 @@ int vp9_post_proc_frame(struct VP9Common *cm, swap_mi_and_prev_mi(cm); return 0; } -#endif +#endif // CONFIG_VP9_POSTPROC -- 2.40.0