diff options
| author | Muhammad Faiz <mfcc64@gmail.com> | 2017-08-03 07:59:09 +0700 |
|---|---|---|
| committer | Muhammad Faiz <mfcc64@gmail.com> | 2017-08-06 14:53:28 +0700 |
| commit | e51e07c34eb704453d88e84752ca95294060c09a (patch) | |
| tree | 2e1bb56892aec74a85fdbdec931dfcd8967adc78 | |
| parent | 9079c70d2095643af6954001d0627445650b85a6 (diff) | |
| download | ffmpeg-e51e07c34eb704453d88e84752ca95294060c09a.tar.gz | |
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>
(cherry picked from commit f2d23ec03f28c6233059687c65a9124f65f8c312)
| -rw-r--r-- | libavfilter/vf_ssim.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index cf925bd211..51328d8d38 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -219,6 +219,8 @@ static float ssim_endn_8bit(const int (*sum0)[4], const int (*sum1)[4], int widt return ssim; } +#define SUM_LEN(w) (((w) >> 2) + 3) + static float ssim_plane_16bit(SSIMDSPContext *dsp, uint8_t *main, int main_stride, uint8_t *ref, int ref_stride, @@ -228,7 +230,7 @@ static float ssim_plane_16bit(SSIMDSPContext *dsp, int z = 0, y; float ssim = 0.0; int64_t (*sum0)[4] = temp; - int64_t (*sum1)[4] = sum0 + (width >> 2) + 3; + int64_t (*sum1)[4] = sum0 + SUM_LEN(width); width >>= 2; height >>= 2; @@ -256,7 +258,7 @@ static float ssim_plane(SSIMDSPContext *dsp, int z = 0, y; float ssim = 0.0; int (*sum0)[4] = temp; - int (*sum1)[4] = sum0 + (width >> 2) + 3; + int (*sum1)[4] = sum0 + SUM_LEN(width); width >>= 2; height >>= 2; @@ -402,7 +404,7 @@ static int config_input_ref(AVFilterLink *inlink) for (i = 0; i < s->nb_components; i++) 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) return AVERROR(ENOMEM); s->max = (1 << desc->comp[0].depth) - 1; |