From patchwork Fri Aug 11 17:50:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Random Joe X-Patchwork-Id: 43214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c528:b0:130:ccc6:6c4b with SMTP id gm40csp42496pzb; Fri, 11 Aug 2023 10:50:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEuVzd+mmGp3tVcG7pXnOwdf8OlrpjFHxeLstGAxx/Rdp+fhTnSV5Y5xUvQC+mC14uLbtQG X-Received: by 2002:a17:906:10d7:b0:99d:6dd7:42c2 with SMTP id v23-20020a17090610d700b0099d6dd742c2mr2296879ejv.40.1691776236319; Fri, 11 Aug 2023 10:50:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691776236; cv=none; d=google.com; s=arc-20160816; b=JnnHEl6NmQssw59BjnYWvveYkXKFtt1huJsq7YGShjv6nP+etft6F9LYChBlPcPMVM GBrnI3NijmWjOCWucf2bDOrXbWrsqkSEy3hSXzeoNsiZP8YhbLdfWeedyvRF2Feir91u 31J1H9RnLNCQejFJ+MJBxoypmbCkpQbDhpDdB/ixrF+h9s19f1Fy+SHPZXAgp7zYkr63 zLKVbgmqiGo95YE8JtPany2waDprAdbVnEhrVJ4SXchqmvoGQJYkarH4x260vq6DR8Jr wyqy2laQnYDUU+m5ScXrcVLuUrigUJgIurp3sXl0VSD/+/mxpYVKdlNRvJPD64HDOWkL FzwQ== 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:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=c6M/1sV6COrHj73iw4tslgvHHFm9eEwNFjuhj/b5AHs=; fh=d3v9Jjc1ani41IJ1iY1WVmidNt6UvrRhWh3IxTiNzjk=; b=ToiPHQ0cYBg+Y5qwsB7zswoFOVPwTm7b54j5qpl6/fhGdbye3khle85g+a2/d6+4qB a+ZYcrsEBKVel8iwmFKEn6yEgyK29j0POjdbDCHYsF4kKoRYEP5uvUH5m+rErJhyGy/X tjnjyljfUWK0Cb7vPtHfNLL3iRRlerknd3D0HJw28YCHN9SdES415I0Eb8KJ6sdJUgGC YNHnyfJYD34px2HiKxhRFp/ezs13Cws8WbbH8+q9w2PRcKN9SvL3JBcu07MPjlKc/CxW ATC7PVGVFpm/F+SiekZ54zq2YQ86K2zLPXtCsWyfiAiamTL81tGedDuzykNxxduQO3vZ faEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=mzYGF1lg; 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 s10-20020a170906c30a00b0099351214a94si3869948ejz.648.2023.08.11.10.50.35; Fri, 11 Aug 2023 10:50:36 -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=mzYGF1lg; 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 7E17C68C501; Fri, 11 Aug 2023 20:50:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A19E68C7EC for ; Fri, 11 Aug 2023 20:50:26 +0300 (EEST) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-977e0fbd742so303511266b.2 for ; Fri, 11 Aug 2023 10:50:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691776225; x=1692381025; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=tE3izPnTw4WvJzwdQDGhHA01qFhm3+LisrVfQ95JceU=; b=mzYGF1lg3o7Qt8Oh0neImW56usZYeWiIh801UMkr0FUpRhqsZHQw02ypKVSXePlRe8 esb0FmpvinEfAbxVKcaOGz3svMybRQ/5lk7gXUsw06q7a3tON4fSd1GVrqVUxsfQqX8c TxRc+e/XOOTYqu60W+KagLWPyVAP7Oz5QrFNRgWoZDBygpBdx+KQHT/xd+hE0tAJvw/y ciC+P05+0W8AuKMrFQl7WFHRaN6HPwizv9mXh70FWqwILxIDJOXR2OwqHqVbFyqv0pLW pqwokNHtX/I5auKPG4m6sAX9DIfwap+lFWnfpBrdq6oJLvx5jISAGR2RD0OalwMobh25 hOIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691776225; x=1692381025; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=tE3izPnTw4WvJzwdQDGhHA01qFhm3+LisrVfQ95JceU=; b=iklR8UC8+GNznRoCX934hny76VWeUPJOOFCRrRcOLScPUfL3orFruvG7Azy28rc9R0 QYbfWum8VBjCcIpe8mby8NZCcK/7nx1wkSXKhPpUa0PU9rpyRm1kI9n42yZXct3nn7ga hvcX9crf7sHikigrxWsSOO/FFq6ynq5Iby1oLDZZe6JZxJ0aVmf3HcSJrlVzvoz3Qbu7 eWagMb9HnDOT+HERZ1DvTp8PUDj3VT/Dl6WshirYNqu7DVq4HGAHnU/pFoj8F+GqPqzs 8rCU+JhPlPggFQxbL3v91A08lUMMOsZi8w40qV5jNl5rkOuehO7hkO/XIKXKYSnyTLAU l+Jg== X-Gm-Message-State: AOJu0YyXV88T28KXNAKGIBIOJqKlHo5L04sK09Kv7Vrtq/g3JxvI0oc4 33JojwWFL8xdGn+9XqJaUKzVDWuSVZIn5t6g X-Received: by 2002:a17:906:220f:b0:99c:e38c:31d with SMTP id s15-20020a170906220f00b0099ce38c031dmr2130705ejs.72.1691776224990; Fri, 11 Aug 2023 10:50:24 -0700 (PDT) Received: from [192.168.1.136] ([188.26.129.104]) by smtp.gmail.com with ESMTPSA id a13-20020a17090682cd00b00992f81122e1sm2511795ejy.21.2023.08.11.10.50.24 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Aug 2023 10:50:24 -0700 (PDT) Message-ID: Date: Fri, 11 Aug 2023 20:50:23 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Random Joe To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH v2] 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: 9LzOlYOuGQdh 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(-) 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 + 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;