diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2015-09-29 21:40:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-29 21:40:48 +0000 |
| commit | 66de2b710fb65ef51bdc9569f037f6d674e60a2f (patch) | |
| tree | 75921f4c5d339c806b6641761683021973058cfd /vp9/decoder | |
| parent | 388a807e4985ed3fe9d25c2478f1dad3c935cc51 (diff) | |
| parent | 771811710499607198e5af2f60da1df65f145c56 (diff) | |
| download | libvpx-66de2b710fb65ef51bdc9569f037f6d674e60a2f.tar libvpx-66de2b710fb65ef51bdc9569f037f6d674e60a2f.tar.gz libvpx-66de2b710fb65ef51bdc9569f037f6d674e60a2f.tar.bz2 libvpx-66de2b710fb65ef51bdc9569f037f6d674e60a2f.zip | |
Merge "VP9: move loopfilter build masks to decode loop"
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index fc58a6e3d..22995bd17 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -896,6 +896,10 @@ static void decode_block(VP9Decoder *const pbi, MACROBLOCKD *const xd, } xd->corrupted |= vpx_reader_has_error(r); + + if (cm->lf.filter_level) { + vp9_build_mask(cm, mbmi, mi_row, mi_col, bw, bh); + } } static INLINE int dec_partition_plane_context(const MACROBLOCKD *xd, @@ -1468,6 +1472,8 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi, memset(cm->above_seg_context, 0, sizeof(*cm->above_seg_context) * aligned_cols); + vp9_reset_lfm(cm); + get_tile_buffers(pbi, data, data_end, tile_cols, tile_rows, tile_buffers); if (pbi->tile_data == NULL || @@ -1666,6 +1672,8 @@ static const uint8_t *decode_tiles_mt(VP9Decoder *pbi, memset(cm->above_seg_context, 0, sizeof(*cm->above_seg_context) * aligned_mi_cols); + vp9_reset_lfm(cm); + // Load tile data into tile_buffers get_tile_buffers(pbi, data, data_end, tile_cols, tile_rows, tile_buffers); |