RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 17:32:06 +00:00
Code Issues Projects Releases Wiki Activity

lavc/vaapi_encode: fix propagating durations and opaques

Browse Source 
input_image is freed by the time the output packet is constructed, so we
need to store copies in VAAPIEncodePicture.
This commit is contained in:
Anton Khirnov 2023-01-31 14:14:47 +01:00 committed by Haihao Xiang
parent f4b4e16641
commit 7d49fef8b4
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/vaapi_encode.c
View File

@ -695,7 +695,7 @@ static int vaapi_encode_output(AVCodecContext *avctx,
pkt->flags |= AV_PKT_FLAG_KEY;
pkt->pts = pic->pts;
pkt->duration = pic->input_image->duration;
pkt->duration = pic->duration;
vas = vaUnmapBuffer(ctx->hwctx->display, pic->output_buffer);
if (vas != VA_STATUS_SUCCESS) {
@ -706,10 +706,11 @@ static int vaapi_encode_output(AVCodecContext *avctx,
}
// for no-delay encoders this is handled in generic codec
if (avctx->codec->capabilities & AV_CODEC_CAP_DELAY) {
err = ff_encode_reordered_opaque(avctx, pkt, pic->input_image);
if (err < 0)
goto fail;
if (avctx->codec->capabilities & AV_CODEC_CAP_DELAY &&
avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
pkt->opaque = pic->opaque;
pkt->opaque_ref = pic->opaque_ref;
pic->opaque_ref = NULL;
}
av_buffer_unref(&pic->output_buffer_ref);
@ -785,6 +786,8 @@ static int vaapi_encode_free(AVCodecContext *avctx,
av_frame_free(&pic->input_image);
av_frame_free(&pic->recon_image);
av_buffer_unref(&pic->opaque_ref);
av_freep(&pic->param_buffers);
av_freep(&pic->slices);
// Output buffer should already be destroyed.
@ -1152,6 +1155,15 @@ static int vaapi_encode_send_frame(AVCodecContext *avctx, AVFrame *frame)
pic->input_surface = (VASurfaceID)(uintptr_t)frame->data[3];
pic->pts = frame->pts;
pic->duration = frame->duration;
if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
err = av_buffer_replace(&pic->opaque_ref, frame->opaque_ref);
if (err < 0)
goto fail;
pic->opaque = frame->opaque;
}
av_frame_move_ref(pic->input_image, frame);

4
libavcodec/vaapi_encode.h
View File

@ -75,8 +75,12 @@ typedef struct VAAPIEncodePicture {
int64_t display_order;
int64_t encode_order;
int64_t pts;
int64_t duration;
int force_idr;
void *opaque;
AVBufferRef *opaque_ref;
#if VA_CHECK_VERSION(1, 0, 0)
// ROI regions.
VAEncROI *roi;