From cf2cd7e4c4021d308d70a5d6a7cfbad76435440f Mon Sep 17 00:00:00 2001 From: "marpan@webrtc.org" Date: Mon, 14 May 2012 16:50:36 +0000 Subject: [PATCH] Enable VP8 deblocker. Review URL: https://webrtc-codereview.appspot.com/569011 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2237 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/video_coding/codecs/vp8/main/source/vp8.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/modules/video_coding/codecs/vp8/main/source/vp8.cc b/src/modules/video_coding/codecs/vp8/main/source/vp8.cc index 84673e24ff..6670e75dbb 100644 --- a/src/modules/video_coding/codecs/vp8/main/source/vp8.cc +++ b/src/modules/video_coding/codecs/vp8/main/source/vp8.cc @@ -618,8 +618,6 @@ int VP8Decoder::InitDecode(const VideoCodec* inst, int number_of_cores) { vpx_codec_flags_t flags = 0; #if WEBRTC_LIBVPX_VERSION >= 971 flags = VPX_CODEC_USE_ERROR_CONCEALMENT | VPX_CODEC_USE_POSTPROC; - // TODO(pwestin) enable deblock with the next VP8 drop. - // | VP8_DEMACROBLOCK | VP8_DEBLOCK; #ifdef INDEPENDENT_PARTITIONS flags |= VPX_CODEC_USE_INPUT_PARTITION; #endif @@ -631,10 +629,9 @@ int VP8Decoder::InitDecode(const VideoCodec* inst, int number_of_cores) { #if WEBRTC_LIBVPX_VERSION >= 971 vp8_postproc_cfg_t ppcfg; - // Disable deblocking for now due to uninitialized memory being returned. - ppcfg.post_proc_flag = 0; + ppcfg.post_proc_flag = VP8_DEMACROBLOCK | VP8_DEBLOCK; // Strength of deblocking filter. Valid range:[0,16] - //ppcfg.deblocking_level = 3; + ppcfg.deblocking_level = 3; vpx_codec_control(decoder_, VP8_SET_POSTPROC, &ppcfg); #endif @@ -679,7 +676,8 @@ int VP8Decoder::Decode(const EncodedImage& input_image, // header says. mfqe_enabled_ = true; vp8_postproc_cfg_t ppcfg; - ppcfg.post_proc_flag = VP8_MFQE; + ppcfg.post_proc_flag = VP8_MFQE | VP8_DEMACROBLOCK | VP8_DEBLOCK; + ppcfg.deblocking_level = 3; vpx_codec_control(decoder_, VP8_SET_POSTPROC, &ppcfg); } #endif