RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/libvpxenc: handle queue desync more gracefully 

If the packets returned by libvpx and our internal frame properties
queue get desynchronized for some reason (should not happen, but it is
not clear libvpx API guarantees this), we will keep adding to the queue
indefinitely and never remove anything.

Change the code to drain the queue even if timestamps do not match.
This commit is contained in:
Anton Khirnov 2023-02-28 12:53:35 +01:00
parent 62a241e505
commit 942fb48c38
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/libvpxenc.c
View File

@ -401,11 +401,16 @@ static int frame_data_apply(AVCodecContext *avctx, AVFifo *fifo, AVPacket *pkt)
{ {
FrameData fd; FrameData fd;
uint8_t *data; uint8_t *data;
int ret = 0;
if (av_fifo_peek(fifo, &fd, 1, 0) < 0) if (av_fifo_peek(fifo, &fd, 1, 0) < 0)
return 0; return 0;
if (fd.pts != pkt->pts) if (fd.pts != pkt->pts) {
return 0; av_log(avctx, AV_LOG_WARNING,
av_fifo_drain2(fifo, 1); "Mismatching timestamps: libvpx %"PRId64" queued %"PRId64"; "
"this is a bug, please report it\n", pkt->pts, fd.pts);
goto skip;
}
#if FF_API_REORDERED_OPAQUE #if FF_API_REORDERED_OPAQUE
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
@ -419,20 +424,22 @@ FF_ENABLE_DEPRECATION_WARNINGS
pkt->opaque_ref = fd.frame_opaque_ref; pkt->opaque_ref = fd.frame_opaque_ref;
fd.frame_opaque_ref = NULL; fd.frame_opaque_ref = NULL;
} }
av_buffer_unref(&fd.frame_opaque_ref);
if (fd.hdr10_plus) { if (fd.hdr10_plus) {
data = av_packet_new_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, fd.hdr10_plus->size); data = av_packet_new_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, fd.hdr10_plus->size);
if (!data) { if (!data) {
av_buffer_unref(&fd.hdr10_plus); ret = AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto skip;
} }
memcpy(data, fd.hdr10_plus->data, fd.hdr10_plus->size); memcpy(data, fd.hdr10_plus->data, fd.hdr10_plus->size);
av_buffer_unref(&fd.hdr10_plus);
} }
return 0; skip:
av_fifo_drain2(fifo, 1);
frame_data_uninit(&fd);
return ret;
} }
static av_cold int codecctl_int(AVCodecContext *avctx, static av_cold int codecctl_int(AVCodecContext *avctx,