diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2015-11-09 10:14:13 -0800 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2015-11-09 10:14:13 -0800 |
| commit | 380a5519cca999f54b17f37b709996a11f3204ea (patch) | |
| tree | 7031fd62e704b82444c5afb663471d9032e1173f /vp9/decoder/vp9_decodeframe.c | |
| parent | 420e8d6d039c2224e00c13aba7f8908b68868359 (diff) | |
| download | libvpx-380a5519cca999f54b17f37b709996a11f3204ea.tar libvpx-380a5519cca999f54b17f37b709996a11f3204ea.tar.gz libvpx-380a5519cca999f54b17f37b709996a11f3204ea.tar.bz2 libvpx-380a5519cca999f54b17f37b709996a11f3204ea.zip | |
VP9: Only zero counts when !frame_parallel_decoding_mode
The counts are never used when frame_parallel_decoding_mode
is set.
Change-Id: Ic7a566a048297f7373c9ffbb48929ea09eff674f
Diffstat (limited to 'vp9/decoder/vp9_decodeframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index f1916639b..89f8a162f 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1979,6 +1979,8 @@ 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; @@ -2202,8 +2204,6 @@ 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) |