virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/vf_convolve: fix convolution of borders

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-12-24 10:15:26 +01:00
parent 9e5e3236f4
commit 175122fcd5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/vf_convolve.c
View File

@ -121,16 +121,16 @@ static int config_input_main(AVFilterLink *inlink)
s->fft_bits[i] = fft_bits + 1; s->fft_bits[i] = fft_bits + 1;
s->fft_len[i] = 1 << s->fft_bits[i]; s->fft_len[i] = 1 << s->fft_bits[i];
if (!(s->fft_hdata[i] = av_calloc(s->fft_len[i], s->fft_len[i] * sizeof(FFTComplex)))) if (!(s->fft_hdata[i] = av_calloc(s->fft_len[i], (s->fft_len[i] + 1) * sizeof(FFTComplex))))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (!(s->fft_vdata[i] = av_calloc(s->fft_len[i], s->fft_len[i] * sizeof(FFTComplex)))) if (!(s->fft_vdata[i] = av_calloc(s->fft_len[i], (s->fft_len[i] + 1) * sizeof(FFTComplex))))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (!(s->fft_hdata_impulse[i] = av_calloc(s->fft_len[i], s->fft_len[i] * sizeof(FFTComplex)))) if (!(s->fft_hdata_impulse[i] = av_calloc(s->fft_len[i], (s->fft_len[i] + 1)* sizeof(FFTComplex))))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (!(s->fft_vdata_impulse[i] = av_calloc(s->fft_len[i], s->fft_len[i] * sizeof(FFTComplex)))) if (!(s->fft_vdata_impulse[i] = av_calloc(s->fft_len[i], (s->fft_len[i] + 1) * sizeof(FFTComplex))))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -321,6 +321,9 @@ static int do_convolve(FFFrameSync *fs)
} }
for (y = 0; y < n; y++) { for (y = 0; y < n; y++) {
s->fft_vdata[plane][y*n + n].re = s->fft_vdata[plane][y*n + 0].im;
s->fft_vdata[plane][y*n + 0].im = 0;
for (x = 0; x < n; x++) { for (x = 0; x < n; x++) {
FFTSample re, im, ire, iim; FFTSample re, im, ire, iim;
@ -332,6 +335,8 @@ static int do_convolve(FFFrameSync *fs)
s->fft_vdata[plane][y*n + x].re = ire * re - iim * im; s->fft_vdata[plane][y*n + x].re = ire * re - iim * im;
s->fft_vdata[plane][y*n + x].im = iim * re + ire * im; s->fft_vdata[plane][y*n + x].im = iim * re + ire * im;
} }
s->fft_vdata[plane][y*n + n].re = s->fft_vdata[plane][y*n + 0].im * s->fft_vdata_impulse[plane][y*n + 0].im;
s->fft_vdata[plane][y*n + 0].im = s->fft_vdata[plane][y*n + n].re;
} }
ifft_vertical(s, n, plane); ifft_vertical(s, n, plane);