From patchwork Thu Sep 2 10:38:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp150983iov; Thu, 2 Sep 2021 03:39:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyidZPabTsatFtDD6aRuu/M7hggtxwwvO3r3iT4w+Rl/f7KphEj9aK5PuRZIUh3uIcwxfD3 X-Received: by 2002:a17:906:b14d:: with SMTP id bt13mr3076937ejb.39.1630579166576; Thu, 02 Sep 2021 03:39:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630579166; cv=none; d=google.com; s=arc-20160816; b=AGvforaFg/CkhIqxQi6RazQaU2NrnCDzo4wXsF59sh9/1ScHlGRIDCZStzpTxpa0qV R4N7+FzVcC+NIAdwxuU1ily51obiktXSN3S7W+7GI4poqPAwKYnZj9j+owX3Z2H+ZC5k FaNe5JcXVcfFYGp5xdHARaljwpQ7dXhpPKxoiFs8yuangp6YC1p6SY4mO8yuJqUTKCiH rvwYmdzYVZusFGzOBVWAjahvXXVi52nVtVQz9u49H4v3ZUYk5Y1glTCH+RBJh1Z1qOHr 4K+Hgw4WC2UDmHajzM/JLGjF6CRi4IF4016tRgaQMVjIc4Qn9gEMIuMtOAn9NL9nm68j VOxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=t36x/ggZgg/LeaM6qc9M5f+9Soq+6E4f7Y3FXn3iWbY=; b=hcmNq/Q3Q71tzeRV0Hm4dMUJ3VJzjjio1hTDxh1OrSVmguNJjb/FqnalqwnsVyTI6u nsZteUHeudoRRRZpkFyAee6iLiKrm4CqAih88fnfztLqYdp3tzF5pp0atWP0/JY7BBkd fENpzHrDIReHaQzhxVTqsFCo0aF6No9vE266OlQ82y38n1Unc0SDGLF7oOA5izydnOWa uAqBvrpe/W4sF2uqKVdV6iZGldwq60ICGeFA9WGpICGipjNn91f3g57RXr/fEqA9Nj4P 7RkL0ai9SYO7M6qrpRfm0On0b5KHt74XzZ8mOCigcz5pUm86mWy6esRnaePKYYOchLSH h+hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WQuYFhSg; 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 h13si1825793edv.45.2021.09.02.03.39.16; Thu, 02 Sep 2021 03:39:26 -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=20210112 header.b=WQuYFhSg; 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 8B78C68A569; Thu, 2 Sep 2021 13:39:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD0E468A0C3 for ; Thu, 2 Sep 2021 13:39:04 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id s29so1302385pfw.5 for ; Thu, 02 Sep 2021 03:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=CkdMZm1T3CVhlrSzxzDZiUseCUVuFBsVjkRwQSLHwmY=; b=WQuYFhSgQvHndhaXJTIorndgjI66uR4+slyiMzKdMTpPldixKbFpPxM2yiFMR6qe/P BQEHoR28fAc/LrffmIKoRMoJjbisNc69i1RyoiOgKS/YyfeuwrDE+gBle+bu2CxjcelU nwpW64rGFiaNeAAKSnBngb7Mbw/QEaha8Oa3+6KTGv2dr3U0cqCPegzFMdmbwJ/zeoD5 sKL1YD2/4ejgYu9tcdze3m/ZW/TkgsHOAcC0s95c4AvCJmtOyJ+xptH9zgO2+twwqnKv Hv2rhlzt4jndLczvliORU5+d6HwfRr7ZNkDslQo81s419/kezm9wD8/vsB65bgiHNeXE vx+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CkdMZm1T3CVhlrSzxzDZiUseCUVuFBsVjkRwQSLHwmY=; b=nyJNkUZY2h4PZElV5I/8pmbdr5Ga5iQjNkxY57Xyj5nkpLtsRvPsdc3FnPW59l55qL Na4XH6GkXvOiTvfia/2Xjp+3Sjmk2MDjnzA46VAhgJIVdm4A6h8gBTkAUb3zuxWqtnVr eQskzqQJE0u9I8XqiNxp8+C6upP2thP4fNNbTU4S7rZ1Ju25V6QQ5cHIt6agmZzPcfwV OQ9vcBugHEo8teSaK/fn0V/vMRKP1yF8b9PnZUtBDW1+iqaw3qPLsm122SoFqqPClnr3 tX7PaNCtduByFfU36tqfxvp2aITohn6NsSMZKV8JOXXFu/GJaEnOvh6XLuVCx0i2SSN9 tR9w== X-Gm-Message-State: AOAM530UR0VKXrgbecwxi+iOnVIbwe1y4W/+L5+p4Vi/qGSOE+BpAptk IrhEIh6MlsgfEKQBAmdkoGbzqfDOHL8= X-Received: by 2002:a63:2024:: with SMTP id g36mr2560730pgg.213.1630579142770; Thu, 02 Sep 2021 03:39:02 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c16sm1998646pfb.196.2021.09.02.03.39.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Sep 2021 03:39:02 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Sep 2021 18:38:55 +0800 Message-Id: <1630579138-6145-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/nvenc: make number of slices per frame configurable 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0gCIMsF38JUj From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/nvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 815b942..163d442 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1074,7 +1074,7 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) || vui->videoFullRangeFlag != 0); h264->sliceMode = 3; - h264->sliceModeData = 1; + h264->sliceModeData = avctx->slices > 0 ? avctx->slices : 1; h264->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; h264->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1; @@ -1171,7 +1171,7 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) || vui->videoFullRangeFlag != 0); hevc->sliceMode = 3; - hevc->sliceModeData = 1; + hevc->sliceModeData = avctx->slices > 0 ? avctx->slices : 1; hevc->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; hevc->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1; From patchwork Thu Sep 2 10:38:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29954 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp151006iov; Thu, 2 Sep 2021 03:39:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdVPcleA3FflOj9YSp3kViRN9ZZekwXi78/Dz0nbODoDMfM/HJj86KgnjS9sQfnVetvRx+ X-Received: by 2002:a17:906:f743:: with SMTP id jp3mr3146540ejb.120.1630579169440; Thu, 02 Sep 2021 03:39:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630579169; cv=none; d=google.com; s=arc-20160816; b=zHlM0bOApPzVe2+ZTgV5XEvT72CCRDYBNJpu+9JZ6vQ5uVaViLVzlHjkB4JZL6+oUb /sihtARyCuryMleRNozHPIVwP3XDKtanhu3Ml1RkS22LqfK73sSJX3rDav0GxYzhiolv nzH8sEHaJPr36RThzx6NFylN6fMzL2x+dLI0sEZa3K5oio8O0ECXS0unZrxisvvnhIBL T4hj6AJnXuPsZkjF//gzPX6Yzxs5QA0YKEQj30C4t1W+uO4eIUltl+S3sGqRgsIcOySJ Q8klmMxcY1xLfGSOcwtJOP0PcuhoDbrTY/0Gaxwt5Tje++ez5yE/GVLWKCyaCuPiEGSd auIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=fga2eL3sZehdSINlfNxud8EgAW+nF9N2drv3elEKl4k=; b=WRDNc6mcwdk7CO1PU2yiGGM/fJoJRc2tkeaURejbeqQm7v0eiG+/XksYXNr4RKk0jZ jhdbx8W8tWPsjwMdwKpIlYjPP4r3Z/YFEz+7sn6QYuXudLXBk/eoNnSbG+24s1SVUNCe fl+NBeUZ64U/XhQufoGVy7Gzp0gjJCuZCRVKyC0irqZIUhKrGOYjPJ69jSR+V9D/j2ei Llj3tc5LDX4B88zjSJgZ62iAB6LJWcRvXMTPBtosDdcpG7K62hjygEUQEAmkEpMv5DQh 4yyWVtIAxLF+rF8IX4KgIWvnnY+rIFXPrbf4N4aJ7nKmAh96+9ay6gEvfWhzx8V8QrQn vkxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=UMGbOB6V; 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 b26si1806361edv.381.2021.09.02.03.39.28; Thu, 02 Sep 2021 03:39:29 -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=20210112 header.b=UMGbOB6V; 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 BE05968A59F; Thu, 2 Sep 2021 13:39:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35F2B68A569 for ; Thu, 2 Sep 2021 13:39:06 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id v1so887458plo.10 for ; Thu, 02 Sep 2021 03:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+6tgsYs3Rq5hwyn7IKoPTlxaOSySvOCm+nETr9c9A6c=; b=UMGbOB6VJL4UVNpdkwMx0pXm2NuzmLi4D7f98DSlsZXw4kZ8FMSmg9PX3cko4ZGFfi WutN1z04Oz9gahZPXehCY6GRoe9NGmWUeLL8RtPqFyyfBYOrEh3TnGbzcSHDbX3O9aMH MtWrHfcml4lds5Zn7fNeWtp1A+uz/z5MjVdRWinDn3v/gPn03BqvelruHjPaiE5berB1 9ocQBLR1qjM8zKKImkm2yj7xwhEg8pxvciofQQxqnOQ6wEPah8MNLP3+eYZOCDihEvsl xqOHDFoCHebPw4lbpXDw9Kj0YdNuCeZvg47EPaDAJZgqMe3AZNbfRWsajx7yfg3RE6eS l8Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+6tgsYs3Rq5hwyn7IKoPTlxaOSySvOCm+nETr9c9A6c=; b=hZ3IX9W9aMMZiiyQlKH9JoW65wS67TLxeNMcMsJNXtKGNikbmC7xWsugYbTdHL32oH ZA9sCCVdOZwBKneqjm0x3VzojLA+iGv4ZTWBleFk06LWtVrJa3ZLqlPusnCLSvqEAWg2 0keSV3Ss2LfR/aJ8kEWF2cOhX34evoexm51MEcRPdQPCX1DP7G4ccA1Cj/hQZ2roAlOh EHY6oJygdWxh7G0o/DwkAKtiZoWBIgc1RabaTTH02Ek5olzoX08/BUiUDBXsL8logl0B 9dxP/CtdKVu9ka/tKXTjyTbQVYno2d+L3RHbGcWImOZvceGeWTHk/nOB0D24NCczeHJd WEhg== X-Gm-Message-State: AOAM533XnMx3kIrClr4xwPi6HrxwBjwqf1g7zvWAN3qYHl/xbs8sTvTH PyxKD14qAM/tlEoB6hEErV0ZkFpFRvg= X-Received: by 2002:a17:902:c40a:b0:138:a82d:3aa7 with SMTP id k10-20020a170902c40a00b00138a82d3aa7mr2429828plk.54.1630579143922; Thu, 02 Sep 2021 03:39:03 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c16sm1998646pfb.196.2021.09.02.03.39.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Sep 2021 03:39:03 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Sep 2021 18:38:56 +0800 Message-Id: <1630579138-6145-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1630579138-6145-1-git-send-email-lance.lmwang@gmail.com> References: <1630579138-6145-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/nvenc: Add intra refresh support 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: B53/3tjVk8bw From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/nvenc.c | 24 +++++++++++++++++++++--- libavcodec/nvenc.h | 1 + libavcodec/nvenc_h264.c | 2 ++ libavcodec/nvenc_hevc.c | 2 ++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 163d442..e739f8b 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -529,6 +529,12 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) } #endif + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_INTRA_REFRESH); + if(ctx->intra_refresh && ret <= 0) { + av_log(avctx, AV_LOG_WARNING, "Intra refresh not supported by the device\n"); + return AVERROR(ENOSYS); + } + ctx->support_dyn_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE); return 0; @@ -1076,6 +1082,12 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) h264->sliceMode = 3; h264->sliceModeData = avctx->slices > 0 ? avctx->slices : 1; + if (ctx->intra_refresh) { + h264->enableIntraRefresh = 1; + h264->intraRefreshPeriod = avctx->gop_size; + h264->intraRefreshCnt = avctx->gop_size - 1; + } + h264->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; h264->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1; h264->outputAUD = ctx->aud; @@ -1085,7 +1097,7 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) h264->maxNumRefFrames = ctx->dpb_size; } if (avctx->gop_size >= 0) { - h264->idrPeriod = cc->gopLength; + h264->idrPeriod = ctx->intra_refresh ? NVENC_INFINITE_GOPLENGTH : avctx->gop_size; } if (IS_CBR(cc->rcParams.rateControlMode)) { @@ -1173,6 +1185,12 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->sliceMode = 3; hevc->sliceModeData = avctx->slices > 0 ? avctx->slices : 1; + if (ctx->intra_refresh) { + hevc->enableIntraRefresh = 1; + hevc->intraRefreshPeriod = avctx->gop_size; + hevc->intraRefreshCnt = avctx->gop_size - 1; + } + hevc->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; hevc->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1; hevc->outputAUD = ctx->aud; @@ -1182,7 +1200,7 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->maxNumRefFramesInDPB = ctx->dpb_size; } if (avctx->gop_size >= 0) { - hevc->idrPeriod = cc->gopLength; + hevc->idrPeriod = ctx->intra_refresh ? NVENC_INFINITE_GOPLENGTH : avctx->gop_size; } if (IS_CBR(cc->rcParams.rateControlMode)) { @@ -1361,7 +1379,7 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) ctx->encode_config.frameIntervalP = avctx->max_b_frames + 1; } - ctx->encode_config.gopLength = avctx->gop_size; + ctx->encode_config.gopLength = ctx->intra_refresh ? NVENC_INFINITE_GOPLENGTH : avctx->gop_size; } else if (avctx->gop_size == 0) { ctx->encode_config.frameIntervalP = 0; ctx->encode_config.gopLength = 1; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 7c284fb..e7cc0e6 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -230,6 +230,7 @@ typedef struct NvencContext int multipass; int ldkfs; int extra_sei; + int intra_refresh; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index fffdedc..532dff3 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -188,6 +188,8 @@ static const AVOption options[] = { #endif { "extra_sei", "Pass on extra SEI data (e.g. a53 cc) to be included in the bitstream", OFFSET(extra_sei), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, + { "intra_refresh", "Use Periodic Intra Refresh instead of IDR frames.", + OFFSET(intra_refresh),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 4edc179..6814fe1 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -169,6 +169,8 @@ static const AVOption options[] = { #endif { "extra_sei", "Pass on extra SEI data (e.g. a53 cc) to be included in the bitstream", OFFSET(extra_sei), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, + { "intra_refresh", "Use Periodic Intra Refresh instead of IDR frames.", + OFFSET(intra_refresh),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; From patchwork Thu Sep 2 10:38:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29955 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp151181iov; Thu, 2 Sep 2021 03:39:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTJO+tSPYHcFmAuSCHR9Fg5CQJS5SOGYC0gMHt+QIYShzIjKQqlYL+QuaBkC9wFSEGM+WK X-Received: by 2002:a17:907:98e3:: with SMTP id ke3mr3167556ejc.317.1630579180847; Thu, 02 Sep 2021 03:39:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630579180; cv=none; d=google.com; s=arc-20160816; b=NCrGE6teAFht3s5GvFdDFSV18eXohEMgWeelkKy8sdoRLj8XDmeQMFV00i1YEQxXMk df8MFxCYzRhnJc9YMz7oAXGhRnn6cJ2lqm8uuAQb6bs0Igz7B7Csb4hyXGDj4IT7+U3M jdLtfRwgAVvaV2OiuhQiXiX49HyKfhRS8S0PoUJV5oNrgA7L16xhQLP+SAMDuZz32KQy BC51/TYlvjuRu6fwd/6gSy0vQw1pUlw1Yh+ws0gAwOPDZn1iu1/EjmuM6F9m9yQn9Lwh /zcPOsL5bit/Lqf95A/+at5hbhzY/ifa8oqkPVsNl6IVmI9Ok+03xcLDC3kdMRvDa5h3 5P8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=MyC8EzPRvXgN3WAkBe5i6/RfU98Cy4r0oj8r+1Uy/EE=; b=PatYx6bOX6pg2Bj8DR0DzmGlCTUaOQmdY2M+3QHLOdq3MW99AcNJ1bHI9arYFwHiVj UYCZsneyUMZ/OBqwT+OIfs8xaoN5W0gCInL/ILficIcaPzJAHMpYHWcIeepsLz8mf+hh c75KTVNOdv/CnBbjJobGsXYHvGY698YDsntFj64lltotoH0iQXz7AH9HMJcKH636cawo fONV4OxnIv0PEZgI9QmqBriF1CycSpqeFHXRqrT4EsNt75et+duzkhy3Knld9gut3W+H FF+DMR9LdBd6XM0z9H22NLuzBDc1N5CsRzn1XrvsuMTEDGL7jZ/+hzpfh/jt3athayf4 5aHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=morBhfCJ; 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 i5si1818796eds.477.2021.09.02.03.39.39; Thu, 02 Sep 2021 03:39: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=20210112 header.b=morBhfCJ; 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 C1CF568A5AF; Thu, 2 Sep 2021 13:39:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9EC468008A for ; Thu, 2 Sep 2021 13:39:06 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id t1so1470703pgv.3 for ; Thu, 02 Sep 2021 03:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6KX+/x+10IYTbY52Q3kyNUE7mu2DKBhLDtDEb+UN3O0=; b=morBhfCJdc3QmEyrg61RtAa036fU5rsoUNidgOOPO0SUGbICQoK1+y7T3MD60iuoi2 zeyFv4Odn1OBVyaUib+ZsaF2NjJTyKbqTFwrz8zi/l27LvwaYen02I1dfJ9xp77gi4kM 7noXQCg0ehvS5Y5+Um91aUqrX4bQJWjk+hjoDoGLQQlAFKeyk9wFGY1YXP1Z789Mc5l3 P2DnMtPlw0m4f9Z/c3MPZ/LNN8nrL91DuX9LMqqKetQv3okasGS1aysSHp8GBXMj2+mv lCY0Aa0Iz4rtp3erxha38Aerx8dqD9AzpiRCLYCY526hfrfefg5tYVwha1I+qQIjwH6t m4nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6KX+/x+10IYTbY52Q3kyNUE7mu2DKBhLDtDEb+UN3O0=; b=VsIz58y12oLoRQKbELSUVOnWMlxRSIWyTE8HFd+A3Wkggl11YSGKmr9B7zxDcH8Rju ie37hiqnSzY5omygm2/dWT014jgeutoUccLk0M4/JS5hKKNYUOlPLEL/wyBZsq0hA8JX wO4wnMiiMawYxXMFAxrDxKcNlTq+LFZzP5EelX4MW+05ClCJv04dlx3annV5IynAamsI vqv6CIOMIHW2gcIZyyg2bHw8KMO3ICmnGY+fXnzt9fmAj/DIeRGEG+aZosA43/x0W5yG fX0flb4kRGNLPYGUy8+ktyMjh4mgvxtVaPXIxFWqWuwk9+rL4mjb8GJkSR3hLTzklnoN UBUg== X-Gm-Message-State: AOAM533y+x5aVuStD1JWCGBFHTQzfV4PPr38BtTSCwu661cIFNpn9u2K S095h7uN1W5dlX/kW2SnW7H5mYYo/RU= X-Received: by 2002:a63:df06:: with SMTP id u6mr2583144pgg.148.1630579145116; Thu, 02 Sep 2021 03:39:05 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c16sm1998646pfb.196.2021.09.02.03.39.04 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Sep 2021 03:39:04 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Sep 2021 18:38:57 +0800 Message-Id: <1630579138-6145-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1630579138-6145-1-git-send-email-lance.lmwang@gmail.com> References: <1630579138-6145-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/nvenc: Add single slice intra refresh support 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tLqtiVDDdtTs From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/nvenc.c | 23 +++++++++++++++++++++++ libavcodec/nvenc.h | 2 ++ libavcodec/nvenc_h264.c | 2 ++ libavcodec/nvenc_hevc.c | 2 ++ 4 files changed, 29 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index e739f8b..79f3253 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -529,6 +529,23 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) } #endif +#ifdef NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SINGLE_SLICE_INTRA_REFRESH); + if(ctx->single_slice_intra_refresh && ret <= 0) { + av_log(avctx, AV_LOG_WARNING, "Single slice intra refresh not supported by the device\n"); + return AVERROR(ENOSYS); + } +#else + if(ctx->single_slice_intra_refresh) { + av_log(avctx, AV_LOG_WARNING, "Single slice intra refresh need SDK 11.1 at build time\n"); + return AVERROR(ENOSYS); + } +#endif + + /* force to enable intra refresh */ + if(ctx->single_slice_intra_refresh) + ctx->intra_refresh = 1; + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_INTRA_REFRESH); if(ctx->intra_refresh && ret <= 0) { av_log(avctx, AV_LOG_WARNING, "Intra refresh not supported by the device\n"); @@ -1086,6 +1103,9 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) h264->enableIntraRefresh = 1; h264->intraRefreshPeriod = avctx->gop_size; h264->intraRefreshCnt = avctx->gop_size - 1; +#ifdef NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH + h264->singleSliceIntraRefresh = ctx->single_slice_intra_refresh; +#endif } h264->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; @@ -1189,6 +1209,9 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) hevc->enableIntraRefresh = 1; hevc->intraRefreshPeriod = avctx->gop_size; hevc->intraRefreshCnt = avctx->gop_size - 1; +#ifdef NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH + hevc->singleSliceIntraRefresh = ctx->single_slice_intra_refresh; +#endif } hevc->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index e7cc0e6..1e756a6 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -73,6 +73,7 @@ typedef void ID3D11Device; // SDK 11.1 compile time feature checks #if NVENCAPI_CHECK_VERSION(11, 1) #define NVENC_HAVE_QP_CHROMA_OFFSETS +#define NVENC_HAVE_SINGLE_SLICE_INTRA_REFRESH #endif typedef struct NvencSurface @@ -231,6 +232,7 @@ typedef struct NvencContext int ldkfs; int extra_sei; int intra_refresh; + int single_slice_intra_refresh; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 532dff3..1a46e70 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -190,6 +190,8 @@ static const AVOption options[] = { OFFSET(extra_sei), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, { "intra_refresh", "Use Periodic Intra Refresh instead of IDR frames.", OFFSET(intra_refresh),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "single_slice_intra_refresh", "Use single slice intra refresh.", + OFFSET(single_slice_intra_refresh), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 6814fe1..8c89d6e 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -171,6 +171,8 @@ static const AVOption options[] = { OFFSET(extra_sei), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE }, { "intra_refresh", "Use Periodic Intra Refresh instead of IDR frames.", OFFSET(intra_refresh),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "single_slice_intra_refresh", "Use single slice intra refresh.", + OFFSET(single_slice_intra_refresh), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; From patchwork Thu Sep 2 10:38:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 29953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp151308iov; Thu, 2 Sep 2021 03:39:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJ0CyIABXgFStzPwhfV1/7l9m2SwyLp3C54T2dHFCD7q8btzuNtYkFnLhIA3vry0uL09aM X-Received: by 2002:a50:da47:: with SMTP id a7mr2824089edk.315.1630579192415; Thu, 02 Sep 2021 03:39:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630579192; cv=none; d=google.com; s=arc-20160816; b=XV1p05aCuBkM2W23yNHUYaZtK4eslBykdwEJ1R57oo+Bi+DdRs8LxJTHsB8lsqOzFX L5MhEJKvT3HaJihIxRhE28CAZFs7KAxKrloE+aVwkc9c6PedVa0Lt/qCN+KHLbTV2TYI EsIHWkhktxewhN5ZmhoSl/OTN8PMjF15vBp6sWI6Vx5AooG1Ekm7pStQ1QIqh0by3zKT vzpQew6Yja0g4L6N8RO/Xy1xDtIm4gnkqUi+OyrkHdVHlsXvow8dqbfSTWu38O9+Ct8o 5HI5pSxJ5TMrujOassLR/gQP1bLv0eeKQqb3DzIXAYf/S7agL4LzyW+CiKPuhgwqXwif rf6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=kJ0cEUDwxiC8/3w9TBgv4CFk9Jxm0s50Aq/PsF+G56E=; b=rsa1FUfcG3LF1NqtlCRMccZsYBWMQbCmYDnhpX56gNy/Rqo3j5TSXb6Z8+8/FpDy/J j/BMkh7X2CMtcu2yDdUR6HIpCk1deDmSjYzO3InRWFzIZZ5oEH8FTlFx+JNIcR9gxpWP IAw4q6vwv4hgTgQ6APViqHIt8MN12poUbusN4Xq7LykNnXB94bJTUINoRspr4Odtm7gz H/HSdOVDqDGh7CdNVmPDk1oELdr+3QG1+PnSGwZjf4vwJwG7qTFo5xjyIgMGs1mQuXhR BMMN0LXgmVxTSegwswVIeOAwzeTkLRrpOTcRKw1a9ofpHjXCnODIuY4jvFEOJD07krd3 30zA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mnd1wsUW; 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 t14si1605540edw.213.2021.09.02.03.39.51; Thu, 02 Sep 2021 03:39:52 -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=20210112 header.b=mnd1wsUW; 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 D20A668A5C2; Thu, 2 Sep 2021 13:39:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5004868A58D for ; Thu, 2 Sep 2021 13:39:08 +0300 (EEST) Received: by mail-pj1-f44.google.com with SMTP id u13-20020a17090abb0db0290177e1d9b3f7so1142062pjr.1 for ; Thu, 02 Sep 2021 03:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SNpAmPWOfCTUoQUsL3EyTWNS4zKnzgK0vOpRSga1n3E=; b=mnd1wsUWI42WIRDvcHTRVB7hLkq8aLoHO+MTFzdev5SPQTMsZnMBDJNQUd9zKNQgT5 fVbqNjAb4U1Ta0NSt2SQHlryIqTchk0irUPfiSfGqGeEBI1c5bKj2tEoDFyhQ1VdFkcX j871BMQCPgAPfmhM1G1tOzhmC9AFUA2v5wScwoSDQork65qBr1jorNEpYNTVhHa9YkE4 vCE8BurHaFviREid30v6AYmiv6GgKkUk6lQ6MKw2PEh6FS8c+PqH4ncQ1NyDrbWDbCR3 V3JrDa7Oo3jTkJxgcPot+YTjDg2UsSwBn63roq9UE00o4LdhiC8/ThvCuMa95xIvBuJ/ zkUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SNpAmPWOfCTUoQUsL3EyTWNS4zKnzgK0vOpRSga1n3E=; b=OpqUml5Os/OvWXbOFThjojnwjvs3+KqeW8y7Nwta107p6kJ1kUBMLPvBRFMjpUqC/f rLh+JGpR2gU9eYwwQAvB05/DibY5xBzXpyz03eqQHnDmJTtNnrrr7W9RvcOkqHvq6v7w UebKZLhzJuYiAVdvOzGou9H7GbqJhx9lM69oG5+koNsf+e0TZ7B5qw2+Qg088/qXwOZD 38KQrCObuI6qtoWV2Rz+50o7RcFt9dy7mymFbCyl9hg5fUdB/TyvTcfz6HJEmqeNl74L oElx3DI52I4Kxn7nN3IwUc7giSfpnszHRZQSKzAx3HnkYZkUvOWzNvIw898RPRpl4DYl t84g== X-Gm-Message-State: AOAM533kLfI/GTLvIU1nPB5Xnfq+9pITCeIdzFKKNm+lTyPfM62G6QNU tjxceJjg2QRX/e04nQzzL99NzmIK1dE= X-Received: by 2002:a17:902:a50f:b029:11a:cd45:9009 with SMTP id s15-20020a170902a50fb029011acd459009mr2355257plq.38.1630579146478; Thu, 02 Sep 2021 03:39:06 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id c16sm1998646pfb.196.2021.09.02.03.39.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Sep 2021 03:39:06 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Sep 2021 18:38:58 +0800 Message-Id: <1630579138-6145-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1630579138-6145-1-git-send-email-lance.lmwang@gmail.com> References: <1630579138-6145-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/nvenc: Add constrainedFrame encoding support 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uNZlaZ6woqxz From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/nvenc.c | 12 ++++++++++++ libavcodec/nvenc.h | 1 + libavcodec/nvenc_h264.c | 2 ++ libavcodec/nvenc_hevc.c | 2 ++ libavcodec/version.h | 2 +- 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 79f3253..5eeb4fe 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -552,6 +552,12 @@ static int nvenc_check_capabilities(AVCodecContext *avctx) return AVERROR(ENOSYS); } + ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_CONSTRAINED_ENCODING); + if(ctx->constrained_encoding && ret <= 0) { + av_log(avctx, AV_LOG_WARNING, "constrained encoding not supported by the device\n"); + return AVERROR(ENOSYS); + } + ctx->support_dyn_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE); return 0; @@ -1108,6 +1114,9 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) #endif } + if (ctx->constrained_encoding) + h264->enableConstrainedEncoding = 1; + h264->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; h264->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1; h264->outputAUD = ctx->aud; @@ -1214,6 +1223,9 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) #endif } + if (ctx->constrained_encoding) + hevc->enableConstrainedEncoding = 1; + hevc->disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; hevc->repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1; hevc->outputAUD = ctx->aud; diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 1e756a6..950c2ab 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -233,6 +233,7 @@ typedef struct NvencContext int extra_sei; int intra_refresh; int single_slice_intra_refresh; + int constrained_encoding; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 1a46e70..ab7c67f 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -192,6 +192,8 @@ static const AVOption options[] = { OFFSET(intra_refresh),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "single_slice_intra_refresh", "Use single slice intra refresh.", OFFSET(single_slice_intra_refresh), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "constrained_encoding", "enable constrainedFrame encoding where each slice in the constrained picture is independent of other slices.", + OFFSET(constrained_encoding), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 8c89d6e..180e7a3 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -173,6 +173,8 @@ static const AVOption options[] = { OFFSET(intra_refresh),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "single_slice_intra_refresh", "Use single slice intra refresh.", OFFSET(single_slice_intra_refresh), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "constrained_encoding", "enable constrainedFrame encoding where each slice in the constrained picture is independent of other slices.", + OFFSET(constrained_encoding), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index d39329b..10f998e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 59 #define LIBAVCODEC_VERSION_MINOR 6 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \