From 690fcd793bce93216917fd164ecdfeae20f905fa Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Wed, 20 Jul 2016 09:25:14 -0700 Subject: [PATCH] Change to call vp9_post_proc_frame() This commit changes the call in vp9 encoder from vp9_deblock() to vp9_post_proc_frame() to ensure the data structures used in the call are properly allocated. This fixes an encoder crash when configured with --enable-internal-stats. Change-Id: I2393b336c0f566665336df4f1ba91c405eb56764 --- vp9/encoder/vp9_encoder.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 0d78874b7..ec696a7f3 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -4944,9 +4944,13 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, "Failed to allocate post processing buffer"); } - - vp9_deblock(cm->frame_to_show, pp, - cm->lf.filter_level * 10 / 6, cm->postproc_state.limits); + { + vp9_ppflags_t ppflags; + ppflags.post_proc_flag = VP9D_DEBLOCK; + ppflags.deblocking_level = 0; // not used in vp9_post_proc_frame() + ppflags.noise_level = 0; // not used in vp9_post_proc_frame() + vp9_post_proc_frame(cm, pp, &ppflags); + } #endif vpx_clear_system_state(); -- 2.40.0