diff options
| author | Christopher Degawa <christopher.degawa@intel.com> | 2022-10-20 22:55:27 -0500 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2023-05-12 16:32:29 -0300 |
| commit | c3c8f97a9804b4234e97f13b0057ffc2c9af27c0 (patch) | |
| tree | 7c8a74ee54d7db7ab454d104b11624f4082f849d | |
| parent | a66ee3abd228fca77828a1a97f0b90fbaf4d8383 (diff) | |
| download | ffmpeg-c3c8f97a9804b4234e97f13b0057ffc2c9af27c0.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>
(cherry picked from commit 031f1561cd286596cdb374da32f8aa816ce3b135)
| -rw-r--r-- | libavcodec/libsvtav1.c | 10 |
1 files 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)); |