virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

lavc/vaapi_encode*: handle frame durations and AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE

Browse Source 
Except for the mjpeg_vaapi encoder, which is already handled
generically.
This commit is contained in:
Anton Khirnov 2023-01-04 18:11:19 +01:00
parent c44a3dba9e
commit fbdba9a1a6
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vaapi_encode.c
View File

@ -695,6 +695,7 @@ static int vaapi_encode_output(AVCodecContext *avctx,
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
pkt->pts = pic->pts; pkt->pts = pic->pts;
pkt->duration = pic->input_image->duration;
vas = vaUnmapBuffer(ctx->hwctx->display, pic->output_buffer); vas = vaUnmapBuffer(ctx->hwctx->display, pic->output_buffer);
if (vas != VA_STATUS_SUCCESS) { if (vas != VA_STATUS_SUCCESS) {
@ -704,6 +705,13 @@ static int vaapi_encode_output(AVCodecContext *avctx,
goto fail; goto fail;
} }
// 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;
}
av_buffer_unref(&pic->output_buffer_ref); av_buffer_unref(&pic->output_buffer_ref);
pic->output_buffer = VA_INVALID_ID; pic->output_buffer = VA_INVALID_ID;

2
libavcodec/vaapi_encode_h264.c
View File

@ -1361,7 +1361,7 @@ const FFCodec ff_h264_vaapi_encoder = {
.close = &vaapi_encode_h264_close, .close = &vaapi_encode_h264_close,
.p.priv_class = &vaapi_encode_h264_class, .p.priv_class = &vaapi_encode_h264_class,
.p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
AV_CODEC_CAP_DR1, AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP, FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_h264_defaults, .defaults = vaapi_encode_h264_defaults,

2
libavcodec/vaapi_encode_h265.c
View File

@ -1487,7 +1487,7 @@ const FFCodec ff_hevc_vaapi_encoder = {
.close = &vaapi_encode_h265_close, .close = &vaapi_encode_h265_close,
.p.priv_class = &vaapi_encode_h265_class, .p.priv_class = &vaapi_encode_h265_class,
.p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
AV_CODEC_CAP_DR1, AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP, FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_h265_defaults, .defaults = vaapi_encode_h265_defaults,

2
libavcodec/vaapi_encode_mpeg2.c
View File

@ -698,7 +698,7 @@ const FFCodec ff_mpeg2_vaapi_encoder = {
.close = &vaapi_encode_mpeg2_close, .close = &vaapi_encode_mpeg2_close,
.p.priv_class = &vaapi_encode_mpeg2_class, .p.priv_class = &vaapi_encode_mpeg2_class,
.p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
AV_CODEC_CAP_DR1, AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP, FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_mpeg2_defaults, .defaults = vaapi_encode_mpeg2_defaults,

2
libavcodec/vaapi_encode_vp8.c
View File

@ -253,7 +253,7 @@ const FFCodec ff_vp8_vaapi_encoder = {
.close = &ff_vaapi_encode_close, .close = &ff_vaapi_encode_close,
.p.priv_class = &vaapi_encode_vp8_class, .p.priv_class = &vaapi_encode_vp8_class,
.p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
AV_CODEC_CAP_DR1, AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP, FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_vp8_defaults, .defaults = vaapi_encode_vp8_defaults,

2
libavcodec/vaapi_encode_vp9.c
View File

@ -308,7 +308,7 @@ const FFCodec ff_vp9_vaapi_encoder = {
.close = &ff_vaapi_encode_close, .close = &ff_vaapi_encode_close,
.p.priv_class = &vaapi_encode_vp9_class, .p.priv_class = &vaapi_encode_vp9_class,
.p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
AV_CODEC_CAP_DR1, AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP, FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_vp9_defaults, .defaults = vaapi_encode_vp9_defaults,