virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avfilter/vf_ssim: fix temp size calculation

Browse Source 
Also use av_mallocz_array.
Fix Ticket6519.

Reviewed-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
(cherry picked from commit f2d23ec03f28c6233059687c65a9124f65f8c312)
This commit is contained in:
Muhammad Faiz 2017-08-03 07:59:09 +07:00
parent afa34cb36e
commit eadb52d459
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_ssim.c
View File

@ -147,6 +147,8 @@ static float ssim_endn(const int (*sum0)[4], const int (*sum1)[4], int width)
return ssim; return ssim;
} }
#define SUM_LEN(w) (((w) >> 2) + 3)
static float ssim_plane(SSIMDSPContext *dsp, static float ssim_plane(SSIMDSPContext *dsp,
uint8_t *main, int main_stride, uint8_t *main, int main_stride,
uint8_t *ref, int ref_stride, uint8_t *ref, int ref_stride,
@ -155,7 +157,7 @@ static float ssim_plane(SSIMDSPContext *dsp,
int z = 0, y; int z = 0, y;
float ssim = 0.0; float ssim = 0.0;
int (*sum0)[4] = temp; int (*sum0)[4] = temp;
int (*sum1)[4] = sum0 + (width >> 2) + 3; int (*sum1)[4] = sum0 + SUM_LEN(width);
width >>= 2; width >>= 2;
height >>= 2; height >>= 2;
@ -297,7 +299,7 @@ static int config_input_ref(AVFilterLink *inlink)
for (i = 0; i < s->nb_components; i++) for (i = 0; i < s->nb_components; i++)
s->coefs[i] = (double) s->planeheight[i] * s->planewidth[i] / sum; s->coefs[i] = (double) s->planeheight[i] * s->planewidth[i] / sum;
s->temp = av_malloc((2 * inlink->w + 12) * sizeof(*s->temp)); s->temp = av_mallocz_array(2 * SUM_LEN(inlink->w), sizeof(int[4]));
if (!s->temp) if (!s->temp)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);