From c54e131edc4c41c370addfb1be53aa20c11acb84 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 31 Aug 2023 14:30:50 +0000 Subject: Initial revision --- ffmpeg/build/patches/ffmpeg.libsvtav1.10bit.patch | 42 ++++++++++++++++++++++ .../patches/ffmpeg.libsvtav1.vbv_bufsize.patch | 38 ++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 ffmpeg/build/patches/ffmpeg.libsvtav1.10bit.patch create mode 100644 ffmpeg/build/patches/ffmpeg.libsvtav1.vbv_bufsize.patch (limited to 'ffmpeg') diff --git a/ffmpeg/build/patches/ffmpeg.libsvtav1.10bit.patch b/ffmpeg/build/patches/ffmpeg.libsvtav1.10bit.patch new file mode 100644 index 00000000..208c6964 --- /dev/null +++ b/ffmpeg/build/patches/ffmpeg.libsvtav1.10bit.patch @@ -0,0 +1,42 @@ +From: Christopher Degawa +Date: Thu, 20 Oct 2022 22:55:27 -0500 +Subject: 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 +--- + libavcodec/libsvtav1.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c +index ecf5f9c..90f7c42 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)); diff --git a/ffmpeg/build/patches/ffmpeg.libsvtav1.vbv_bufsize.patch b/ffmpeg/build/patches/ffmpeg.libsvtav1.vbv_bufsize.patch new file mode 100644 index 00000000..bb773de4 --- /dev/null +++ b/ffmpeg/build/patches/ffmpeg.libsvtav1.vbv_bufsize.patch @@ -0,0 +1,38 @@ +From: Christopher Degawa +Date: Thu, 20 Oct 2022 22:55:28 -0500 +Subject: avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms + +svt-av1 v1.2.0 has deprecated vbv_bufsize in favor of using +- maximum_buffer_size_ms (--buf-sz) +- starting_buffer_level_ms (--buf-initial-sz) +- optimal_buffer_level_ms (--buf-optimal-sz) + +and vbv_bufsize has not been in use since svt-av1 v0.8.6 + +Signed-off-by: Christopher Degawa +--- + libavcodec/libsvtav1.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c +index 4001cf7..ecf5f9c 100644 +--- a/libavcodec/libsvtav1.c ++++ b/libavcodec/libsvtav1.c +@@ -183,7 +183,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, + param->min_qp_allowed = avctx->qmin; + } + param->max_bit_rate = avctx->rc_max_rate; +- param->vbv_bufsize = avctx->rc_buffer_size; ++ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; + + if (svt_enc->crf > 0) { + param->qp = svt_enc->crf; +@@ -300,7 +300,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, + avctx->bit_rate = param->rate_control_mode > 0 ? + param->target_bit_rate : 0; + avctx->rc_max_rate = param->max_bit_rate; +- avctx->rc_buffer_size = param->vbv_bufsize; ++ avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL; + + if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) { + AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx); -- cgit v1.2.3