RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-03 05:22:10 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/vvc: Don't use large array on stack

Browse Source 
tmp_array in dmvr_hv takes 33024 bytes on stack, which can be
dangerous.
This commit is contained in:
Zhao Zhili 2024-09-22 11:39:14 +08:00 committed by Nuo Mi
parent 5988a2729b
commit 240c16bbc6
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libavcodec/vvc/inter_template.c
View File

@ -472,6 +472,9 @@ static void FUNC(apply_bdof)(uint8_t *_dst, const ptrdiff_t _dst_stride, const i
(filter[0] * src[x] + \ (filter[0] * src[x] + \
filter[1] * src[x + stride]) filter[1] * src[x + stride])
#define DMVR_FILTER2(filter, src0, src1) \
(filter[0] * src0 + filter[1] * src1)
//8.5.3.2.2 Luma sample bilinear interpolation process //8.5.3.2.2 Luma sample bilinear interpolation process
static void FUNC(dmvr)(int16_t *dst, const uint8_t *_src, const ptrdiff_t _src_stride, static void FUNC(dmvr)(int16_t *dst, const uint8_t *_src, const ptrdiff_t _src_stride,
const int height, const intptr_t mx, const intptr_t my, const int width) const int height, const intptr_t mx, const intptr_t my, const int width)
@ -541,31 +544,31 @@ static void FUNC(dmvr_v)(int16_t *dst, const uint8_t *_src, const ptrdiff_t _src
static void FUNC(dmvr_hv)(int16_t *dst, const uint8_t *_src, const ptrdiff_t _src_stride, static void FUNC(dmvr_hv)(int16_t *dst, const uint8_t *_src, const ptrdiff_t _src_stride,
const int height, const intptr_t mx, const intptr_t my, const int width) const int height, const intptr_t mx, const intptr_t my, const int width)
{ {
int16_t tmp_array[(MAX_PB_SIZE + BILINEAR_EXTRA) * MAX_PB_SIZE]; int16_t tmp_array[MAX_PB_SIZE * 2];
int16_t *tmp = tmp_array; int16_t *tmp0 = tmp_array;
int16_t *tmp1 = tmp_array + MAX_PB_SIZE;
const pixel *src = (const pixel*)_src; const pixel *src = (const pixel*)_src;
const ptrdiff_t src_stride = _src_stride / sizeof(pixel); const ptrdiff_t src_stride = _src_stride / sizeof(pixel);
const int8_t *filter = ff_vvc_inter_luma_dmvr_filters[mx]; const int8_t *filter_x = ff_vvc_inter_luma_dmvr_filters[mx];
const int8_t *filter_y = ff_vvc_inter_luma_dmvr_filters[my];
const int shift1 = BIT_DEPTH - 6; const int shift1 = BIT_DEPTH - 6;
const int offset1 = 1 << (shift1 - 1); const int offset1 = 1 << (shift1 - 1);
const int shift2 = 4; const int shift2 = 4;
const int offset2 = 1 << (shift2 - 1); const int offset2 = 1 << (shift2 - 1);
src -= BILINEAR_EXTRA_BEFORE * src_stride; src -= BILINEAR_EXTRA_BEFORE * src_stride;
for (int y = 0; y < height + BILINEAR_EXTRA; y++) { for (int x = 0; x < width; x++)
for (int x = 0; x < width; x++) tmp0[x] = (DMVR_FILTER2(filter_x, src[x], src[x + 1]) + offset1) >> shift1;
tmp[x] = (DMVR_FILTER(src, 1) + offset1) >> shift1; src += src_stride;
src += src_stride;
tmp += MAX_PB_SIZE;
}
tmp = tmp_array + BILINEAR_EXTRA_BEFORE * MAX_PB_SIZE; for (int y = 1; y < height + BILINEAR_EXTRA; y++) {
filter = ff_vvc_inter_luma_dmvr_filters[my]; for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) { tmp1[x] = (DMVR_FILTER2(filter_x, src[x], src[x + 1]) + offset1) >> shift1;
for (int x = 0; x < width; x++) dst[x] = (DMVR_FILTER2(filter_y, tmp0[x], tmp1[x]) + offset2) >> shift2;
dst[x] = (DMVR_FILTER(tmp, MAX_PB_SIZE) + offset2) >> shift2; }
tmp += MAX_PB_SIZE; src += src_stride;
dst += MAX_PB_SIZE; dst += MAX_PB_SIZE;
FFSWAP(int16_t *, tmp0, tmp1);
} }
} }