virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

vulkan_vp9: Fix frame threading

Browse Source 
The original cleanup of frame_id_alloc_mask was done in free_frame_priv
which may be called after the start_frame for the next few frames,
causing the frame_id slots to be exhausted. Instead, decide the in-use
frame_id slots by checking the frame_id present in the DPB as we need it.
This commit is contained in:
Benjamin Cheng
2025-08-08 08:42:57 -04:00
committed by Lynne
parent 814dd634e0
commit 4042609dcf
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/vulkan_vp9.c
View File

@@ -110,6 +110,7 @@ static int vk_vp9_start_frame(AVCodecContext *avctx,
int err;
int ref_count = 0;
const VP9SharedContext *s = avctx->priv_data;
uint32_t frame_id_alloc_mask = 0;
const VP9Frame *pic = &s->frames[CUR_FRAME];
FFVulkanDecodeContext *dec = avctx->internal->hwaccel_priv_data;
@@ -118,17 +119,24 @@ static int vk_vp9_start_frame(AVCodecContext *avctx,
VP9VulkanDecodePicture *ap = pic->hwaccel_picture_private;
FFVulkanDecodePicture *vp = &ap->vp;
/* Use the current frame_ids in ref_frames[] to decide occupied frame_ids */
for (int i = 0; i < STD_VIDEO_VP9_NUM_REF_FRAMES; i++) {
const VP9VulkanDecodePicture* rp = s->ref_frames[i].hwaccel_picture_private;
if (rp)
frame_id_alloc_mask |= 1 << rp->frame_id;
}
if (!ap->frame_id_set) {
unsigned slot_idx = 0;
for (unsigned i = 0; i < 32; i++) {
if (!(dec->frame_id_alloc_mask & (1 << i))) {
if (!(frame_id_alloc_mask & (1 << i))) {
slot_idx = i;
break;
}
}
ap->frame_id = slot_idx;
ap->frame_id_set = 1;
dec->frame_id_alloc_mask |= (1 << slot_idx);
frame_id_alloc_mask |= (1 << slot_idx);
}
for (int i = 0; i < STD_VIDEO_VP9_REFS_PER_FRAME; i++) {
@@ -338,10 +346,6 @@ static void vk_vp9_free_frame_priv(AVRefStructOpaque _hwctx, void *data)
AVHWDeviceContext *hwctx = _hwctx.nc;
VP9VulkanDecodePicture *ap = data;
/* Workaround for a spec issue. */
if (ap->frame_id_set)
ap->dec->frame_id_alloc_mask &= ~(1 << ap->frame_id);
/* Free frame resources, this also destroys the session parameters. */
ff_vk_decode_free_frame(hwctx, &ap->vp);
}
@@ -362,5 +366,5 @@ const FFHWAccel ff_vp9_vulkan_hwaccel = {
.uninit = &ff_vk_decode_uninit,
.frame_params = &ff_vk_frame_params,
.priv_data_size = sizeof(FFVulkanDecodeContext),
.caps_internal = HWACCEL_CAP_ASYNC_SAFE,
.caps_internal = HWACCEL_CAP_ASYNC_SAFE | HWACCEL_CAP_THREAD_SAFE,
};