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 } };