From db8b1b7bf13110f55c10e7535bbc90f269792948 Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 27 Aug 2014 17:02:03 -0700 Subject: [PATCH] vp9: skip loopfilter when the frame is corrupt this change is proactive: the loop filter expects valid input and may produce undefined results / crash in other cases. Change-Id: I6cc1e966062a91cbc6db981c87cd03d9129fc8fe --- vp9/decoder/vp9_decodeframe.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 72e5edf81..4a90503ac 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -884,7 +884,7 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi, pbi->mb.corrupted |= tile_data->xd.corrupted; } // Loopfilter one row. - if (cm->lf.filter_level) { + if (cm->lf.filter_level && !pbi->mb.corrupted) { const int lf_start = mi_row - MI_BLOCK_SIZE; LFWorkerData *const lf_data = (LFWorkerData*)pbi->lf_worker.data1; @@ -907,7 +907,7 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi, } // Loopfilter remaining rows in the frame. - if (cm->lf.filter_level) { + if (cm->lf.filter_level && !pbi->mb.corrupted) { LFWorkerData *const lf_data = (LFWorkerData*)pbi->lf_worker.data1; winterface->sync(&pbi->lf_worker); lf_data->start = lf_data->stop; @@ -1432,9 +1432,11 @@ void vp9_decode_frame(VP9Decoder *pbi, if (pbi->max_threads > 1 && tile_rows == 1 && tile_cols > 1 && cm->frame_parallel_decoding_mode) { *p_data_end = decode_tiles_mt(pbi, data + first_partition_size, data_end); - // If multiple threads are used to decode tiles, then we use those threads - // to do parallel loopfiltering. - vp9_loop_filter_frame_mt(new_fb, pbi, cm, cm->lf.filter_level, 0); + if (!xd->corrupted) { + // If multiple threads are used to decode tiles, then we use those threads + // to do parallel loopfiltering. + vp9_loop_filter_frame_mt(new_fb, pbi, cm, cm->lf.filter_level, 0); + } } else { *p_data_end = decode_tiles(pbi, data + first_partition_size, data_end); } -- 2.40.0