From 0c40d3315fd379216b83e75d8e77839352c855fa Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Wed, 14 Dec 2011 09:39:30 +0000 Subject: [PATCH] Fixes an assert triggered in jitter_buffer_test and disables deblocking. When deblocking is enabled the first frames can include uninitialized memory. Disabling for now. BUG= TEST= Review URL: http://webrtc-codereview.appspot.com/320010 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1181 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/video_coding/codecs/vp8/main/source/vp8.cc | 6 ++++-- src/modules/video_coding/main/source/session_info.cc | 1 - 2 files changed, 4 insertions(+), 3 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 24b5a24ea..279666ce1 100644 --- a/src/modules/video_coding/codecs/vp8/main/source/vp8.cc +++ b/src/modules/video_coding/codecs/vp8/main/source/vp8.cc @@ -724,10 +724,12 @@ VP8Decoder::InitDecode(const VideoCodec* inst, } #if WEBRTC_LIBVPX_VERSION >= 971 + vp8_postproc_cfg_t ppcfg; - ppcfg.post_proc_flag = VP8_DEBLOCK; + // Disable deblocking for now due to uninitialized memory being returned. + ppcfg.post_proc_flag = 0; // 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 diff --git a/src/modules/video_coding/main/source/session_info.cc b/src/modules/video_coding/main/source/session_info.cc index e7091e2bd..8855b6c37 100644 --- a/src/modules/video_coding/main/source/session_info.cc +++ b/src/modules/video_coding/main/source/session_info.cc @@ -637,7 +637,6 @@ int VCMSessionInfo::PrepareForDecode(uint8_t* frame_buffer) { if (real_data_bytes == 0) { // Drop the frame since all it contains are zeros. length = 0; - packets_.clear(); } return length; }