RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/framepool: align the frame buffers 

And not just the linesizes. Use the extra align bytes allocated for this purpose.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-11-09 11:20:59 -03:00
parent 6d5a0998b6
commit f15fc27db5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/framepool.c
View File

@ -139,7 +139,9 @@ FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(size_t size),
if (ret < 0) if (ret < 0)
goto fail; goto fail;
pool->pools[0] = av_buffer_pool_init(pool->linesize[0], NULL); if (pool->linesize[0] > SIZE_MAX - align)
goto fail;
pool->pools[0] = av_buffer_pool_init(pool->linesize[0] + align, NULL);
if (!pool->pools[0]) if (!pool->pools[0])
goto fail; goto fail;
@ -219,7 +221,7 @@ AVFrame *ff_frame_pool_get(FFFramePool *pool)
if (!frame->buf[i]) if (!frame->buf[i])
goto fail; goto fail;
frame->data[i] = frame->buf[i]->data; frame->data[i] = (uint8_t *)FFALIGN((uintptr_t)frame->buf[i]->data, pool->align);
} }
if (desc->flags & AV_PIX_FMT_FLAG_PAL) { if (desc->flags & AV_PIX_FMT_FLAG_PAL) {
@ -256,13 +258,15 @@ AVFrame *ff_frame_pool_get(FFFramePool *pool)
frame->buf[i] = av_buffer_pool_get(pool->pools[0]); frame->buf[i] = av_buffer_pool_get(pool->pools[0]);
if (!frame->buf[i]) if (!frame->buf[i])
goto fail; goto fail;
frame->extended_data[i] = frame->data[i] = frame->buf[i]->data; frame->extended_data[i] = frame->data[i] =
(uint8_t *)FFALIGN((uintptr_t)frame->buf[i]->data, pool->align);
} }
for (i = 0; i < frame->nb_extended_buf; i++) { for (i = 0; i < frame->nb_extended_buf; i++) {
frame->extended_buf[i] = av_buffer_pool_get(pool->pools[0]); frame->extended_buf[i] = av_buffer_pool_get(pool->pools[0]);
if (!frame->extended_buf[i]) if (!frame->extended_buf[i])
goto fail; goto fail;
frame->extended_data[i + AV_NUM_DATA_POINTERS] = frame->extended_buf[i]->data; frame->extended_data[i + AV_NUM_DATA_POINTERS] =
(uint8_t *)FFALIGN((uintptr_t)frame->extended_buf[i]->data, pool->align);
} }
break; break;