highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/libsvtav1: remove compressed_ten_bit_format and simplify alloc_buffer

Browse Source 
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>
This commit is contained in:
Christopher Degawa
2022-10-20 22:55:27 -05:00
committed by James Almer
parent 2e53376a9b
commit 031f1561cd
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/libsvtav1.c
View File

@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc) static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
{ {
const int pack_mode_10bit = const size_t luma_size = config->source_width * config->source_height *
(config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0; (config->encoder_bit_depth > 8 ? 2 : 1);
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;
EbSvtIOFormat *in_data; 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 // allocate buffer for in and out
svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf)); svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));