From patchwork Fri Aug 11 16:01:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Random Joe X-Patchwork-Id: 43212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b1b:b0:130:ccc6:6c4b with SMTP id l27csp1447629pzh; Fri, 11 Aug 2023 09:01:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGh/5hG7iPWHCyPZBHBoFt4vQJs1UZwEWH4+DWPtlKt5QCjITnl+iFNkBiGUBmbw2tn9lYJ X-Received: by 2002:a17:907:3d94:b0:99c:78d4:32f9 with SMTP id he20-20020a1709073d9400b0099c78d432f9mr6647161ejc.10.1691769716474; Fri, 11 Aug 2023 09:01:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691769716; cv=none; d=google.com; s=arc-20160816; b=oznI3DlDahOYWxYYIlT5Ck4SEQf/DrdJilDMHS32clhO/p+2la8/nxWH+xe+sMBmAs GPcuWZdCqwnrsI8pUm6wLRMX9dgv4a8TvmZC4wYe12c42PMa5eImDUZKwZ8ScFvNa9SF m1P+mIJamPVYKXzJtRrT1G0JPwwbMij66pNQuT5Aa/vC2mu7qfckc49R3K2aiMzr8/4a VHhXXwoYTK6nMAiLuU418/HAO+mvSREiHXX69F10XBvUvV6In1frB4E35/N7CyP8V3vU pZr7V5GthahAsnAnHLcXUEc3B3StH4eZy0FfJA2EM52f2bT1twO/UFRvkIww3mx0ECqX eRYQ== 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=NNuyGrTQsb+lpXQ/apyMopLqxCjg5Xp6QBMOYf+6pfs=; fh=d3v9Jjc1ani41IJ1iY1WVmidNt6UvrRhWh3IxTiNzjk=; b=sPYgPxo+lQsqMiBUhp8hOn5WaKrZqb1Jpqpgwrs2vxFuDsB8AHMZ2ydfkTLRZwVnSG /+BobEihm2KHWcZoaCXkRdVPeejp/VSrYrLivXms3EvHZscubKQhqVA0KwRVh9EooFZ8 avxfPs5/26ek+6hP2KLUtB3Yu2fhVE7s09tLnL6P2gh9OXTLWgCHrjlXd0k8pqbszRbr Hkdc12DNIjRvOFNvTWrswiULwh9RTX3AdfeKNbBR7CJ5IGQVdIUr35ziKCi/blPI4xXB B7V215hApTouhGI3QriMoFiFwoztT8J46gyaGpXLVVCCu7l8HXTo4T4mjjj7atd/cUwv INAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ETobNgY7; 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 a22-20020a1709062b1600b0099b8b1d54b3si3506742ejg.432.2023.08.11.09.01.55; Fri, 11 Aug 2023 09:01:56 -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=ETobNgY7; 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 B7C9868C8E8; Fri, 11 Aug 2023 19:01:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE95068C6A3 for ; Fri, 11 Aug 2023 19:01:45 +0300 (EEST) Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3a7aedc57ffso1785042b6e.2 for ; Fri, 11 Aug 2023 09:01:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691769703; x=1692374503; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=Puao3juNaoIJZaVOdlxr/asMqoJAoNcxg77bZNTTDDc=; b=ETobNgY7DlubEr/YsTy9LPVIlM3KIfjtUq+0Z2dbSaNJmzoPv2JaLYDSIkvKng3w8u djbt37OFRdsz47O7mUA5hBTWxcbF3qvCyhk3SqCopdMxzH6WhAt9yL65hjetV98foevD XUVpsiFVElIBDwFd0sAQ0xNdbxp7+4bHmt2tfaVLj3jhxYNFRwlAXVx79sh6ezGeM5H2 VNaduCsdiNY5l7HLSHMBj/bOK+btSgbhuGk4UOecDEH+7VBiwLf3pEg0Ru0wAdzvJh4Z rRY9A5017kPI1ytLgJkZpRycGMMYsLEmSEaa7c1rj02I3s0Gia7A/ZoC61Tn9/FvIvga TSNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691769703; x=1692374503; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Puao3juNaoIJZaVOdlxr/asMqoJAoNcxg77bZNTTDDc=; b=ZheoPnkHwZB3rPbrp6R/0s8L5z3pA0e1P9SdLCUyVF+1c7XoXTeONxX7dXXksmkRQg L7VArFYQPYHNzFkC37svQ5MS0o9aUbQ0ewVWKMoIjIfA9r708DXDFOc1BOzYFkBoYHHi rW1/jykZU2yS7QRZSbjTa22SdS1RxGTzzEX8v5qowqJEcP4jt5UGtw1HAfKs3DwkEjOB eBipOrWD6rVFftvAppcYyTGlysJjucZg4jXJpltyBdguX6ElEzZUyyHB0cKxZk+AEOfv wsOtVTlkNnJekuLVJh4D/SZ2gy1i5l5NUYJNbmZ/M1NoKFqSRWE6bgTuIzEdS6mhYwnm sfNw== X-Gm-Message-State: AOJu0YyBHUEgeejaT9UQK/vTOhJLKnTqdb94ReWGgKTHKepiVXRimQ7l /BiTO2hkVmvqnsuWa7aXt7W1zzwJ2TJ7dXOb879QkUw17ltgaivFHZygiA== X-Received: by 2002:a05:6808:1144:b0:3a7:a299:1201 with SMTP id u4-20020a056808114400b003a7a2991201mr3070049oiu.23.1691769702368; Fri, 11 Aug 2023 09:01:42 -0700 (PDT) MIME-Version: 1.0 From: Random Joe Date: Fri, 11 Aug 2023 19:01:31 +0300 Message-ID: To: ffmpeg-devel@ffmpeg.org 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: 4aVDyO9hZ8r7 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(-) } 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 + return 1;