virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vulkan_h264: fix long-term ref handling

Browse Source 
h->long_ref isn't guaranteed to be contiguously filled. Use the approach
from both vaapi_h264 and vdpau_h264 which goes through the 16 frames in
h->long_ref to find the LTR entries.

Fixes MR2_MW_A.264 from JVT-AVC_V1.

(cherry picked from commit 4536de3769)
This commit is contained in:
Benjamin Cheng 2023-10-13 15:10:55 -04:00 committed by Lynne
parent 1cff6e41bf
commit 116cb346e3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/vulkan_h264.c
View File

@ -406,10 +406,14 @@ static int vk_h264_start_frame(AVCodecContext *avctx,
}
/* Fill in long-term refs */
for (int r = 0, i = h->short_ref_count; i < h->short_ref_count + h->long_ref_count; i++, r++) {
for (int r = 0, i = h->short_ref_count; r < H264_MAX_DPB_FRAMES &&
i < h->short_ref_count + h->long_ref_count; r++) {
if (!h->long_ref[r])
continue;
dpb_slot_index = 0;
for (unsigned slot = 0; slot < H264_MAX_PICTURE_COUNT; slot++) {
if (h->long_ref[i] == &h->DPB[slot]) {
for (unsigned slot = 0; slot < 16; slot++) {
if (h->long_ref[r] == &h->DPB[slot]) {
dpb_slot_index = slot;
break;
}
@ -422,6 +426,7 @@ static int vk_h264_start_frame(AVCodecContext *avctx,
dpb_slot_index);
if (err < 0)
return err;
i++;
}
hp->h264pic = (StdVideoDecodeH264PictureInfo) {