diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-02-19 20:38:53 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-02-23 14:34:34 +0100 |
| commit | 50c988aa6d6c6f0ceb8f922bcea34800b56b85d9 (patch) | |
| tree | b408d70187189d0ab37bcfe2f76e3b0b7826e726 | |
| parent | 1db03a68641193832fc759c88049adbe8a449310 (diff) | |
| download | ffmpeg-50c988aa6d6c6f0ceb8f922bcea34800b56b85d9.tar.gz | |
hevc: Drop unnecessary shifts in deblocking_filter_CTB
beta_offset is pre-multiplied by 2.
| -rw-r--r-- | libavcodec/hevc_filter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index d3f2ff1388..3437fd061e 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -374,8 +374,8 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) const int qp0 = (get_qPy(s, x - 1, y) + get_qPy(s, x, y) + 1) >> 1; const int qp1 = (get_qPy(s, x - 1, y + 4) + get_qPy(s, x, y + 4) + 1) >> 1; - beta[0] = betatable[av_clip(qp0 + (beta_offset >> 1 << 1), 0, MAX_QP)]; - beta[1] = betatable[av_clip(qp1 + (beta_offset >> 1 << 1), 0, MAX_QP)]; + beta[0] = betatable[av_clip(qp0 + beta_offset, 0, MAX_QP)]; + beta[1] = betatable[av_clip(qp1 + beta_offset, 0, MAX_QP)]; tc[0] = bs0 ? TC_CALC(qp0, bs0) : 0; tc[1] = bs1 ? TC_CALC(qp1, bs1) : 0; src = &s->frame->data[LUMA][y * s->frame->linesize[LUMA] + (x << s->sps->pixel_shift)]; @@ -439,8 +439,8 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) tc_offset = x >= x0 ? cur_tc_offset : left_tc_offset; beta_offset = x >= x0 ? cur_beta_offset : left_beta_offset; - beta[0] = betatable[av_clip(qp0 + (beta_offset >> 1 << 1), 0, MAX_QP)]; - beta[1] = betatable[av_clip(qp1 + (beta_offset >> 1 << 1), 0, MAX_QP)]; + beta[0] = betatable[av_clip(qp0 + beta_offset, 0, MAX_QP)]; + beta[1] = betatable[av_clip(qp1 + beta_offset, 0, MAX_QP)]; tc[0] = bs0 ? TC_CALC(qp0, bs0) : 0; tc[1] = bs1 ? TC_CALC(qp1, bs1) : 0; src = &s->frame->data[LUMA][y * s->frame->linesize[LUMA] + (x << s->sps->pixel_shift)]; |