[FFmpeg-cvslog] avcodec/cuviddec: properly take deinterlacing and display delay into account for buffer_full check

[Timo Rothenpieler]

ffmpeg | branch: release/3.4 | Timo Rothenpieler <timo at rothenpieler.org> | Sat Oct 13 23:44:30 2018 +0200| [e225db5d758ccad0fd84bfa0649f77385faafd44] | committer: Timo Rothenpieler

avcodec/cuviddec: properly take deinterlacing and display delay into account for buffer_full check

Signed-off-by: Timo Rothenpieler <timo at rothenpieler.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e225db5d758ccad0fd84bfa0649f77385faafd44
---

 libavcodec/cuvid.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c
index 2ba8e00c6a..68671f0ecc 100644
--- a/libavcodec/cuvid.c
+++ b/libavcodec/cuvid.c
@@ -373,7 +373,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)