virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity

avcodec/h264dec: Handle non-recovered frames when draining

Browse Source 
When starting on a SEI recovery point close enough to the end of
the stream that draining starts before the recovery point's frame
is output, there can be non-recovered frames in the delayed picture
buffer that would currently cause the decoder to fail to output a
frame. This commit skips such frames and outputs the first recovered
frame, if there exists one.

Signed-off-by: arch1t3cht <arch1t3cht@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
arch1t3cht 2024-03-28 02:56:38 +01:00 committed by Derek Buitenhuis
parent 5a856ac6e6
commit 728ffe6ca6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264dec.c
View File

@ -994,11 +994,13 @@ static int send_next_delayed_frame(H264Context *h, AVFrame *dst_frame,
int *got_frame, int buf_index) int *got_frame, int buf_index)
{ {
int ret, i, out_idx; int ret, i, out_idx;
H264Picture *out = h->delayed_pic[0]; H264Picture *out;
h->cur_pic_ptr = NULL; h->cur_pic_ptr = NULL;
h->first_field = 0; h->first_field = 0;
while (h->delayed_pic[0]) {
out = h->delayed_pic[0];
out_idx = 0; out_idx = 0;
for (i = 1; for (i = 1;
h->delayed_pic[i] && h->delayed_pic[i] &&
@ -1021,6 +1023,9 @@ static int send_next_delayed_frame(H264Context *h, AVFrame *dst_frame,
ret = finalize_frame(h, dst_frame, out, got_frame); ret = finalize_frame(h, dst_frame, out, got_frame);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (*got_frame)
break;
}
} }
return buf_index; return buf_index;