From: "Водянников Александр" <aleksoid1978g@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] Add NVENC "Maximum encoded slice size in bytes" for H.264/HEVC codecs.
Date: Thu, 27 Jul 2023 12:39:50 +1000
Message-ID: <CAGRUmzCEdnfpvjSSnKJwnLFLTG2jGAgvbi9oWLBL8v+GDZMr5A@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 0001-Add-NVENC-Maximum-encoded-slice-size-in-bytes-for-H264_H265-codecs.txt --]
[-- Type: text/plain, Size: 4152 bytes --]
From: Aleksoid <Aleksoid1978@mail.ru>
Date: Thu, 27 Jul 2023 12:26:23 +1000
Subject: [PATCH] Add NVENC "Maximum encoded slice size in bytes" for
H.264/HEVC codecs.
Signed-off-by: Aleksoid <Aleksoid1978@mail.ru>
---
libavcodec/nvenc.c | 18 ++++++++++++++----
libavcodec/nvenc.h | 1 +
libavcodec/nvenc_h264.c | 2 ++
libavcodec/nvenc_hevc.c | 2 ++
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
index 0b6417674e..c82fcbfe1e 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -1166,8 +1166,13 @@ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx)
|| vui->videoFormat != 5
|| vui->videoFullRangeFlag != 0);
- h264->sliceMode = 3;
- h264->sliceModeData = avctx->slices > 0 ? avctx->slices : 1;
+ if (ctx->max_slice_size > 0) {
+ h264->sliceMode = 1;
+ h264->sliceModeData = ctx->max_slice_size;
+ } else {
+ h264->sliceMode = 3;
+ h264->sliceModeData = avctx->slices > 0 ? avctx->slices : 1;
+ }
if (ctx->intra_refresh) {
h264->enableIntraRefresh = 1;
@@ -1287,8 +1292,13 @@ static av_cold int nvenc_setup_hevc_config(AVCodecContext *avctx)
|| vui->videoFormat != 5
|| vui->videoFullRangeFlag != 0);
- hevc->sliceMode = 3;
- hevc->sliceModeData = avctx->slices > 0 ? avctx->slices : 1;
+ if (ctx->max_slice_size > 0) {
+ hevc->sliceMode = 1;
+ hevc->sliceModeData = ctx->max_slice_size;
+ } else {
+ hevc->sliceMode = 3;
+ hevc->sliceModeData = avctx->slices > 0 ? avctx->slices : 1;
+ }
if (ctx->intra_refresh) {
hevc->enableIntraRefresh = 1;
diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h
index 3a4b456a41..cf0e8e5946 100644
--- a/libavcodec/nvenc.h
+++ b/libavcodec/nvenc.h
@@ -262,6 +262,7 @@ typedef struct NvencContext
int udu_sei;
int timing_info;
int highbitdepth;
+ int max_slice_size;
} NvencContext;
int ff_nvenc_encode_init(AVCodecContext *avctx);
diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c
index a99860998e..4440e49b25 100644
--- a/libavcodec/nvenc_h264.c
+++ b/libavcodec/nvenc_h264.c
@@ -206,6 +206,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 },
+ { "max_slice_size", "Maximum encoded slice size in bytes",
+ OFFSET(max_slice_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, 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 a02f277888..e606655e7e 100644
--- a/libavcodec/nvenc_hevc.c
+++ b/libavcodec/nvenc_hevc.c
@@ -187,6 +187,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 },
+ { "max_slice_size", "Maximum encoded slice size in bytes",
+ OFFSET(max_slice_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, 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 }
--
2.41.0.windows.1
[-- Attachment #3: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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".
next reply other threads:[~2023-07-27 2:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-27 2:39 Водянников Александр [this message]
2023-07-27 12:08 ` Timo Rothenpieler
2023-07-27 13:22 ` Kieran Kunhya
2023-08-13 17:36 ` Timo Rothenpieler
2023-08-13 23:08 ` Kieran Kunhya
2023-08-14 21:20 ` Timo Rothenpieler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGRUmzCEdnfpvjSSnKJwnLFLTG2jGAgvbi9oWLBL8v+GDZMr5A@mail.gmail.com \
--to=aleksoid1978g@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git