ffmpeg | branch: master | Timo Rothenpieler <t...@rothenpieler.org> | Sat Oct 13 23:44:30 2018 +0200| [19546cfef103bdc967b0e06ec35c96766e3febec] | committer: Timo Rothenpieler
avcodec/cuviddec: properly take deinterlacing and display delay into account for buffer_full check Signed-off-by: Timo Rothenpieler <t...@rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19546cfef103bdc967b0e06ec35c96766e3febec --- libavcodec/cuviddec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index 4d3caf924e..f21273c07e 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -378,7 +378,11 @@ static int cuvid_is_buffer_full(AVCodecContext *avctx) { CuvidContext *ctx = avctx->priv_data; - return (av_fifo_size(ctx->frame_queue) / sizeof(CuvidParsedFrame)) + 2 > ctx->nb_surfaces; + int delay = ctx->cuparseinfo.ulMaxDisplayDelay; + if (ctx->deint_mode != cudaVideoDeinterlaceMode_Weave && !ctx->drop_second_field) + delay *= 2; + + return (av_fifo_size(ctx->frame_queue) / sizeof(CuvidParsedFrame)) + delay >= ctx->nb_surfaces; } static int cuvid_decode_packet(AVCodecContext *avctx, const AVPacket *avpkt) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
