diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2015-09-29 08:34:26 -0700 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2015-09-29 15:54:33 -0700 |
| commit | 18373264d954d0d396db430c7863269d3971b0c2 (patch) | |
| tree | b5ca4cf8fe346da6b2e4ce1135aabe51a1d5578f | |
| parent | 66de2b710fb65ef51bdc9569f037f6d674e60a2f (diff) | |
| download | libvpx-18373264d954d0d396db430c7863269d3971b0c2.tar libvpx-18373264d954d0d396db430c7863269d3971b0c2.tar.gz libvpx-18373264d954d0d396db430c7863269d3971b0c2.tar.bz2 libvpx-18373264d954d0d396db430c7863269d3971b0c2.zip | |
VP9: remove plane_type checks in loopfilter functions
vp9_filter_block_plane_ss11() and vp9_filter_block_plane_non420()
are only called for the uv planes.
Change-Id: Iacd3b3242c8ce581edd37c8f06d95efc8a0f88a3
| -rw-r--r-- | vp9/common/vp9_loopfilter.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index 92fc0f729..e2d4e221e 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -1196,9 +1196,7 @@ void vp9_filter_block_plane_non420(VP9_COMMON *cm, const int block_edge_above = (num_4x4_blocks_high_lookup[sb_type] > 1) ? !(r & (num_8x8_blocks_high_lookup[sb_type] - 1)) : 1; const int skip_this_r = skip_this && !block_edge_above; - const TX_SIZE tx_size = (plane->plane_type == PLANE_TYPE_UV) - ? get_uv_tx_size(&mi[0].mbmi, plane) - : mi[0].mbmi.tx_size; + const TX_SIZE tx_size = get_uv_tx_size(&mi[0].mbmi, plane); const int skip_border_4x4_c = ss_x && mi_col + c == cm->mi_cols - 1; const int skip_border_4x4_r = ss_y && mi_row + r == cm->mi_rows - 1; @@ -1446,11 +1444,9 @@ void vp9_filter_block_plane_ss11(VP9_COMMON *const cm, // Vertical pass: do 2 rows at one time for (r = 0; r < MI_BLOCK_SIZE && mi_row + r < cm->mi_rows; r += 4) { - if (plane->plane_type == 1) { - for (c = 0; c < (MI_BLOCK_SIZE >> 1); c++) { - lfl_uv[(r << 1) + c] = lfm->lfl_y[(r << 3) + (c << 1)]; - lfl_uv[((r + 2) << 1) + c] = lfm->lfl_y[((r + 2) << 3) + (c << 1)]; - } + for (c = 0; c < (MI_BLOCK_SIZE >> 1); c++) { + lfl_uv[(r << 1) + c] = lfm->lfl_y[(r << 3) + (c << 1)]; + lfl_uv[((r + 2) << 1) + c] = lfm->lfl_y[((r + 2) << 3) + (c << 1)]; } { |