diff options
author | James Almer <jamrial@gmail.com> | 2022-03-01 11:05:40 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2022-03-03 13:55:28 -0300 |
commit | 8fcd9d7375979baf2d09e97b36dd482b6210a999 (patch) | |
tree | 5bee15dfcdf23881a245a526791c9f996a0e0f00 /libavfilter | |
parent | 837c55da3deebe48639b8c6c2fe34c29609352d3 (diff) |
avfilter/framepool: use av_image_fill_plane_sizes() to calculate pool sizes
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/framepool.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c index 5b510c9af9..96bfe46319 100644 --- a/libavfilter/framepool.c +++ b/libavfilter/framepool.c @@ -57,6 +57,8 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size), int i, ret; FFFramePool *pool; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format); + ptrdiff_t linesizes[4]; + size_t sizes[4]; if (!desc) return NULL; @@ -89,13 +91,19 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size), } } - for (i = 0; i < 4 && pool->linesize[i]; i++) { - int h = pool->height; - if (i == 1 || i == 2) - h = AV_CEIL_RSHIFT(h, desc->log2_chroma_h); + for (i = 0; i < 4; i++) + linesizes[i] = pool->linesize[i]; - pool->pools[i] = av_buffer_pool_init(pool->linesize[i] * h + align, - alloc); + if (av_image_fill_plane_sizes(sizes, pool->format, + pool->height, + linesizes) < 0) { + goto fail; + } + + for (i = 0; i < 4 && sizes[i]; i++) { + if (sizes[i] > SIZE_MAX - align) + goto fail; + pool->pools[i] = av_buffer_pool_init(sizes[i] + align, alloc); if (!pool->pools[i]) goto fail; } |