highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
This commit is contained in:
Timo Rothenpieler
2018-10-13 23:44:30 +02:00
parent 40c4b9dad0
commit 19546cfef1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/cuviddec.c
View File

@@ -378,7 +378,11 @@ static int cuvid_is_buffer_full(AVCodecContext *avctx)
{ {
CuvidContext *ctx = avctx->priv_data; 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) static int cuvid_decode_packet(AVCodecContext *avctx, const AVPacket *avpkt)