aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Degawa <christopher.degawa@intel.com>2022-10-20 22:55:27 -0500
committerTimo Rothenpieler <timo@rothenpieler.org>2023-05-30 00:28:14 +0200
commit3344d47a88506aba060b5fd2a214cf7785b11483 (patch)
tree718d011d85e7ec87781ef9ff81450e294a3e17a6
parentbea695d54372b66a6b9b136982fc92adb63e4745 (diff)
downloadffmpeg-3344d47a88506aba060b5fd2a214cf7785b11483.tar.gz
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>
-rw-r--r--libavcodec/libsvtav1.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index ecf5f9cb63..90f7c4236c 100644
--- 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));