diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-04-28 09:29:46 +0200 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-05-01 08:45:53 +0200 |
| commit | 844799b033d6ebfa4bf8a1415bc63baae8e79827 (patch) | |
| tree | 677c13509a74892ae9120d045ee95cae7768732c /libavcodec | |
| parent | d382cc0fad1d4c9b321b13029e8be9caaed5f35d (diff) | |
| download | ffmpeg-streaming-844799b033d6ebfa4bf8a1415bc63baae8e79827.zip ffmpeg-streaming-844799b033d6ebfa4bf8a1415bc63baae8e79827.tar.gz | |
vp9: invert order of two conditions.
This makes it equal to row-based loopfilter code, and also makes the
chroma/luma code identical.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vp9.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 64c95fa..62d0c32 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -3309,11 +3309,11 @@ static void loopfilter_sb(AVCodecContext *ctx, struct VP9Filter *lflvl, unsigned hm = hm1 | hm2 | hm13 | hm23; for (x = 1; hm & ~(x - 1); x <<= 1, ptr += 8, l++) { - if (hm1 & x) { - int L = *l, H = L >> 4; - int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L]; + if (col || x > 1) { + if (hm1 & x) { + int L = *l, H = L >> 4; + int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L]; - if (col || x > 1) { if (hmask1[0] & x) { if (hmask2[0] & x) { av_assert2(l[8] == L); @@ -3333,12 +3333,10 @@ static void loopfilter_sb(AVCodecContext *ctx, struct VP9Filter *lflvl, s->dsp.loop_filter_8[!!(hmask1[1] & x)] [0](ptr, ls_y, E, I, H); } - } - } else if (hm2 & x) { - int L = l[8], H = L >> 4; - int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L]; + } else if (hm2 & x) { + int L = l[8], H = L >> 4; + int E = s->filter.mblim_lut[L], I = s->filter.lim_lut[L]; - if (col || x > 1) { s->dsp.loop_filter_8[!!(hmask2[1] & x)] [0](ptr + 8 * ls_y, ls_y, E, I, H); } |
