jeka/utun2
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Preserve source context when applying the live QP dependency patch

Browse Source
This commit is contained in:
evgeny committed 2026-10-18 22:30:28 +02:00
1 parent 5568331510
commit 7140775d8d
2 files changed
+37 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/chatgui/ffmpeg/patches/.gitattributes
+2
View File
@@ -0,0 +1,2 @@
# Пустая строка контекста unified diff содержит обязательный пробел.
*.patch whitespace=-blank-at-eol
tools/chatgui/ffmpeg/patches/ffmpeg-7.1.2-amf-live-qp.patch
+35 -5
View File
@@ -1,23 +1,50 @@
--- a/libavcodec/amfenc.h
+++ b/libavcodec/amfenc.h
@@ -114,0 +115,2 @@
@@ -112,6 +112,8 @@
int aud;
int max_consecutive_b_frames;
int max_b_frames;
+ int utun_qp_max;
+ int utun_qp_applied;
int qvbr_quality_level;
int hw_high_motion_quality_boost;
--- a/libavcodec/amfenc_h264.c
+++ b/libavcodec/amfenc_h264.c
@@ -30,0 +31 @@
@@ -28,6 +28,7 @@
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
+ { "utun_qp_max", "Live QP ceiling", OFFSET(utun_qp_max), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE | AV_OPT_FLAG_RUNTIME_PARAM },
// Static
/// Usage
{ "usage", "Encoder Usage", OFFSET(usage), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, AMF_VIDEO_ENCODER_USAGE_LOW_LATENCY_HIGH_QUALITY, VE, .unit = "usage" },
--- a/libavcodec/amfenc_hevc.c
+++ b/libavcodec/amfenc_hevc.c
@@ -29,0 +30 @@
@@ -27,6 +27,7 @@
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
+ { "utun_qp_max", "Live QP ceiling", OFFSET(utun_qp_max), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE | AV_OPT_FLAG_RUNTIME_PARAM },
{ "usage", "Set the encoding usage", OFFSET(usage), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_VIDEO_ENCODER_HEVC_USAGE_LOW_LATENCY_HIGH_QUALITY, VE, .unit = "usage" },
{ "transcoding", "Generic Transcoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_HEVC_USAGE_TRANSCODING }, 0, 0, VE, .unit = "usage" },
{ "ultralowlatency", "Ultra low latency usecase", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_HEVC_USAGE_ULTRA_LOW_LATENCY }, 0, 0, VE, .unit = "usage" },
--- a/libavcodec/amfenc.c
+++ b/libavcodec/amfenc.c
@@ -276,0 +277,3 @@
@@ -274,6 +274,9 @@
av_unused int ret;
ctx->hwsurfaces_in_queue = 0;
+ ctx->utun_qp_applied = -1;
+ if (avctx->codec_id != AV_CODEC_ID_H264 && avctx->codec_id != AV_CODEC_ID_HEVC)
+ ctx->utun_qp_max = -1;
@@ -682,0 +686,22 @@
ctx->hwsurfaces_in_queue_max = 16;
// configure AMF logger
@@ -680,6 +683,28 @@
}
} else if (!ctx->delayed_surface) { // submit frame
int hw_surface = 0;
+
+ if (ctx->utun_qp_max >= 0 && ctx->utun_qp_max != ctx->utun_qp_applied) {
+ const wchar_t *max_i, *max_p;
@@ -40,3 +67,6 @@
+ ctx->utun_qp_applied = ctx->utun_qp_max;
+ av_log(avctx, AV_LOG_INFO, "Live QP ceiling applied qp=%d\n", ctx->utun_qp_max);
+ }
// prepare surface from frame
switch (frame->format) {