MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc/vaapi_encode: grow packet if vaMapBuffer returns multiple buffers 

Currently, assigning new buffer for pkt when multiple buffers were returned
from vaMapBuffer will overwrite the previous encoded pkt data and lead
to encode issues.

Iterate through the buf_list first to find out the total buffer size
needed for the pkt, allocate the whole pkt to avoid repeated reallocation
and memcpy, then copy data from each buf to pkt.

Signed-off-by: Linjie Fu <linjie.fu@intel.com>
This commit is contained in:
Linjie Fu 2019-05-30 20:34:31 -04:00 committed by Ruiling Song
parent 2e2dfe6673
commit efefba61f8
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/vaapi_encode.c
View File

@ -579,6 +579,8 @@ static int vaapi_encode_output(AVCodecContext *avctx,
VAAPIEncodeContext *ctx = avctx->priv_data;
VACodedBufferSegment *buf_list, *buf;
VAStatus vas;
int total_size = 0;
uint8_t *ptr;
int err;
err = vaapi_encode_wait(avctx, pic);
@ -595,15 +597,21 @@ static int vaapi_encode_output(AVCodecContext *avctx,
goto fail;
}
for (buf = buf_list; buf; buf = buf->next)
total_size += buf->size;
err = av_new_packet(pkt, total_size);
ptr = pkt->data;
if (err < 0)
goto fail_mapped;
for (buf = buf_list; buf; buf = buf->next) {
av_log(avctx, AV_LOG_DEBUG, "Output buffer: %u bytes "
"(status %08x).\n", buf->size, buf->status);
err = av_new_packet(pkt, buf->size);
if (err < 0)
goto fail_mapped;
memcpy(pkt->data, buf->buf, buf->size);
memcpy(ptr, buf->buf, buf->size);
ptr += buf->size;
}
if (pic->type == PICTURE_TYPE_IDR)