ffmpeg rebuild
This commit is contained in:
@@ -0,0 +1,44 @@
|
|||||||
|
https://bugs.gentoo.org/907478
|
||||||
|
https://bugs.gentoo.org/907493
|
||||||
|
https://git.videolan.org/?p=ffmpeg.git;a=commit;h=c3c8f97a9804b4234e97f13b0057ffc2c9af27c0
|
||||||
|
|
||||||
|
From c3c8f97a9804b4234e97f13b0057ffc2c9af27c0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christopher Degawa <christopher.degawa@intel.com>
|
||||||
|
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 <christopher.degawa@intel.com>
|
||||||
|
(cherry picked from commit 031f1561cd286596cdb374da32f8aa816ce3b135)
|
||||||
|
--- 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.30.2
|
||||||
@@ -109,8 +109,7 @@
|
|||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<Patches>
|
<Patches>
|
||||||
<Patch level="1">fix-vmaf-model-path.patch</Patch>
|
<Patch level="1">fix-vmaf-model-path.patch</Patch>
|
||||||
<!-- <Patch level="1">ffmpeg-binutils-2.41.patch</Patch> -->
|
<Patch level="1">ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch</Patch>
|
||||||
<!-- <Patch level="1">libavfilter_glslang.cpp.patch</Patch> -->
|
|
||||||
</Patches>
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
@@ -231,6 +230,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="29">
|
||||||
|
<Date>2023-11-19</Date>
|
||||||
|
<Version>4.4.4</Version>
|
||||||
|
<Comment>Rebuild.</Comment>
|
||||||
|
<Name>Mustafa Cinasal</Name>
|
||||||
|
<Email>muscnsl@gmail.com</Email>
|
||||||
|
</Update>
|
||||||
<Update release="28">
|
<Update release="28">
|
||||||
<Date>2023-10-10</Date>
|
<Date>2023-10-10</Date>
|
||||||
<Version>4.4.4</Version>
|
<Version>4.4.4</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user