From 7bcbfae87c9039ebb01f7287403bf5666ca8d64e Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 30 Jul 2023 17:36:06 +0200 Subject: [PATCH] frontends/va: Ignore requested size when creating VAEncCodedBufferType The buffer data is not directly accessible to application and it's internally used to only store VACodedBufferSegment struct. Ignore the size requested by application and instead allocate sizeof(VACodedBufferSegment). Use calloc to zero out the struct. This can save significant amount of memory, for example FFmpeg will request up to tens of MB for single buffer. Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6462 Reviewed-by: Thong Thai Part-of: --- src/gallium/frontends/va/buffer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/frontends/va/buffer.c b/src/gallium/frontends/va/buffer.c index 6d40add..ffe1658 100644 --- a/src/gallium/frontends/va/buffer.c +++ b/src/gallium/frontends/va/buffer.c @@ -57,7 +57,11 @@ vlVaCreateBuffer(VADriverContextP ctx, VAContextID context, VABufferType type, buf->type = type; buf->size = size; buf->num_elements = num_elements; - buf->data = MALLOC(size * num_elements); + + if (buf->type == VAEncCodedBufferType) + buf->data = CALLOC(1, sizeof(VACodedBufferSegment)); + else + buf->data = MALLOC(size * num_elements); if (!buf->data) { FREE(buf); @@ -172,7 +176,6 @@ vlVaMapBuffer(VADriverContextP ctx, VABufferID buf_id, void **pbuff) if (buf->type == VAEncCodedBufferType) { ((VACodedBufferSegment*)buf->data)->buf = *pbuff; ((VACodedBufferSegment*)buf->data)->size = buf->coded_size; - ((VACodedBufferSegment*)buf->data)->next = NULL; *pbuff = buf->data; } } else { -- 2.7.4