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/encoder/vp9_encoder.c | |
| 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/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 202c11242..e67ce8851 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -2764,6 +2764,7 @@ void vp9_update_reference_frames(VP9_COMP *cpi) { static void loopfilter_frame(VP9_COMP *cpi, VP9_COMMON *cm) { MACROBLOCKD *xd = &cpi->td.mb.e_mbd; struct loopfilter *lf = &cm->lf; + if (xd->lossless) { lf->filter_level = 0; } else { @@ -2780,6 +2781,8 @@ static void loopfilter_frame(VP9_COMP *cpi, VP9_COMMON *cm) { } if (lf->filter_level > 0) { + vp9_build_mask_frame(cm, lf->filter_level, 0); + if (cpi->num_workers > 1) vp9_loop_filter_frame_mt(cm->frame_to_show, cm, xd->plane, lf->filter_level, 0, 0, |