git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4496ccc
)
ssim: refactor a weird double loop.
author
Ronald S. Bultje
<rsbultje@gmail.com>
Sat, 11 Jul 2015 23:55:58 +0000
(19:55 -0400)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Mon, 13 Jul 2015 00:23:30 +0000
(
02:23
+0200)
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavfilter/vf_ssim.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_ssim.c
b/libavfilter/vf_ssim.c
index
40c70b8
..
b1c3368
100644
(file)
--- a/
libavfilter/vf_ssim.c
+++ b/
libavfilter/vf_ssim.c
@@
-132,7
+132,7
@@
static float ssim_end1(int s1, int s2, int ss, int s12)
/ ((float)(fs1 * fs1 + fs2 * fs2 + ssim_c1) * (float)(vars + ssim_c2));
}
-static float ssim_end
4(int sum0[5][4], int sum1[5]
[4], int width)
+static float ssim_end
n(int (*sum0)[4], int (*sum1)
[4], int width)
{
float ssim = 0.0;
int i;
@@
-167,8
+167,7
@@
static float ssim_plane(uint8_t *main, int main_stride,
&sum0[x]);
}
- for (x = 0; x < width - 1; x += 4)
- ssim += ssim_end4(sum0 + x, sum1 + x, FFMIN(4, width - x - 1));
+ ssim += ssim_endn(sum0, sum1, width - 1);
}
return ssim / ((height - 1) * (width - 1));