From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1BFAE46C2C for ; Thu, 6 Jul 2023 04:19:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E76968C671; Thu, 6 Jul 2023 07:19:30 +0300 (EEST) Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3618368C336 for ; Thu, 6 Jul 2023 07:19:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1688617153; bh=RDSpPDolPoFetF40pOPQrHY8hv/lSqaSFZbM7KZVmWQ=; h=From:To:Cc:Subject:Date; b=dgb+u53ZLf5QKbgT7c7wAcZYiYCWO/w+vV5Aw4GiKMb7eyL8xTY4ERLf/aPk7VXzz Pr6hsGLU37i7C2nyx0P2y+KY3gNMHgpcYV4pKCGtgm0a2rQKLpfrGMOSHK3xzH6i5E 39Ddi11v5PYnxd5AtisUH4V8XYsQhBIbIGP/I4go= Received: from localhost.localdomain ([119.147.10.195]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 4CC142AA; Thu, 06 Jul 2023 12:19:12 +0800 X-QQ-mid: xmsmtpt1688617152tpc4lxr1f Message-ID: X-QQ-XMAILINFO: Nb6nzJ+5clhvZ8Ln/nlcuV9SVNkmH7N69tykLFESiPsL8h+yspVdhHqrshGh7n zcTUcKTSB2eHBMaxTBDni0oafdX09AZL8JzCgUtvBR4IfvogyiZqMt+1B5wiYBJmu1wju8vLWwPP 7hG7Mhop8DbZulnIfRbOl9HJZsjy1K6aI2k59cFBKPJ5hKJSVfqer4RMFEnbPOzgG9w+19wtcPjq ek5sNVQv2NYbSETpZzkPr9rmWZgBCR1SXla6gQ4IY5T7eTmiZK18Ssh4cHBYCH8AUkf30CIXacY1 GP4xGoMK13BCIOcsJoqnm2yAxK87LTMQWoIGOX8Wht31spE3JxPcF2tVpGADTgqhUpC5gM5mQssg HXDuiaClfHJrMZAmnAIzKknWyiCJBz+bDKaukC8Mvrige9qgeADIvomtO47e82ta6ljLgWUZYSRT U5z6kFzcjsNDKEtzq/OkK6soWmVPAARjhAdOZNnvH7YvNJRa/mCRL+nIOnmJIxqKvnnd7MHJrTO/ 9w9bByMN5NfXlz+GoJosaJOLbX5a3uHWPPtLvs5aGdUi4PG6r6+HWeHvg6vp0gOEXLLbezaB48Bj wWWwdC82E7sT8GqipZz0LpcPcgHXsOC5qYl3AKAE1KG3gymwSS+s+O5OjjmETKNsh15mhQhZlmAx /4ysg0+agxhDzFCGYoCgqXoEMe1Rr2X/oPGqkiQcPY1Of6Smzrvb7yNf5Ij2NDDKvsnbrj0KDkD+ +DfhG9ojsQHqsiq9sxoL4sn/HT6acUpL/I8Zegdp1HfxVhMXbCI+UivzWNCHCL/7gsw8S/Rvov4y 7LikBXASvp5ogrGkN0HBHjEBSN78Y47lBzB/KC/CulzjukKqyS9YNComupiKV4wPvbtQocMYJJLq DDmDZfVkPfk6hCZdFNZnD87DHbAccBKVceAvetKpvp8InXLr7jXGmRFztoXXadHqJv3LHca0OUMx YXHh1q4ddwFKjvagPIZJc6CMc5wgrq X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2023 20:00:48 +0800 X-OQ-MSGID: <20230706120048.1515597-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/nvenc: fix intraRefreshPeriod setting 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 Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili Regression since 99dfdb45. intraRefreshPeriod access cc->gopLength, which has been overwritten to NVENC_INFINITE_GOPLENGTH before. Fixes #10445. --- libavcodec/nvenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 06579a502b..13fafcd246 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1173,6 +1173,7 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) h264->enableIntraRefresh = 1; h264->intraRefreshPeriod = cc->gopLength; h264->intraRefreshCnt = cc->gopLength - 1; + cc->gopLength = NVENC_INFINITE_GOPLENGTH; #ifdef NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH h264->singleSliceIntraRefresh = ctx->single_slice_intra_refresh; #endif @@ -1297,6 +1298,7 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->enableIntraRefresh = 1; hevc->intraRefreshPeriod = cc->gopLength; hevc->intraRefreshCnt = cc->gopLength - 1; + cc->gopLength = NVENC_INFINITE_GOPLENGTH; #ifdef NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH hevc->singleSliceIntraRefresh = ctx->single_slice_intra_refresh; #endif @@ -1415,6 +1417,7 @@ static av_cold int nvenc_setup_av1_config(AVCodecContext *avctx) av1->enableIntraRefresh = 1; av1->intraRefreshPeriod = cc->gopLength; av1->intraRefreshCnt = cc->gopLength - 1; + cc->gopLength = NVENC_INFINITE_GOPLENGTH; av1->idrPeriod = NVENC_INFINITE_GOPLENGTH; } else if (cc->gopLength > 0) { @@ -1619,9 +1622,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if(ctx->single_slice_intra_refresh) ctx->intra_refresh = 1; - if (ctx->intra_refresh) - ctx->encode_config.gopLength = NVENC_INFINITE_GOPLENGTH; - nvenc_recalc_surfaces(avctx); nvenc_setup_rate_control(avctx); -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".