Commit 2bf4b485 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge changes Id6421838,I37499329

* changes:
  vp9: make postproc members depend on CONFIG_VP9_POSTPROC
  vp9_postproc: remove redundant CONFIG_* checks
parents 7f59cff5 ef06de33
......@@ -44,8 +44,10 @@ void vp9_free_ref_frame_buffers(VP9_COMMON *cm) {
vp9_free_frame_buffer(&cm->frame_bufs[i].buf);
}
#if CONFIG_VP9_POSTPROC
vp9_free_frame_buffer(&cm->post_proc_buffer);
vp9_free_frame_buffer(&cm->post_proc_buffer_int);
#endif
}
void vp9_free_context_buffers(VP9_COMMON *cm) {
......@@ -126,7 +128,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,
......
......@@ -112,8 +112,10 @@ typedef struct VP9Common {
int new_fb_idx;
#if CONFIG_VP9_POSTPROC
YV12_BUFFER_CONFIG post_proc_buffer;
YV12_BUFFER_CONFIG post_proc_buffer_int;
#endif
FRAME_TYPE last_frame_type; /* last frame's frame type for motion search.*/
FRAME_TYPE frame_type;
......
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment