RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_ssim: fix temp size calculation 

Also use av_mallocz_array.
Fix Ticket6519.

Reviewed-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
This commit is contained in:
Muhammad Faiz 2017-08-03 07:59:09 +07:00
parent 3407d8118c
commit f2d23ec03f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_ssim.c
View File

@ -219,6 +219,8 @@ static float ssim_endn_8bit(const int (*sum0)[4], const int (*sum1)[4], int widt
return ssim; return ssim;
} }
#define SUM_LEN(w) (((w) >> 2) + 3)
static float ssim_plane_16bit(SSIMDSPContext *dsp, static float ssim_plane_16bit(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,
@ -228,7 +230,7 @@ static float ssim_plane_16bit(SSIMDSPContext *dsp,
int z = 0, y; int z = 0, y;
float ssim = 0.0; float ssim = 0.0;
int64_t (*sum0)[4] = temp; int64_t (*sum0)[4] = temp;
int64_t (*sum1)[4] = sum0 + (width >> 2) + 3; int64_t (*sum1)[4] = sum0 + SUM_LEN(width);
width >>= 2; width >>= 2;
height >>= 2; height >>= 2;
@ -256,7 +258,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;
@ -402,7 +404,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_array((2 * inlink->w + 12), sizeof(*s->temp) * (1 + (desc->comp[0].depth > 8))); s->temp = av_mallocz_array(2 * SUM_LEN(inlink->w), (desc->comp[0].depth > 8) ? sizeof(int64_t[4]) : sizeof(int[4]));
if (!s->temp) if (!s->temp)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->max = (1 << desc->comp[0].depth) - 1; s->max = (1 << desc->comp[0].depth) - 1;