commit: 689718f584770fd735e2d4adde6cc5eac7f2497c Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Fri Dec 29 14:07:22 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Dec 31 02:37:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689718f5
media-video/ffmpeg: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/34534 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch | 81 ---------------------- .../ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch | 67 ------------------ 2 files changed, 148 deletions(-) diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch b/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch deleted file mode 100644 index 51a8cb02d7b5..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch +++ /dev/null @@ -1,81 +0,0 @@ -https://bugs.gentoo.org/907478 -https://bugs.gentoo.org/907493 -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=bea695d54372b66a6b9b136982fc92adb63e4745 -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=3344d47a88506aba060b5fd2a214cf7785b11483 - -From bea695d54372b66a6b9b136982fc92adb63e4745 Mon Sep 17 00:00:00 2001 -From: Christopher Degawa <[email protected]> -Date: Thu, 20 Oct 2022 22:55:28 -0500 -Subject: [PATCH] avcodec/libsvtav1: replace vbv_bufsize with - maximum_buffer_size_ms - -svt-av1 v1.2.0 has deprecated vbv_bufsize in favor of using -- maximum_buffer_size_ms (--buf-sz) -- starting_buffer_level_ms (--buf-initial-sz) -- optimal_buffer_level_ms (--buf-optimal-sz) - -and vbv_bufsize has not been in use since svt-av1 v0.8.6 - -Signed-off-by: Christopher Degawa <[email protected]> ---- a/libavcodec/libsvtav1.c -+++ b/libavcodec/libsvtav1.c -@@ -183,7 +183,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, - param->min_qp_allowed = avctx->qmin; - } - param->max_bit_rate = avctx->rc_max_rate; -- param->vbv_bufsize = avctx->rc_buffer_size; -+ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; - - if (svt_enc->crf > 0) { - param->qp = svt_enc->crf; -@@ -300,7 +300,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, - avctx->bit_rate = param->rate_control_mode > 0 ? - param->target_bit_rate : 0; - avctx->rc_max_rate = param->max_bit_rate; -- avctx->rc_buffer_size = param->vbv_bufsize; -+ avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL; - - if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) { - AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx); --- -2.30.2 - -From 3344d47a88506aba060b5fd2a214cf7785b11483 Mon Sep 17 00:00:00 2001 -From: Christopher Degawa <[email protected]> -Date: Thu, 20 Oct 2022 22:55:27 -0500 -Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and - simplify alloc_buffer - -compressed_ten_bit_format has been deprecated upstream and has no effect -and can be removed. Plus, technically it was never used in the first place -since it would require the app (ffmpeg) to set it and do additional -processing of the input frames. - -Also simplify alloc_buffer by removing calculations relating to the -non-existant processing. - -Signed-off-by: Christopher Degawa <[email protected]> ---- a/libavcodec/libsvtav1.c -+++ b/libavcodec/libsvtav1.c -@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err, - - static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc) - { -- const int pack_mode_10bit = -- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0; -- const size_t luma_size_8bit = -- config->source_width * config->source_height * (1 << pack_mode_10bit); -- const size_t luma_size_10bit = -- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0; -+ const size_t luma_size = config->source_width * config->source_height * -+ (config->encoder_bit_depth > 8 ? 2 : 1); - - EbSvtIOFormat *in_data; - -- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2; -+ svt_enc->raw_size = luma_size * 3 / 2; - - // allocate buffer for in and out - svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf)); --- -2.30.2 diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch b/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch deleted file mode 100644 index fb905f714fa3..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch +++ /dev/null @@ -1,67 +0,0 @@ -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=8fe2fec45321d1b82f98f9725ad9118cefcfa58d -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=e5b5dd66535f444451e0fee59247b224d866f334 - -From 8fe2fec45321d1b82f98f9725ad9118cefcfa58d Mon Sep 17 00:00:00 2001 -From: Christopher Degawa <[email protected]> -Date: Sun, 20 Nov 2022 13:07:36 -0600 -Subject: [PATCH] avcodec/libsvtav1: only set max_buf_sz if both bitrate and - rc_buf_sz is set - -maximum_buffer_size_ms should only be set if both are specified or if -the user sets it through -svtav1-params buf-sz=val - -Signed-off-by: Christopher Degawa <[email protected]> ---- a/libavcodec/libsvtav1.c -+++ b/libavcodec/libsvtav1.c -@@ -179,7 +179,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, - param->min_qp_allowed = avctx->qmin; - } - param->max_bit_rate = avctx->rc_max_rate; -- param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; -+ if (avctx->bit_rate && avctx->rc_buffer_size) -+ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; - - if (svt_enc->crf > 0) { - param->qp = svt_enc->crf; --- -2.30.2 - -From e5b5dd66535f444451e0fee59247b224d866f334 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Jan=20Ekstr=C3=B6m?= <[email protected]> -Date: Thu, 9 Mar 2023 20:27:06 +0200 -Subject: [PATCH] avcodec/libsvtav1: use larger of bit rate and max rate for - buffer size - -Generally if maxrate is set, the calculation should be maxrate over -bufsize. This additionally enables CRF + maxrate & bufsize usage. - -In order to keep negative values from enabling zero to be treated -as larger and causing a division by zero, check that one of the -variables is larger than zero. ---- a/libavcodec/libsvtav1.c -+++ b/libavcodec/libsvtav1.c -@@ -179,8 +179,10 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, - param->min_qp_allowed = avctx->qmin; - } - param->max_bit_rate = avctx->rc_max_rate; -- if (avctx->bit_rate && avctx->rc_buffer_size) -- param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; -+ if ((avctx->bit_rate > 0 || avctx->rc_max_rate > 0) && avctx->rc_buffer_size) -+ param->maximum_buffer_size_ms = -+ avctx->rc_buffer_size * 1000LL / -+ FFMAX(avctx->bit_rate, avctx->rc_max_rate); - - if (svt_enc->crf > 0) { - param->qp = svt_enc->crf; -@@ -297,7 +299,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, - avctx->bit_rate = param->rate_control_mode > 0 ? - param->target_bit_rate : 0; - avctx->rc_max_rate = param->max_bit_rate; -- avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL; -+ avctx->rc_buffer_size = param->maximum_buffer_size_ms * -+ FFMAX(avctx->bit_rate, avctx->rc_max_rate) / 1000LL; - - if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) { - AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx); --- -2.30.2
