From ef306a702f1ed880675145c07e935a84f266fe738b13d00ead64798631bebdb0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Jun 2023 07:46:10 +0000 Subject: [PATCH] - Add 0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=197 --- ...1-remove-compressed_ten_bit_format-a.patch | 47 +++++++++++++++++++ ffmpeg-4.changes | 5 ++ ffmpeg-4.spec | 1 + 3 files changed, 53 insertions(+) create mode 100644 0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch diff --git a/0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch b/0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch new file mode 100644 index 0000000..c751a54 --- /dev/null +++ b/0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch @@ -0,0 +1,47 @@ +From c3c8f97a9804b4234e97f13b0057ffc2c9af27c0 Mon Sep 17 00:00:00 2001 +From: Christopher Degawa +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 +(cherry picked from commit 031f1561cd286596cdb374da32f8aa816ce3b135) +--- + libavcodec/libsvtav1.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c +index cfd93a2484..38777b0fb7 100644 +--- a/libavcodec/libsvtav1.c ++++ b/libavcodec/libsvtav1.c +@@ -120,16 +120,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.41.0 + diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 13eb368..4ac7d85 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 27 07:42:23 UTC 2023 - Jan Engelhardt + +- Add 0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch + ------------------------------------------------------------------- Wed Apr 19 21:00:41 UTC 2023 - Bjørn Lie diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 24a45f3..6c021d8 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -120,6 +120,7 @@ Patch8: vmaf-trim-usr-local.patch Patch9: ffmpeg-4.4-CVE-2020-22046.patch Patch10: ffmpeg-chromium.patch Patch11: ffmpeg-libglslang-detection.patch +Patch12: 0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel