generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp9_postproc: remove redundant CONFIG_* checks

Browse Source 
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
This commit is contained in:
James Zern 2014-12-09 17:27:52 -08:00
parent 3e0793b80b
commit 890f7bedf3
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/common/vp9_alloccommon.c
View File

@ -126,7 +126,7 @@ int vp9_alloc_ref_frame_buffers(VP9_COMMON *cm, int width, int height) {
init_frame_bufs(cm); 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 (vp9_alloc_frame_buffer(&cm->post_proc_buffer, width, height, ss_x, ss_y,
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
cm->use_highbitdepth, cm->use_highbitdepth,

4
vp9/common/vp9_postproc.c
View File

@ -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, if (vp9_realloc_frame_buffer(&cm->post_proc_buffer, cm->width, cm->height,
cm->subsampling_x, cm->subsampling_y, cm->subsampling_x, cm->subsampling_y,
#if CONFIG_VP9_HIGHBITDEPTH #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) VP9_DEC_BORDER_IN_PIXELS, NULL, NULL, NULL) < 0)
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate post-processing buffer"); "Failed to allocate post-processing buffer");
#endif
if ((flags & VP9D_MFQE) && cm->current_video_frame >= 2 && if ((flags & VP9D_MFQE) && cm->current_video_frame >= 2 &&
cm->postproc_state.last_frame_valid && cm->postproc_state.last_frame_valid &&
@ -749,4 +747,4 @@ int vp9_post_proc_frame(struct VP9Common *cm,
swap_mi_and_prev_mi(cm); swap_mi_and_prev_mi(cm);
return 0; return 0;
} }
#endif #endif // CONFIG_VP9_POSTPROC