diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-06-09 21:18:00 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-09 21:18:00 -0700 |
| commit | 4852a8023d0e8562fba338f20a064b40304f7858 (patch) | |
| tree | 31de86fbb1dca2ecf7348f207a47125f3ee325fd /vp9 | |
| parent | 9c44ce9f4bef9f3f4f7201d60c3f1b61b62256ae (diff) | |
| parent | 140ac34e576f586054d2c4d98476adae5dd06c52 (diff) | |
| download | libvpx-4852a8023d0e8562fba338f20a064b40304f7858.tar libvpx-4852a8023d0e8562fba338f20a064b40304f7858.tar.gz libvpx-4852a8023d0e8562fba338f20a064b40304f7858.tar.bz2 libvpx-4852a8023d0e8562fba338f20a064b40304f7858.zip | |
Merge "Loopfilter: Always filter intra edges" into experimental
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_loopfilter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index fbcdb531f..87ef14a0c 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -677,7 +677,8 @@ static void filter_block_plane(VP9_COMMON *cm, MACROBLOCKD *xd, // Determine the vertical edges that need filtering for (c = 0; c < 64 / MI_SIZE && mi_col + c < cm->mi_cols; c += col_step) { const MODE_INFO const *mi = xd->mode_info_context; - const int skip_this = mi[c].mbmi.mb_skip_coeff; + const int skip_this = mi[c].mbmi.mb_skip_coeff + && mi[c].mbmi.ref_frame != INTRA_FRAME; // left edge of current unit is block/partition edge -> no skip const int block_edge_left = b_width_log2(mi->mbmi.sb_type) ? !(c & ((1 << (b_width_log2(mi->mbmi.sb_type)-1)) - 1)) : 1; |