generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hevc_filter: drop redundant checks

Browse Source 
ff_hevc_deblocking_boundary_strengths() is never called if the
deblocking filter is disabled for the slice.
This commit is contained in:
Anton Khirnov 2014-07-27 17:06:19 +00:00
parent 4d1ff2a489
commit 65b8b6c476
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/hevc_filter.c
View File

@ -623,7 +623,7 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
(slice_or_tiles_up_boundary & 2) && (slice_or_tiles_up_boundary & 2) &&
(y0 % (1 << s->sps->log2_ctb_size)) == 0) (y0 % (1 << s->sps->log2_ctb_size)) == 0)
bs = 0; bs = 0;
if (y0 == 0 || s->sh.disable_deblocking_filter_flag == 1) if (y0 == 0)
bs = 0; bs = 0;
if (bs) if (bs)
s->horizontal_bs[((x0 + i) + y0 * s->bs_width) >> 2] = bs; s->horizontal_bs[((x0 + i) + y0 * s->bs_width) >> 2] = bs;
@ -651,8 +651,6 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
bs = boundary_strength(s, curr, curr_cbf_luma, bs = boundary_strength(s, curr, curr_cbf_luma,
top, top_cbf_luma, top_refPicList, 0); top, top_cbf_luma, top_refPicList, 0);
if (s->sh.disable_deblocking_filter_flag == 1)
bs = 0;
if (bs) if (bs)
s->horizontal_bs[((x0 + i) + (y0 + j) * s->bs_width) >> 2] = bs; s->horizontal_bs[((x0 + i) + (y0 + j) * s->bs_width) >> 2] = bs;
} }
@ -686,7 +684,7 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
(slice_or_tiles_left_boundary & 2) && (slice_or_tiles_left_boundary & 2) &&
(x0 % (1 << s->sps->log2_ctb_size)) == 0) (x0 % (1 << s->sps->log2_ctb_size)) == 0)
bs = 0; bs = 0;
if (x0 == 0 || s->sh.disable_deblocking_filter_flag == 1) if (x0 == 0)
bs = 0; bs = 0;
if (bs) if (bs)
s->vertical_bs[(x0 >> 3) + ((y0 + i) >> 2) * s->bs_width] = bs; s->vertical_bs[(x0 >> 3) + ((y0 + i) >> 2) * s->bs_width] = bs;
@ -714,8 +712,6 @@ void ff_hevc_deblocking_boundary_strengths(HEVCContext *s, int x0, int y0,
bs = boundary_strength(s, curr, curr_cbf_luma, bs = boundary_strength(s, curr, curr_cbf_luma,
left, left_cbf_luma, left_refPicList, 0); left, left_cbf_luma, left_refPicList, 0);
if (s->sh.disable_deblocking_filter_flag == 1)
bs = 0;
if (bs) if (bs)
s->vertical_bs[((x0 + i) >> 3) + ((y0 + j) >> 2) * s->bs_width] = bs; s->vertical_bs[((x0 + i) >> 3) + ((y0 + j) >> 2) * s->bs_width] = bs;
} }