From 682f204201532aede33906c0408157bb659c4506 Mon Sep 17 00:00:00 2001 From: Jamaika1 Date: Tue, 28 May 2024 17:40:09 +0200 Subject: [PATCH 1/3] change rate control mode for ffmpeg 7.1.0 --- ffmpeg-subtree/libavcodec/libxeve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg-subtree/libavcodec/libxeve.c b/ffmpeg-subtree/libavcodec/libxeve.c index c10b7de023..eb56639d6a 100644 --- a/ffmpeg-subtree/libavcodec/libxeve.c +++ b/ffmpeg-subtree/libavcodec/libxeve.c @@ -566,7 +566,7 @@ static const AVOption libxeve_options[] = { { "profile", "Encoding profile", OFFSET(profile_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PROFILE_BASELINE }, XEVE_PROFILE_BASELINE, XEVE_PROFILE_MAIN, VE, "profile" }, { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, - { "rc_mode", "Rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = XEVE_RC_CQP }, XEVE_RC_CQP, XEVE_RC_CRF, VE, "rc_mode" }, + { "rc_mode", "Rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = XEVE_RC_ABR }, XEVE_RC_CQP, XEVE_RC_CRF, VE, "rc_mode" }, { "CQP", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CQP }, INT_MIN, INT_MAX, VE, "rc_mode" }, { "ABR", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_ABR }, INT_MIN, INT_MAX, VE, "rc_mode" }, { "CRF", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CRF }, INT_MIN, INT_MAX, VE, "rc_mode" }, From c2088d74ceaba41e7198687a273285949424f64e Mon Sep 17 00:00:00 2001 From: Jamaika1 Date: Tue, 28 May 2024 17:43:52 +0200 Subject: [PATCH 2/3] change rate control mode for ffmpeg 7.1.0 --- ffmpeg-subtree/libavcodec/libxeve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg-subtree/libavcodec/libxeve.c b/ffmpeg-subtree/libavcodec/libxeve.c index eb56639d6a..7b554b7474 100644 --- a/ffmpeg-subtree/libavcodec/libxeve.c +++ b/ffmpeg-subtree/libavcodec/libxeve.c @@ -566,7 +566,7 @@ static const AVOption libxeve_options[] = { { "profile", "Encoding profile", OFFSET(profile_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PROFILE_BASELINE }, XEVE_PROFILE_BASELINE, XEVE_PROFILE_MAIN, VE, "profile" }, { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, - { "rc_mode", "Rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = XEVE_RC_ABR }, XEVE_RC_CQP, XEVE_RC_CRF, VE, "rc_mode" }, + { "rc-type", "Rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = XEVE_RC_ABR }, XEVE_RC_CQP, XEVE_RC_CRF, VE, "rc-type" }, { "CQP", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CQP }, INT_MIN, INT_MAX, VE, "rc_mode" }, { "ABR", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_ABR }, INT_MIN, INT_MAX, VE, "rc_mode" }, { "CRF", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CRF }, INT_MIN, INT_MAX, VE, "rc_mode" }, From 34c7c9d0ee35881dbe8068f2d58cafd411b06267 Mon Sep 17 00:00:00 2001 From: Jamaika1 Date: Tue, 28 May 2024 17:46:14 +0200 Subject: [PATCH 3/3] change rate control mode for ffmpeg 7.1.0 --- ffmpeg-subtree/libavcodec/libxeve.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffmpeg-subtree/libavcodec/libxeve.c b/ffmpeg-subtree/libavcodec/libxeve.c index 7b554b7474..8c0e47e048 100644 --- a/ffmpeg-subtree/libavcodec/libxeve.c +++ b/ffmpeg-subtree/libavcodec/libxeve.c @@ -567,9 +567,9 @@ static const AVOption libxeve_options[] = { { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, { "rc-type", "Rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = XEVE_RC_ABR }, XEVE_RC_CQP, XEVE_RC_CRF, VE, "rc-type" }, - { "CQP", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CQP }, INT_MIN, INT_MAX, VE, "rc_mode" }, - { "ABR", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_ABR }, INT_MIN, INT_MAX, VE, "rc_mode" }, - { "CRF", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CRF }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "CQP", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CQP }, INT_MIN, INT_MAX, VE, "rc-type" }, + { "ABR", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_ABR }, INT_MIN, INT_MAX, VE, "rc-type" }, + { "CRF", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CRF }, INT_MIN, INT_MAX, VE, "rc-type" }, { "qp", "Quantization parameter value for CQP rate control mode", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE }, { "crf", "Constant rate factor value for CRF rate control mode", OFFSET(crf), AV_OPT_TYPE_INT, { .i64 = 32 }, 10, 49, VE }, { "hash", "Embed picture signature (HASH) for conformance checking in decoding", OFFSET(hash), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },