diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-11-08 23:50:04 +0000 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-11-09 00:05:48 +0000 |
| commit | 3228ac730c11eca49d5680d5550128e397061c85 (patch) | |
| tree | d1d58e831e225462a2d4a0be00ecc31803a9f433 /libavcodec/vc2enc.c | |
| parent | 69218b41980883a7e75656f3058171939f5729ef (diff) | |
| download | ffmpeg-3228ac730c11eca49d5680d5550128e397061c85.tar.gz | |
vc2enc_dwt: pad the temporary buffer by the slice size
Since non-Haar wavelets need to look into pixels outside the frame, we
need to pad the buffer. The old factor of two seemed to be a workaround
that fact and only padded to the left and bottom. This correctly pads
by the slice size and as such reduces memory usage and potential
exploits.
Reported by Liu Bingchang.
Ideally, there should be no temporary buffer but the encoder is designed
to deinterleave the coefficients into the classical wavelet structure
with the lower frequency values in the top left corner.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec/vc2enc.c')
| -rw-r--r-- | libavcodec/vc2enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index fa4ff54a3c..0a8c3633ef 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -1192,7 +1192,8 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) /* DWT init */ if (ff_vc2enc_init_transforms(&s->transform_args[i].t, s->plane[i].coef_stride, - s->plane[i].dwt_height)) + s->plane[i].dwt_height, + s->slice_width, s->slice_height)) goto alloc_fail; } |