From patchwork Fri Aug 11 17:16:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Random Joe X-Patchwork-Id: 43213 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c528:b0:130:ccc6:6c4b with SMTP id gm40csp20975pzb; Fri, 11 Aug 2023 10:16:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGD/Z9i3WaPxRnrajPkF9IhOc3TuOBTCPn4dVnVo/UVtF5gnGqvZcdfM7ZtVFwG4FOoAljj X-Received: by 2002:a05:6512:793:b0:4fb:9772:6639 with SMTP id x19-20020a056512079300b004fb97726639mr1807150lfr.6.1691774201003; Fri, 11 Aug 2023 10:16:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691774200; cv=none; d=google.com; s=arc-20160816; b=CD56W4ezwQO7/HOauVGQ47MH21IjbUK/R6vM71n9U0j7ZJM3NCU61xNFaj+W6wNWPp 5ed9brTe7C508s+Ne1utC3TqNhD5ybiw1016cDbXp2L9YW2Ywq0c+REJ7oLWY38i+/iM TSj03kztBws1aMp3N2LWK1WFTDCka1w2W3eBdUBrF+4PfsA28gUJlzuAkL75CndAJvKn eFEKuqtX089qTjgO7Dqg4fdZqJA10z2X15dltWRsKJiZUzWEmH7TtGr3MAQnWuv/Q9e9 rELMUIVqWOjwOvV6q8ex40m4RJPbErV3SwTqmHCpreXpOQx0FazyPCfVAWK10JGq9tgJ iAYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:message-id:date:from:mime-version :dkim-signature:delivered-to; bh=QZAmYtBkjetvYfByiQvxVZIyNwaW5jacRIgmiWK3n+g=; fh=d3v9Jjc1ani41IJ1iY1WVmidNt6UvrRhWh3IxTiNzjk=; b=QEO0d5Ujigs5qlNGQXn3geE+DuNpDHxXLj3X/zZMmDGQzkNLvhPl1BAx62zVk5PoPJ GV4S1UXYa9trOVRwmxpNHV4/yOaFB1WiHZKT94IsHkPl4fHHG6szG6FVPFQ10T51fpyc 4gvDSOcF1IAl2p1yQFhZe+JFVTqtWHI5P0a4adwRLqQvEfhcKihm3ONNpsltB5Nigng0 DhcJ3k7W90sU8GRAJw71hyvMB/30hvVpV45sykemWc/1XFI048PJymjp2dCfmBuonRkh 3bDQzogV1cR5ijyNhnxUfxN7KvtCTLyEU0F9SJ34pYLczG3KaAdiANEUW3vmm82qL94k zvGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Q06M4z+2; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h24-20020aa7c618000000b00522563f375esi3729928edq.258.2023.08.11.10.16.40; Fri, 11 Aug 2023 10:16:40 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Q06M4z+2; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B6E468C8D9; Fri, 11 Aug 2023 20:16:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCCB768C894 for ; Fri, 11 Aug 2023 20:16:22 +0300 (EEST) Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-3a74d759be4so1936983b6e.2 for ; Fri, 11 Aug 2023 10:16:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691774181; x=1692378981; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=pXFoLaoFNKoZNOcKmqUm+oC9Yn7mcXb39WsrGjIlcz0=; b=Q06M4z+2Wwn+RqTjzexfumGy6MYNGLnthfHSGgV909tXsOTCe/YksvUEUxXp7anlAh OhRXFHeaFZ/TTLfZJVGAbJcLEQKCx2FvSQKwySsBn3njgN51PXNoy/6oTDDcSxIZsNcb SYRHOW4FoOCAWclQVDQDXi4CHDxXu9VkmFGDeDsRkO3pYHWxUmKOhMN4G5HFrfYW3T8A QWNRAuMoPvMjpyaPlXdMTwBVQu6H7iWmM+mb/PGdXncaaf5SjijB9qY4m/xwSlNO7nvK b1oVpRAhMfxw5Mkge8OZE96sr03n2jr60ha29sqCBJTfJEg/SqZ91Tfnq6W53eWI3K0z +X9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691774181; x=1692378981; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pXFoLaoFNKoZNOcKmqUm+oC9Yn7mcXb39WsrGjIlcz0=; b=dIASInc5W0Q62IKDZRMQ+OB8Qq5HvOVpWNlHEzUfsivxvZie58yG8CABMkA3ugBt9w amVUuBeZaZ8JYvE5N/RRUQrPqdGdEsPrk4wsoykCHM67PqMMPlQiy4aDqEKjym+0MWs9 GmPtBhMx1kxOYYKG4SokT55o8LLC8HXa3xC0pDMOph5MpiZIqmo5DJKHM4DmB7k51ic9 c3vRSrqaU8O87mpqIRDzV0Jl8DbkVKD7XfThbOW87VACL2M83On1VOWPIjs+OIYo0Muc 3B2PVqJqz1r7Hyqe1XBJz/kmhhFb/WZ9lcw8YQGtF/eNsciTnil/QJ1eTXzq4964yFkA lFcQ== X-Gm-Message-State: AOJu0YymJQtk8vCXO38VR3fXxbwFHcu1PnxJT+2G00giQQvPNb868i1m j8F2T1eQM0kYidvaENGkggFKVbRouIxq7QEtIJppgJT/6KoZsRU/Q7o= X-Received: by 2002:aca:1a16:0:b0:3a7:5d7a:1bdd with SMTP id a22-20020aca1a16000000b003a75d7a1bddmr2993909oia.19.1691774180774; Fri, 11 Aug 2023 10:16:20 -0700 (PDT) MIME-Version: 1.0 From: Random Joe Date: Fri, 11 Aug 2023 20:16:09 +0300 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avcodec/cuviddec: update parser ulMaxNumDecodeSurfaces X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2VBOk/ZoZMeE Fixes video output stutter caused by different number of buffers in decoder vs parser introduced in 402d98c. Signed-off-by: Random Joe --- libavcodec/cuviddec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) + return 1; } static int CUDAAPI cuvid_handle_picture_decode(void *opaque, CUVIDPICPARAMS* picparams) @@ -1022,7 +1029,9 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) goto error; } - ctx->cuparseinfo.ulMaxNumDecodeSurfaces = ctx->nb_surfaces; + // set ulMaxNumDecodeSurfaces to a dummy value of 1 as recommended in NVDEC Programming Guide + // set the optimal value in pfnSequenceCallback where CUVIDEOFORMAT::min_num_decode_surfaces is reported + ctx->cuparseinfo.ulMaxNumDecodeSurfaces = 1; ctx->cuparseinfo.ulMaxDisplayDelay = (avctx->flags & AV_CODEC_FLAG_LOW_DELAY) ? 0 : CUVID_MAX_DISPLAY_DELAY; ctx->cuparseinfo.pUserData = avctx; ctx->cuparseinfo.pfnSequenceCallback = cuvid_handle_video_sequence; diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index 814bc53f70..1b62832eca 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -360,7 +360,14 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form } } - return 1; + // make CUVIDDECODECREATEINFO::ulNumDecodeSurfaces = CUVIDPARSERPARAMS::ulMaxNumDecodeSurfaces + // returning a value > 1 , will notify the driver to set the parser ulMaxNumDecodeSurfaces + // to this return value . + + if(ctx->cuparseinfo.ulMaxNumDecodeSurfaces != cuinfo.ulNumDecodeSurfaces) + return cuinfo.ulNumDecodeSurfaces; + else