From 8f7bc45b5b6d091b6241878f5146fab92fd9b1e5 Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 11 Nov 2015 11:09:42 -0800 Subject: [PATCH] Revert "VP9: Only zero counts when !frame_parallel_decoding_mode" This reverts commit 380a5519cca999f54b17f37b709996a11f3204ea. This causes an assertion failure in debug_check_frame_counts() which probably isn't valid with this change; leaving the investigation for later now. Change-Id: Ieda5ca811ed2fa50a0cc6935919a8d10dca996e0 --- vp9/decoder/vp9_decodeframe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 89f8a162f..f1916639b 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1979,8 +1979,6 @@ static size_t read_uncompressed_header(VP9Decoder *pbi, if (!cm->error_resilient_mode) { cm->refresh_frame_context = vpx_rb_read_bit(rb); cm->frame_parallel_decoding_mode = vpx_rb_read_bit(rb); - if (!cm->frame_parallel_decoding_mode) - vp9_zero(cm->counts); } else { cm->refresh_frame_context = 0; cm->frame_parallel_decoding_mode = 1; @@ -2204,6 +2202,8 @@ void vp9_decode_frame(VP9Decoder *pbi, vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, "Uninitialized entropy context."); + vp9_zero(cm->counts); + xd->corrupted = 0; new_fb->corrupted = read_compressed_header(pbi, data, first_partition_size); if (new_fb->corrupted) -- 2.40.0