lavc/vaapi_decode: Use dynamic frame pool if possible

libva2 doesn't require a fixed surface-array any more, so we may use
dynamic frame pool for decoding when libva2 is available, which allows a
downstream element stores more frames from VAAPI decoders and fixes the
error below:

$ ffmpeg -hwaccel vaapi -hwaccel_output_format vaapi \
-i input.mp4 -c:v hevc_vaapi -f null -
...
[h264 @ 0x557a075a1400] get_buffer() failed
[h264 @ 0x557a075a1400] thread_get_buffer() failed
[h264 @ 0x557a075a1400] decode_slice_header error
[h264 @ 0x557a075a1400] no frame!

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
This commit is contained in:
Haihao Xiang 2024-03-26 15:19:13 +08:00
parent 1abba59738
commit 41e3d36a39

View File

@ -599,6 +599,9 @@ static int vaapi_decode_make_config(AVCodecContext *avctx,
if (err < 0) if (err < 0)
goto fail; goto fail;
if (CONFIG_VAAPI_1)
frames->initial_pool_size = 0;
else {
frames->initial_pool_size = 1; frames->initial_pool_size = 1;
// Add per-codec number of surfaces used for storing reference frames. // Add per-codec number of surfaces used for storing reference frames.
switch (avctx->codec_id) { switch (avctx->codec_id) {
@ -617,6 +620,7 @@ static int vaapi_decode_make_config(AVCodecContext *avctx,
frames->initial_pool_size += 2; frames->initial_pool_size += 2;
} }
} }
}
av_hwframe_constraints_free(&constraints); av_hwframe_constraints_free(&constraints);
av_freep(&hwconfig); av_freep(&hwconfig);