har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ssim: refactor a weird double loop.

Browse Source 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Ronald S. Bultje 2015-07-11 19:55:58 -04:00 committed by Michael Niedermayer
parent 4496ccc724
commit a1f4848049
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_ssim.c
View File

@ -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)); / ((float)(fs1 * fs1 + fs2 * fs2 + ssim_c1) * (float)(vars + ssim_c2));
} }
static float ssim_end4(int sum0[5][4], int sum1[5][4], int width) static float ssim_endn(int (*sum0)[4], int (*sum1)[4], int width)
{ {
float ssim = 0.0; float ssim = 0.0;
int i; int i;
@ -167,8 +167,7 @@ static float ssim_plane(uint8_t *main, int main_stride,
&sum0[x]); &sum0[x]);
} }
for (x = 0; x < width - 1; x += 4) ssim += ssim_endn(sum0, sum1, width - 1);
ssim += ssim_end4(sum0 + x, sum1 + x, FFMIN(4, width - x - 1));
} }
return ssim / ((height - 1) * (width - 1)); return ssim / ((height - 1) * (width - 1));