From patchwork Mon Sep 6 02:01: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: 30012 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3360654iov; Sun, 5 Sep 2021 19:02:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxX+lkIdjWknE0rA2G0RG9hIs0wO3d42gx+mhij+x5zxviWKIT7KLY6ujTS7ZvQS7bcajR3 X-Received: by 2002:a05:6402:3511:: with SMTP id b17mr10847561edd.47.1630893736500; Sun, 05 Sep 2021 19:02:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630893736; cv=none; d=google.com; s=arc-20160816; b=i7EcL+EWRF+Iq9GU5b1EiTyCbwgXKmOVezRoVh7bclXMHFiSlYs6BrmITq6fS4gPLF 2Wa9Ts68lWz+9CgBdykN8BTqG8LIMPGCBETusDBYviq/g3GaSQIUNb5KPQXNm70mBvmb wZQWytEPiSMwOJyTs/W88jJvYy5br6Sqa2BC1W9VtaiIyGWit1ogGvaXDR7ILdn5NWfy msYxR2dSbiAGJDNVtqTvFTBgTjqdCYoljPsCS0PKfG/6va0RihPPfdLfNsSZjH3xAPkk WHbujDtWfhLopjTtUSJvqO981aR2y7m2C/KuxUseEYZ/2rgISKyqI3ZVuhyt3xaTZMHa bFMA== 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=djk00uOPVNApKBGozsuwRTdKlNIG3+bT1pfPoqsv+TA=; b=rd0nGsPJf9sMjmc99KqrHPq5T3ytyIMMtLz6LPRGtM/fH0Ix0KktNBTedF2e37VUvQ 51cy6Qvf1YMOrF4L8ImHwFhXLh+I3Md/wQQRb+1YDFYiZMvuWQrTCvOl+iUlaDrtpA7B QVw7iiekEtAvN1hB9SO+lMPJ4JnZGGZCsAq/wN8/I1XZwaUcGW2jlEXNipzeuOgPjwc3 vIKB/Eyf7mKmNODcmyKDan4TfB9RCYDgu/GP+X+lqz7n9jhksqtlNFHKPbl02WctJ+jr BzxJRXMf9GqyuC+KKs0M2L4CuTg/6DhNmaxB43I5dZxXjlssF3J4aRR9YV8N70EHRJfE 9EhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BgIiAgrQ; 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 g17si8034388ejm.145.2021.09.05.19.02.15; Sun, 05 Sep 2021 19:02:16 -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=BgIiAgrQ; 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 3D50368A774; Mon, 6 Sep 2021 05:02:12 +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 AD79968973D for ; Mon, 6 Sep 2021 05:02:05 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id x7so3531617pfa.8 for ; Sun, 05 Sep 2021 19:02:05 -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=XMBcbR/YXLdj8nlj6bUuShFLeOtEEY0xQcsUw5ywdJ4=; b=BgIiAgrQ7/eLArE4zu50nb/JH8OrGpX724vYHs4pHb/6cwDEhiKlKkcRXU7VwTbyLK pmo5QJY/aqFn1ZRbebeEYZL0RjliEHTmoArJdeiaJ3TSZJRtgoZZq/FuPaxZ/zeS/IWn 3xhFMzopDePMV4iWMQCtaixuR4XRLZFzKgRu8EEBhkIjqLp2U9U/RRaLDJAm2c8aLu+X 3+mIxR/ME+DajnfTdP2KQ9MsLut85hdmJs0V86alc2LYUecDvUY10ZRUpHudJWJSpl0U PnsJh4f82hAIr0sbaEXCxJ9sfKbIkZLimU4OvrUvy7vyOjAG6pXCviJ8ZHJtYHggDPkd Iadw== 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=XMBcbR/YXLdj8nlj6bUuShFLeOtEEY0xQcsUw5ywdJ4=; b=sUWHt9eG9fo0suyimMB5Gb5UyuDdjZWJpx3Vlw2PUS8nFgeuuik50V5NwcxoMzrr6r SPkofvvDs4DgCzze1L5oNJUfbl2a7uqyDV7L43ONRSoXN/g4v4fwi+sU3SbS+GVHW4w7 OoggQJIX36+HLO+GoO75idvSF22YKvNCRe3QdfgFeg3l62FjGxlHw8fZWqnyokJbDYSO EwJanVuuaZ6a9J3Kb9fWQprwfoJuATaGnu4ckKGM4cyVxwNy4O0ZKRqb5gdq+V3VfpGh t7VqZiigQ/sjvd6EpIgbU+ngBxD362kHjrij0X8B8txo2zh3I8dMqecf1v+jq31aJwpR UCMw== X-Gm-Message-State: AOAM531uxEcusCnYCyUGFaH3Na4joqO4JTnieNmNnciON2auyIMhao6X wl2QCx2vx1vmumYyEkhACdFGO8LtAxg= X-Received: by 2002:a62:2c51:0:b029:329:932b:9484 with SMTP id s78-20020a622c510000b0290329932b9484mr9673854pfs.13.1630893723018; Sun, 05 Sep 2021 19:02:03 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i7sm5511069pjm.55.2021.09.05.19.02.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Sep 2021 19:02:02 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 10:01:58 +0800 Message-Id: <1630893718-16160-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1630579138-6145-2-git-send-email-lance.lmwang@gmail.com> References: <1630579138-6145-2-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 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: /gvb/7l6i6Ta From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/nvenc.c | 32 +++++++++++++++++++++++++++----- libavcodec/nvenc.h | 1 + libavcodec/nvenc_h264.c | 2 ++ libavcodec/nvenc_hevc.c | 2 ++ 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 163d442..a298549 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; @@ -1084,8 +1096,10 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) /* 0 means "let the hardware decide" */ h264->maxNumRefFrames = ctx->dpb_size; } - if (avctx->gop_size >= 0) { - h264->idrPeriod = cc->gopLength; + if (ctx->intra_refresh) { + h264->idrPeriod = NVENC_INFINITE_GOPLENGTH; + } else if (avctx->gop_size >= 0) { + h264->idrPeriod = avctx->gop_size; } if (IS_CBR(cc->rcParams.rateControlMode)) { @@ -1173,6 +1187,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; @@ -1181,8 +1201,10 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx) /* 0 means "let the hardware decide" */ hevc->maxNumRefFramesInDPB = ctx->dpb_size; } - if (avctx->gop_size >= 0) { - hevc->idrPeriod = cc->gopLength; + if (ctx->intra_refresh) { + hevc->idrPeriod = NVENC_INFINITE_GOPLENGTH; + } else if (avctx->gop_size >= 0) { + hevc->idrPeriod = avctx->gop_size; } if (IS_CBR(cc->rcParams.rateControlMode)) { @@ -1361,7 +1383,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 } };