diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-04-24 11:45:26 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-24 11:45:26 -0700 |
| commit | 41a8a95bd1ca23cb8ab4bfbbe2fc1e219ea5243a (patch) | |
| tree | 75566fa74660ddadd28489b0c770dbc6ac4700a4 /vp9 | |
| parent | 4149ba1cbfa5b41873df2239a2902d3ebb7d6445 (diff) | |
| parent | 5b57580cd9620d3cd372ea30340c7e7fe3312948 (diff) | |
| download | libvpx-41a8a95bd1ca23cb8ab4bfbbe2fc1e219ea5243a.tar libvpx-41a8a95bd1ca23cb8ab4bfbbe2fc1e219ea5243a.tar.gz libvpx-41a8a95bd1ca23cb8ab4bfbbe2fc1e219ea5243a.tar.bz2 libvpx-41a8a95bd1ca23cb8ab4bfbbe2fc1e219ea5243a.zip | |
Merge "Change chroma loopfilter to skip inner SB edges for tx16x16 also." into experimental
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_loopfilter.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index 0ce41be54..0bb79689d 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -308,7 +308,8 @@ static void lpf_sb32(VP9_COMMON *cm, const MODE_INFO *mode_info_context, do_left_v = !(wbl >= 3 /* 32x16 or >=32x32 */ && (tx_size >= TX_32X32 || sb_mb_lf_skip(mode_info_context, mi))); do_above_h = (mb_row > 0); - do_left_v_mbuv = do_left_v; + do_left_v_mbuv = !(wbl >= 3 /* 32x16 or >=32x32 */ && (tx_size >= TX_16X16 || + sb_mb_lf_skip(mode_info_context, mi))); do_above_h_mbuv = !(sb_type >= BLOCK_SIZE_SB64X64 && tx_size >= TX_32X32 && (mb_row & 2)); lpf_mb(cm, mi, do_left_v, do_above_h, @@ -325,7 +326,8 @@ static void lpf_sb32(VP9_COMMON *cm, const MODE_INFO *mode_info_context, sb_mb_lf_skip(mode_info_context, mi))); do_left_v_mbuv = !(sb_type >= BLOCK_SIZE_SB64X64 && tx_size >= TX_32X32 && (mb_col & 2)); - do_above_h_mbuv = do_above_h; + do_above_h_mbuv = !(hbl >= 3 /* 16x32 or >=32x32 */ && (tx_size >= TX_16X16 || + sb_mb_lf_skip(mode_info_context, mi))); lpf_mb(cm, mi, do_left_v, do_above_h, do_left_v_mbuv, do_above_h_mbuv, y_ptr + 16 * y_stride, @@ -339,8 +341,10 @@ static void lpf_sb32(VP9_COMMON *cm, const MODE_INFO *mode_info_context, sb_mb_lf_skip(mi - 1, mi))); do_above_h = !(hbl >= 3 /* 16x32 or >=32x32 */ && (tx_size >= TX_32X32 || sb_mb_lf_skip(mode_info_context + 1, mi))); - do_left_v_mbuv = do_left_v; - do_above_h_mbuv = do_above_h; + do_left_v_mbuv = (wbl >= 3 /* 32x16 or >=32x32 */ && (tx_size >= TX_16X16 || + sb_mb_lf_skip(mi - 1, mi))); + do_above_h_mbuv = !(hbl >= 3 /* 16x32 or >=32x32 */ && (tx_size >= TX_16X16 || + sb_mb_lf_skip(mode_info_context + 1, mi))); lpf_mb(cm, mi, do_left_v, do_above_h, do_left_v_mbuv, do_above_h_mbuv, y_ptr + 16 * y_stride + 16, |