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, \